Merge lp:unity-scopes-api/staging into lp:unity-scopes-api

[Michal Hruby]

Sync with devel.

Sync with devel.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/378/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/378/rebuild

review: Needs Fixing (continuous-integration)

[lp:unity-scopes-api/staging]

205. By Tarmac on 2014-05-21

Sync with devel.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-15 08:17:57 +0000
+++ CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -179,7 +179,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 4)
-set(UNITY_SCOPES_MICRO 6)
+set(UNITY_SCOPES_MICRO 7)
 
 # Version for testing, with all symbols visible
 set(UNITY_SCOPES_TEST_LIB ${UNITY_SCOPES_LIB}-test)

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-05-15 07:33:37 +0000
+++ CONFIGFILES	2014-05-21 14:02:43 +0000
@@ -279,7 +279,7 @@
 
   If set, the results for this scope will be set to expire, and be refreshed. Valid values are:
 
-  - none
+  - None
 
   - Small - in the order of a minute
 

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-05-15 10:34:30 +0000
+++ RELEASE_NOTES.md	2014-05-21 14:02:43 +0000
@@ -1,6 +1,12 @@
 Release notes
 =============
 
+Changes in version 0.4.7
+========================
+  - Implemented RatingFilter and RadioButtonsFilter.
+  - changed create() methods of OptionSelectorFilter and RangeInputFilter to return unique_ptr (UPtr)
+    instead of shared pointers.
+
 Changes in version 0.4.6
 ========================
   - Added method to get and set display hints for filters (at this moment the only display hint

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-19 10:10:28 +0000
+++ debian/changelog	2014-05-21 14:02:43 +0000
@@ -1,3 +1,12 @@
+unity-scopes-api (0.4.7-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pawel Stolowski ]
+  * Implemented RatingFilter and RadioButtonFilter.
+  * Fixed lp:1319712: Appearance attributes not supported for remote scopes.
+  * Changed create() methods of OptionSelectorFilter and RangeInputFilter to return unique ptr.
+
+ -- Pawel Stolowski <[e-mail]>  Fri, 16 May 2014 17:48:23 +0200
+
 unity-scopes-api (0.4.6+14.10.20140519-0ubuntu1) utopic; urgency=medium
 
   [ Pete Woods ]

=== modified file 'debian/libunity-scopes1.symbols'
--- debian/libunity-scopes1.symbols	2014-05-19 10:10:27 +0000
+++ debian/libunity-scopes1.symbols	2014-05-21 14:02:43 +0000
@@ -82,6 +82,14 @@
  (c++)"unity::scopes::ListenerBase::~ListenerBase()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewReply::PreviewReply()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewReply::~PreviewReply()@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::RatingFilter::add_option(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::set_on_icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::set_off_icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::update_state(unity::scopes::FilterState&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::create(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::create(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::RatingFilter(unity::scopes::internal::RatingFilterImpl*)@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::~RatingFilter()@Base" 0replaceme
  (c++)"unity::scopes::PreviewWidget::add_attribute_value(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::Variant const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewWidget::add_attribute_mapping(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewWidget::PreviewWidget(unity::scopes::PreviewWidget&&)@Base" 0.4.0+14.04.20140312.1
@@ -216,6 +224,11 @@
  (c++)"unity::scopes::ActivationResponse::~ActivationResponse()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::operator=(unity::scopes::ActivationResponse&&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::operator=(unity::scopes::ActivationResponse const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::RadioButtonsFilter::add_option(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::update_state(unity::scopes::FilterState&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::create(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::RadioButtonsFilter(unity::scopes::internal::RadioButtonsFilterImpl*)@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::~RadioButtonsFilter()@Base" 0replaceme
  (c++)"unity::scopes::SearchListenerBase::push(unity::scopes::Annotation)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::SearchListenerBase::push(std::list<unity::scopes::Department, std::allocator<unity::scopes::Department> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::SearchListenerBase::push(std::list<std::shared_ptr<unity::scopes::FilterBase const>, std::allocator<std::shared_ptr<unity::scopes::FilterBase const> > > const&, unity::scopes::FilterState const&)@Base" 0.4.0+14.04.20140312.1
@@ -447,13 +460,12 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_search_hint(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_display_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_scope_directory(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_results_ttl_type(unity::scopes::ScopeMetadata::ResultsTtlType)@Base" 0.4.6+14.10.20140519
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_appearance_attributes(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::create(std::unique_ptr<unity::scopes::internal::ScopeMetadataImpl, std::default_delete<unity::scopes::internal::ScopeMetadataImpl> >)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_art(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_proxy(std::shared_ptr<unity::scopes::Scope> const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeMetadataImpl::set_results_ttl_type(unity::scopes::ScopeMetadata::ResultsTtlType)@Base" 0.4.6+14.10.20140519
- (c++)"unity::scopes::internal::ScopeMetadataImpl::results_ttl_type() const@Base" 0.4.6+14.10.20140519
  (c++)"unity::scopes::internal::ScopeMetadataImpl::ScopeMetadataImpl(unity::scopes::internal::MiddlewareBase*)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::ScopeMetadataImpl(unity::scopes::internal::ScopeMetadataImpl const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::ScopeMetadataImpl(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&, unity::scopes::internal::MiddlewareBase*)@Base" 0.4.0+14.04.20140312.1
@@ -522,6 +534,14 @@
  (c++)"unity::scopes::ColumnLayout::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::FilterOption::id() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::FilterOption::label() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::RatingFilter::update_state(unity::scopes::FilterState&, std::shared_ptr<unity::scopes::FilterOption const>, bool) const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::active_rating(unity::scopes::FilterState const&) const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::has_active_rating(unity::scopes::FilterState const&) const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::fwd() const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::label() const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::on_icon() const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::options() const@Base" 0replaceme
+ (c++)"unity::scopes::RatingFilter::off_icon() const@Base" 0replaceme
  (c++)"unity::scopes::PreviewWidget::widget_type() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewWidget::attribute_values() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::PreviewWidget::attribute_mappings() const@Base" 0.4.0+14.04.20140312.1
@@ -532,6 +552,7 @@
  (c++)"unity::scopes::ScopeMetadata::search_hint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::display_name() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::scope_directory() const@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::ScopeMetadata::results_ttl_type() const@Base" 0.4.6+14.10.20140519
  (c++)"unity::scopes::ScopeMetadata::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::ScopeMetadata::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::icon() const@Base" 0.4.0+14.04.20140312.1
@@ -541,7 +562,6 @@
  (c++)"unity::scopes::ScopeMetadata::scope_id() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::invisible() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::serialize() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::ScopeMetadata::results_ttl_type() const@Base" 0.4.6+14.10.20140519 
  (c++)"unity::scopes::ActionMetadata::scope_data() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActionMetadata::form_factor() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActionMetadata::locale() const@Base" 0.4.0+14.04.20140312.1
@@ -573,10 +593,17 @@
  (c++)"unity::scopes::ActivationResponse::query() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::status() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::serialize() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::RadioButtonsFilter::update_state(unity::scopes::FilterState&, std::shared_ptr<unity::scopes::FilterOption const>, bool) const@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::active_option(unity::scopes::FilterState const&) const@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::has_active_option(unity::scopes::FilterState const&) const@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::fwd() const@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::label() const@Base" 0replaceme
+ (c++)"unity::scopes::RadioButtonsFilter::options() const@Base" 0replaceme
  (c++)"unity::scopes::MiddlewareException::self() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::OptionSelectorFilter::multi_select() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::OptionSelectorFilter::update_state(unity::scopes::FilterState&, std::shared_ptr<unity::scopes::FilterOption const>, bool) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::OptionSelectorFilter::active_options(unity::scopes::FilterState const&) const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::OptionSelectorFilter::has_active_option(unity::scopes::FilterState const&) const@Base" 0replaceme
  (c++)"unity::scopes::OptionSelectorFilter::fwd() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::OptionSelectorFilter::label() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::OptionSelectorFilter::options() const@Base" 0.4.0+14.04.20140312.1
@@ -644,13 +671,13 @@
  (c++)"unity::scopes::internal::ScopeConfig::idle_timeout() const@Base" 0.4.5+14.10.20140513
  (c++)"unity::scopes::internal::ScopeConfig::overrideable() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::scope_runner() const@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::ScopeConfig::results_ttl_type() const@Base" 0.4.6+14.10.20140519
  (c++)"unity::scopes::internal::ScopeConfig::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeConfig::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::icon() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::author() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::hot_key() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::invisible() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeConfig::results_ttl_type() const@Base" 0.4.6+14.10.20140519 
  (c++)"unity::scopes::internal::ScopeLoader::scope_base() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeLoader::libpath() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeLoader::scope_id() const@Base" 0.4.2+14.04.20140404.2
@@ -693,6 +720,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::search_hint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::display_name() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::scope_directory() const@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::results_ttl_type() const@Base" 0.4.6+14.10.20140519
  (c++)"unity::scopes::internal::ScopeMetadataImpl::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::icon() const@Base" 0.4.0+14.04.20140312.1
@@ -710,6 +738,7 @@
  (c++)"typeinfo for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::PreviewReply@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo for unity::scopes::RatingFilter@Base" 0replaceme
  (c++)"typeinfo for unity::scopes::PreviewWidget@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::VariantBuilder@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::ConfigException@Base" 0.4.0+14.04.20140312.1
@@ -720,6 +749,7 @@
  (c++)"typeinfo for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo for unity::scopes::RadioButtonsFilter@Base" 0replaceme
  (c++)"typeinfo for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::ActivationQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::MiddlewareException@Base" 0.4.0+14.04.20140312.1
@@ -748,6 +778,7 @@
  (c++)"typeinfo name for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::PreviewReply@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo name for unity::scopes::RatingFilter@Base" 0replaceme
  (c++)"typeinfo name for unity::scopes::PreviewWidget@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::VariantBuilder@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::ConfigException@Base" 0.4.0+14.04.20140312.1
@@ -758,6 +789,7 @@
  (c++)"typeinfo name for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo name for unity::scopes::RadioButtonsFilter@Base" 0replaceme
  (c++)"typeinfo name for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::ActivationQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::MiddlewareException@Base" 0.4.0+14.04.20140312.1
@@ -797,6 +829,7 @@
  (c++)"vtable for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::PreviewReply@Base" 0.4.0+14.04.20140312.1
+ (c++)"vtable for unity::scopes::RatingFilter@Base" 0replaceme
  (c++)"vtable for unity::scopes::PreviewWidget@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::VariantBuilder@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::ConfigException@Base" 0.4.0+14.04.20140312.1
@@ -807,6 +840,7 @@
  (c++)"vtable for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
+ (c++)"vtable for unity::scopes::RadioButtonsFilter@Base" 0replaceme
  (c++)"vtable for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::ActivationQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::MiddlewareException@Base" 0.4.0+14.04.20140312.1

=== modified file 'demo/client.cpp'
--- demo/client.cpp	2014-04-29 13:51:44 +0000
+++ demo/client.cpp	2014-05-21 14:02:43 +0000
@@ -422,10 +422,11 @@
         }
 
         auto meta = r->get_metadata(scope_id);
-        cout << "Scope metadata:   " << endl;
-        cout << "\tscope_id:       " << meta.scope_id() << endl;
-        cout << "\tdisplay_name:   " << meta.display_name() << endl;
-        cout << "\tdescription:    " << meta.description() << endl;
+        cout << "Scope metadata:    " << endl;
+        cout << "\tscope_id:        " << meta.scope_id() << endl;
+        cout << "\tdisplay_name:    " << meta.display_name() << endl;
+        cout << "\tdescription:     " << meta.description() << endl;
+        cout << "\tappearance attr: " << to_string(Variant(meta.appearance_attributes())) << endl;
         string tmp;
         try
         {

=== modified file 'demo/scopes/scope-A/scope-A.cpp'
--- demo/scopes/scope-A/scope-A.cpp	2014-04-29 11:20:57 +0000
+++ demo/scopes/scope-A/scope-A.cpp	2014-05-21 14:02:43 +0000
@@ -59,7 +59,7 @@
         reply->register_departments(departments);
 
         Filters filters;
-        auto filter = OptionSelectorFilter::create("f1", "Options");
+        OptionSelectorFilter::SPtr filter = OptionSelectorFilter::create("f1", "Options");
         filter->add_option("1", "Option 1");
         filter->add_option("2", "Option 2");
         filters.push_back(filter);

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2014-05-08 10:47:45 +0000
+++ doc/tutorial.dox	2014-05-21 14:02:43 +0000
@@ -188,7 +188,7 @@
 and \link unity::scopes::SearchReply::push push\endlink.
 
 The \link unity::scopes::SearchReply::register_category register_category\endlink method is a factory method for creating new categories (see
-\link unity::scopes::Category\endlink). Categories can be created at any point during query processing inside run method, but it's recommended to create
+\link unity::scopes::Category\endlink). Categories can be created at any point during query processing inside run method, but we recommend to create
 them as soon as possible (ideally as soon as they are known to the scope).
 
 When creating a category, one of its parameters is a \link unity::scopes::CategoryRenderer \endlink instance,
@@ -552,29 +552,39 @@
 restart scope-registry
 \endverbatim
 
-The scope will be installed under one of the "scopes directories"
+Scopes are installed under one of the "scopes directories"
 scanned by the scope registry.  Currently these default to:
 
 <ul>
 <li>/usr/lib/${arch}/unity-scopes</li>
 <li>/custom/lib/${arch}/unity-scopes</li>
-<!-- <li>??? Click packages?</li> -->
+<li>$HOME/.local/share/unity-scopes</li>
 </ul>
 
-Individual scopes are installed into a subdirectory matching the
-scope's name.  At a minimum, the directory structure should contain
-the following:
+The `/usr/lib` directory is for scopes that are pre-installed by Canonical.
+The `/custom/lib` directory is for scopes that pre-installed by OEMs.
+The `$HOME/.local` directory is for scopes that are installed from click packages.
+
+Individual scopes are installed into subdirectories of these
+installation directories. The name of the subdirectory containing
+a scope's `.ini` and `.so` files can be anything but, to avoid name clashes,
+we strongly suggest something that is unique, such as `com.canonical.scopes.scopename`.
+At a minimum, the directory structure must contain the following:
 
     -+- ${scopesdir}
-     `-+- scopename
+     `-+- subdirectory
        |--- scopename.ini
-       `--- libscopename.so
+       `--- <library>.so
 
-That is, a scope metadata file and a shared library containing the
-scope code.  The scope author is free to ship additional data in this
+That is, each subdirectory must contain a scope `.ini` file and a shared library containing the
+scope code. The scope author is free to ship additional data in this
 directory (e.g. icons and screenshots).
 
-The scope metadata file uses the standard ini file format, with the
+The name of the scope's `.ini` file _must_ be a unique ID for the scope. We _strongly_
+suggest to use a unique identifier, such as `com.canonical.scopes.scopename`, to avoid
+clashes with scopes created by other developers.
+
+The scope `.ini` file uses the standard `.ini` file format, with the
 following keys:
 
     [ScopeConfig]
@@ -585,8 +595,22 @@
     Art = path to screenshot of the scope
     SearchHint = hint text displayed to user when viewing scope
     HotKey =
-
-In addition to allowing the registry to make the scope available, this information controls how the scope appears in the "Scopes" scope.
+    ResultsTtlType = None, Small, Medium, or Large
+
+    [Appearance]
+    TODO: document valid attributes
+
+The `ScopeConfig` group is mandatory and must contain settings for at least `DisplayName`, `Description`, and Author.
+`DisplayName` and `Description` can (and should) be localized. For example:
+
+`Description[de] = Fu&szlig;ballergebnisse`
+
+In addition to allowing the registry to make the scope available, this information controls how the scope appears
+in the "Scopes" scope.
+
+The name of of the scope's `.so` file can be `libscopename.so`, `scopename.so`, or simply `scope.so`. For example,
+for a scope named `Fred`, the names `libFred.so`, `Fred.so`, and `scope.so` are acceptable. (No other library
+names are valid.)
 
 \subsection scopetool Previewing scope
 
@@ -599,16 +623,17 @@
 sudo apt-get install unity-scope-tool
 \endverbatim
 
-After installation, you can run the scope-tool with a parameter specifying
-path to your scope configuration file (for example `unity-scope-tool ~/dev/myscope/build/myscope.ini`). If a binary for your scope can be found in the same
-directory (ie there's `~/dev/myscope/build/libmyscope.so`), the scope-tool will
+After installation, you can run the scope-tool with a parameter specifying the
+path to your scope configuration file (for example `unity-scope-tool ~/dev/myscope/build/myscope.ini`).
+If a binary for your scope can be found in the same
+directory, the scope-tool will
 display surfacing and search results provided by your scope, and allow you to
 perform searches, invoke previews and actions within previews.
 
-Note that the scope-tool is using the same rendering mechanism as Unity
-itself, and therefore what you see in the scope-tool is what you get in Unity.
+Note that the scope-tool uses the same rendering mechanism as Unity
+itself and, therefore, what you see in the scope-tool is what you get in Unity.
 It can also be used to fine-tune the category definitions, as it allows you
-to manipulate the definitions on the fly, and once you're happy with the result
+to manipulate the definitions on the fly. Once you are happy with the result
 you can just copy the JSON definition back into your scope
 (see unity::scopes::CategoryRenderer::CategoryRenderer()).
 

=== modified file 'include/unity/scopes/OptionSelectorFilter.h'
--- include/unity/scopes/OptionSelectorFilter.h	2014-05-08 16:10:18 +0000
+++ include/unity/scopes/OptionSelectorFilter.h	2014-05-21 14:02:43 +0000
@@ -57,7 +57,7 @@
     \param multi_select If true, the filter permits more than option to be selected; otherwise, only a single
     option can be selected.
     */
-    static OptionSelectorFilter::SPtr create(std::string const& id, std::string const& label, bool multi_select = false);
+    static OptionSelectorFilter::UPtr create(std::string const& id, std::string const& label, bool multi_select = false);
 
     /**
     \brief Get the label of this filter.
@@ -84,6 +84,13 @@
     std::list<FilterOption::SCPtr> options() const;
 
     /**
+    \brief Check if an option is active for this filter.
+    \param filter_state The state of filters
+    \return true if an option is active
+    */
+    bool has_active_option(FilterState const& filter_state) const;
+
+    /**
     \brief Get active options from an instance of FilterState for this filter.
     \return The set of selected filter options.
     */

=== added file 'include/unity/scopes/RadioButtonsFilter.h'
--- include/unity/scopes/RadioButtonsFilter.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/RadioButtonsFilter.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_RADIOBUTTONSFILTER_H
+#define UNITY_SCOPES_RADIOBUTTONSFILTER_H
+
+#include <unity/scopes/FilterBase.h>
+#include <unity/scopes/FilterOption.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+class FilterState;
+
+namespace internal
+{
+
+class RadioButtonsFilterImpl;
+
+}
+
+/**
+\brief A filter that displays mutually exclusive list of options.
+
+Displays filter with a set of options and allows only one option to be selected at a time.
+*/
+class UNITY_API RadioButtonsFilter : public FilterBase
+{
+public:
+/// @cond
+    UNITY_DEFINES_PTRS(RadioButtonsFilter);
+/// @endcond
+
+    /**
+    \brief Creates RadioButtonsFilter filter.
+
+    Creates an empty RadioButtonsFilter filter. Use unity::scopes::RadioButtonsFilter::add_option() to add options to it.
+    \param id A unique identifier for the filter that can be used to identify it later among several filters.
+    \param label A display label for this filter
+    \return Instance of RadioButtonsFilter
+    */
+    static RadioButtonsFilter::UPtr create(std::string const& id, std::string const& label);
+
+    /**
+     \brief Adds a new option to the filter.
+
+     \param id A unique identifier of the option.
+     \param label A display label for the option
+     \return Instance of FilterOption
+     */
+    FilterOption::SCPtr add_option(std::string const& id, std::string const& label);
+
+    /**
+    \brief Get the label of this filter.
+    \return The filter label.
+    */
+    std::string label() const;
+
+    /**
+    \brief Get active option from an instance of FilterState for this filter.
+    \return The active option or nullptr if no option is active.
+    */
+    FilterOption::SCPtr active_option(FilterState const& filter_state) const;
+
+    /**
+    \brief Check if active options.
+    \param filter_state The state of filters
+    \return true if there is at least one option active
+    */
+    bool has_active_option(FilterState const& filter_state) const;
+
+
+    /**
+    \brief Get all options of this filter, in the order they were added.
+    \return The list of options.
+     */
+    std::list<FilterOption::SCPtr> options() const;
+
+    /**
+    \brief Marks given FilterOption of this filter instance as active (or not active) in a FilterState object.
+
+    Records the given FilterOption as "selected" in the FilterState. This is meant to be used to modify a
+    FilterState received with a search request before sending it back to the client (UI shell).
+    Only one option can be active at a time - marking an option active automatically deactivates any other option.
+    */
+    void update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const;
+
+    /**
+    \brief Marks an option of a filter active/inactive in a FilterState object, without having an instance of OptionSelectorFilter.
+
+    Updates an instance of FilterState, without the need for an OptionSelectorFilter instance. This is meant
+    to be used when creating a canned Query that references another scope.
+    */
+    static void update_state(FilterState& filter_state, std::string const& filter_id, std::string const& option_id, bool value);
+
+private:
+    RadioButtonsFilter(internal::RadioButtonsFilterImpl*);
+    internal::RadioButtonsFilterImpl* fwd() const;
+    friend class internal::RadioButtonsFilterImpl;
+};
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif

=== modified file 'include/unity/scopes/RangeInputFilter.h'
--- include/unity/scopes/RangeInputFilter.h	2014-05-09 11:26:27 +0000
+++ include/unity/scopes/RangeInputFilter.h	2014-05-21 14:02:43 +0000
@@ -124,10 +124,10 @@
      \brief Store start and end value in the filter state, without having an instance of RangeInputFilter.
 
      Updates filter_state with start and end values without an instance of RangeInputFilter. This is meant
+     for the explanation of this method.
      to be used when creating a CannedQuery that points to a foreign scope.
 
      See the documentation of unity::scopes::update_state(FilterState const& filter_state, Variant const& start_value, Variant const& end_value)
-     for the explanation of this method.
 
      \param filter_state FilterState instance to update
      \param filter_id Unique identifier of filter

=== added file 'include/unity/scopes/RatingFilter.h'
--- include/unity/scopes/RatingFilter.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/RatingFilter.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_RATINGFILTER_H
+#define UNITY_SCOPES_RATINGFILTER_H
+
+#include <unity/scopes/FilterBase.h>
+#include <unity/scopes/FilterOption.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+class FilterState;
+
+namespace internal
+{
+
+class RatingFilterImpl;
+
+}
+
+/**
+\brief A filter that allows for rating-based selection.
+
+Displays filter with a set of options, where every option has a label and icon.
+Only one option can be active at a time. The active option uses the icon in "on" state
+(see unity::scopes::RatingFilter::set_on_icon() ).  All other icons are "off" (see unity::scopes::RatingFilter::set_off_icon() ).
+By default, "on" and "off" icons are bright and dim star respectively.
+
+This filter is best suited for rating-based filtering.
+*/
+class UNITY_API RatingFilter : public FilterBase
+{
+public:
+/// @cond
+    UNITY_DEFINES_PTRS(RatingFilter);
+/// @endcond
+
+    /**
+    \brief Creates RatingFilter widget.
+
+    Creates an empty RatingFilter widget. Use unity::scopes::RatingFilter::add_option() to add rating options to it.
+    \param id A unique identifier for the filter that can be used to identify it later among several filters.
+    \param label A display label for this filter
+    \return Instance of RatingFilter
+    */
+    static RatingFilter::UPtr create(std::string const& id, std::string const& label);
+
+    /**
+    \brief Creates RatingFilter widget.
+
+    Creates a RatingFilter widget and populates it with some standard rating options.
+    This is a convienience factory method, that fills RatingFilter in with options for ratings
+    from 1 up to top_rating. Options are created with identifiers "1", "2" and so on, and labels
+    "1+", "2+" etc., except for that last label, which is just the number (no plus sign). The maximum top_rating
+    allowed is 10.
+
+    \param id A unique identifier for the filter that can be used to identify it later among several filters.
+    \param label A display label for this filter
+    \param top_rating The maximum rating allowed.
+    \return Instance of RatingFilter
+    */
+    static RatingFilter::UPtr create(std::string const& id, std::string const& label, int top_rating);
+
+    /**
+     \brief Adds a new option to the filter.
+
+     \param id A unique identifier of the option.
+     \param label A display label for the option
+     \return Instance of FilterOption
+     */
+    FilterOption::SCPtr add_option(std::string const& id, std::string const& label);
+
+    /**
+     \brief Set a custom icon for the "on" state.
+
+     If not set, a star icon will be used by default.
+
+     \param on_icon icon uri
+    */
+    void set_on_icon(std::string const& on_icon);
+
+    /**
+     \brief Set a custom icon for the "off" state.
+
+     If not set, a dim star icon will be used by default.
+
+     \param off_icon icon uri
+    */
+    void set_off_icon(std::string const& off_icon);
+
+    /**
+    \brief Get the label of this filter.
+    \return The filter label.
+    */
+    std::string label() const;
+
+    /**
+     \brief Get custom icon for the "on" state.
+
+     If empty, then the default icon will be used.
+
+     \return icon uri or empty string
+     */
+    std::string on_icon() const;
+
+    /**
+     \brief Get custom icon for the "off" state.
+
+     If empty, then the default icon will be used.
+
+     \return icon uri or empty string
+     */
+    std::string off_icon() const;
+
+    /**
+    \brief Get all options of this filter, in the order they were added.
+    \return The list of options.
+     */
+    std::list<FilterOption::SCPtr> options() const;
+
+    /**
+    \brief Check if a rating option is active.
+    \param filter_state The state of filters
+    \return true if a rating option is active.
+    */
+    bool has_active_rating(FilterState const& filter_state) const;
+
+    /**
+    \brief Get active option from an instance of FilterState for this filter.
+    \return The active option or nullptr if no option is active.
+    */
+    FilterOption::SCPtr active_rating(FilterState const& filter_state) const;
+
+    /**
+    \brief Marks given FilterOption of this filter instance as active (or not active) in a FilterState object.
+
+    Records the given FilterOption as "selected" in the FilterState. This is meant to be used to modify a
+    FilterState received with a search request before sending it back to the client (UI shell).
+    Only one option can be active at a time - marking an option active automatically deactivates any other option.
+    */
+    void update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const;
+
+    /**
+    \brief Marks an option of a filter active/inactive in a FilterState object, without having an instance of OptionSelectorFilter.
+
+    Updates an instance of FilterState, without the need for an OptionSelectorFilter instance. This is meant
+    to be used when creating a canned Query that references another scope.
+    */
+    static void update_state(FilterState& filter_state, std::string const& filter_id, std::string const& option_id, bool value);
+
+private:
+    RatingFilter(internal::RatingFilterImpl*);
+    internal::RatingFilterImpl* fwd() const;
+    friend class internal::RatingFilterImpl;
+};
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif

=== modified file 'include/unity/scopes/internal/FilterBaseImpl.h'
--- include/unity/scopes/internal/FilterBaseImpl.h	2014-05-02 10:19:46 +0000
+++ include/unity/scopes/internal/FilterBaseImpl.h	2014-05-21 14:02:43 +0000
@@ -47,6 +47,7 @@
     static FilterBase::SCPtr deserialize(VariantMap const& var);
     static VariantArray serialize_filters(Filters const& filters);
     static Filters deserialize_filters(VariantArray const& var);
+    static void validate_filters(Filters const& filters);
 
 protected:
     virtual void serialize(VariantMap& var) const = 0;

=== added file 'include/unity/scopes/internal/MWPublisher.h'
--- include/unity/scopes/internal/MWPublisher.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/MWPublisher.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_MWPUBLISHER_H
+#define UNITY_SCOPES_INTERNAL_MWPUBLISHER_H
+
+#include <unity/util/DefinesPtrs.h>
+#include <unity/util/NonCopyable.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+class MWPublisher
+{
+public:
+    NONCOPYABLE(MWPublisher);
+    UNITY_DEFINES_PTRS(MWPublisher);
+
+    virtual ~MWPublisher();
+
+    virtual std::string endpoint() const = 0;
+    virtual void send_message(std::string const& message, std::string const& topic = "") = 0;
+
+protected:
+    MWPublisher();
+};
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif // UNITY_SCOPES_INTERNAL_MWPUBLISHER_H

=== added file 'include/unity/scopes/internal/MWSubscriber.h'
--- include/unity/scopes/internal/MWSubscriber.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/MWSubscriber.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
+#define UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
+
+#include <unity/util/DefinesPtrs.h>
+#include <unity/util/NonCopyable.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+typedef std::function<void(std::string const& message)> SubscriberCallback;
+
+class MWSubscriber
+{
+public:
+    NONCOPYABLE(MWSubscriber);
+    UNITY_DEFINES_PTRS(MWSubscriber);
+
+    virtual ~MWSubscriber();
+
+    virtual std::string endpoint() const = 0;
+    virtual void set_message_callback(SubscriberCallback callback) = 0;
+
+protected:
+    MWSubscriber();
+};
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif // UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H

=== modified file 'include/unity/scopes/internal/MiddlewareBase.h'
--- include/unity/scopes/internal/MiddlewareBase.h	2014-05-08 12:55:26 +0000
+++ include/unity/scopes/internal/MiddlewareBase.h	2014-05-21 14:02:43 +0000
@@ -20,11 +20,13 @@
 #define UNITY_SCOPES_INTERNAL_MIDDLEWAREBASE_H
 
 #include <unity/scopes/internal/MWObjectProxyFwd.h>
+#include <unity/scopes/internal/MWPublisher.h>
 #include <unity/scopes/internal/MWQueryCtrlProxyFwd.h>
 #include <unity/scopes/internal/MWQueryProxyFwd.h>
 #include <unity/scopes/internal/MWRegistryProxyFwd.h>
 #include <unity/scopes/internal/MWScopeProxyFwd.h>
 #include <unity/scopes/internal/MWStateReceiverProxyFwd.h>
+#include <unity/scopes/internal/MWSubscriber.h>
 #include <unity/scopes/internal/QueryObjectBase.h>
 #include <unity/scopes/internal/QueryCtrlObjectBase.h>
 #include <unity/scopes/internal/RegistryObjectBase.h>
@@ -84,6 +86,9 @@
     virtual void add_dflt_scope_object(ScopeObjectBase::SPtr const& scope) = 0;
     virtual MWStateReceiverProxy add_state_receiver_object(std::string const& identity, StateReceiverObject::SPtr const& state_receiver) = 0;
 
+    virtual MWPublisher::UPtr create_publisher(std::string const& publisher_id) = 0;
+    virtual MWSubscriber::UPtr create_subscriber(std::string const& publisher_id, std::string const& topic = "") = 0;
+
     virtual std::string get_scope_endpoint() = 0;
     virtual std::string get_query_endpoint() = 0;
     virtual std::string get_query_ctrl_endpoint() = 0;

=== modified file 'include/unity/scopes/internal/OptionSelectorFilterImpl.h'
--- include/unity/scopes/internal/OptionSelectorFilterImpl.h	2014-05-08 16:10:18 +0000
+++ include/unity/scopes/internal/OptionSelectorFilterImpl.h	2014-05-21 14:02:43 +0000
@@ -43,9 +43,11 @@
     OptionSelectorFilterImpl(VariantMap const& var);
     std::string label() const;
     bool multi_select() const;
-    FilterOption::SCPtr add_option(std::string const& id, std::string const& label);
+    virtual FilterOption::SCPtr add_option(std::string const& id, std::string const& label);
     std::list<FilterOption::SCPtr> options() const;
+    int num_of_options() const;
     std::set<FilterOption::SCPtr> active_options(FilterState const& filter_state) const;
+    bool has_active_option(FilterState const& filter_state) const;
     void update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const;
     static void update_state(FilterState& filter_state, std::string const& filter_id, std::string const& option_id, bool value);
     static OptionSelectorFilter::SPtr create(VariantMap const& var);

=== added file 'include/unity/scopes/internal/RadioButtonsFilterImpl.h'
--- include/unity/scopes/internal/RadioButtonsFilterImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/RadioButtonsFilterImpl.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#ifndef UNITY_INTERNAL_RADIOBUTTONSFILTERIMPL_H
+#define UNITY_INTERNAL_RADIOBUTTONSFILTERIMPL_H
+
+#include <unity/scopes/internal/OptionSelectorFilterImpl.h>
+#include <unity/scopes/RadioButtonsFilter.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+class RadioButtonsFilterImpl : public OptionSelectorFilterImpl
+{
+public:
+    RadioButtonsFilterImpl(std::string const& id, std::string const& label);
+    RadioButtonsFilterImpl(VariantMap const& var);
+    FilterOption::SCPtr active_option(FilterState const& filter_state) const;
+    std::string filter_type() const override;
+    static RadioButtonsFilter::SPtr create(VariantMap const& var);
+};
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif

=== added file 'include/unity/scopes/internal/RatingFilterImpl.h'
--- include/unity/scopes/internal/RatingFilterImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/RatingFilterImpl.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#ifndef UNITY_INTERNAL_RATINGFILTERIMPL_H
+#define UNITY_INTERNAL_RATINGFILTERIMPL_H
+
+#include <unity/scopes/internal/RadioButtonsFilterImpl.h>
+#include <unity/scopes/RatingFilter.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+class RatingFilterImpl : public RadioButtonsFilterImpl
+{
+public:
+    RatingFilterImpl(std::string const& id, std::string const& label);
+    RatingFilterImpl(std::string const& id, std::string const& label, int top_rating);
+    RatingFilterImpl(VariantMap const& var);
+    FilterOption::SCPtr add_option(std::string const& id, std::string const& label) override;
+    void set_on_icon(std::string const& on_icon);
+    void set_off_icon(std::string const& off_icon);
+    std::string on_icon() const;
+    std::string off_icon() const;
+    FilterOption::SCPtr active_rating(FilterState const& filter_state) const;
+
+    static RatingFilter::SPtr create(VariantMap const& var);
+
+    std::string filter_type() const override;
+
+    static const int max_rating = 10;
+
+private:
+    std::string on_icon_;
+    std::string off_icon_;
+};
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScopesClient.h'
--- include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-03-24 10:15:20 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-05-21 14:02:43 +0000
@@ -54,6 +54,7 @@
     std::string base_url;
     std::shared_ptr<std::string> icon;  // optional
     std::shared_ptr<std::string> art;  // optional
+    std::shared_ptr<VariantMap> appearance; // optional
     bool invisible = false;
 };
 

=== modified file 'include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h'
--- include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h	2014-05-08 13:27:38 +0000
+++ include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h	2014-05-21 14:02:43 +0000
@@ -98,8 +98,6 @@
     // zmqpp::socket subscribe_to_ctrl_socket();
     // void stop_workers() noexcept;
 
-    void safe_bind(zmqpp::socket& s, std::string const& endpoint);
-
     std::shared_ptr<ServantBase> find_servant(std::string const& id, std::string const& category);
 
     // Thread start functions

=== modified file 'include/unity/scopes/internal/zmq_middleware/Util.h'
--- include/unity/scopes/internal/zmq_middleware/Util.h	2014-01-28 06:34:03 +0000
+++ include/unity/scopes/internal/zmq_middleware/Util.h	2014-05-21 14:02:43 +0000
@@ -19,6 +19,8 @@
 #ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_UTIL_H
 #define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_UTIL_H
 
+#include <zmqpp/socket.hpp>
+
 #include <string>
 
 namespace unity
@@ -35,6 +37,8 @@
 
 void throw_if_bad_endpoint(std::string const& endpoint);
 
+void safe_bind(zmqpp::socket& s, std::string const& endpoint);
+
 } // namespace zmq_middleware
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-05-15 00:34:39 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-05-21 14:02:43 +0000
@@ -78,10 +78,13 @@
     virtual void add_dflt_query_object(QueryObjectBase::SPtr const& query) override;
     virtual MWRegistryProxy add_registry_object(std::string const& identity, RegistryObjectBase::SPtr const& registry) override;
     virtual MWReplyProxy add_reply_object(ReplyObjectBase::SPtr const& reply) override;
-    virtual MWScopeProxy add_scope_object(std::string const& identity, ScopeObjectBase::SPtr const& scope, int64_t idle_timeout = 0) override;
+    virtual MWScopeProxy add_scope_object(std::string const& identity, ScopeObjectBase::SPtr const& scope, int64_t idle_timeout) override;
     virtual void add_dflt_scope_object(ScopeObjectBase::SPtr const& scope) override;
     virtual MWStateReceiverProxy add_state_receiver_object(std::string const& identity, StateReceiverObject::SPtr const& state_receiver) override;
 
+    virtual MWPublisher::UPtr create_publisher(std::string const& publisher_id) override;
+    virtual MWSubscriber::UPtr create_subscriber(std::string const& publisher_id, std::string const& topic) override;
+
     virtual std::string get_scope_endpoint() override;
     virtual std::string get_query_endpoint() override;
     virtual std::string get_query_ctrl_endpoint() override;

=== added file 'include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H
+#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H
+
+#include <unity/scopes/internal/MWPublisher.h>
+
+#include <zmqpp/context.hpp>
+#include <zmqpp/socket.hpp>
+
+#include <condition_variable>
+#include <queue>
+#include <thread>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace zmq_middleware
+{
+
+class ZmqPublisher : public virtual MWPublisher
+{
+public:
+    ZmqPublisher(zmqpp::context* context, std::string const& publisher_id,
+                 std::string const& endpoint_dir);
+    virtual ~ZmqPublisher();
+
+    std::string endpoint() const override;
+    void send_message(std::string const& message, std::string const& topic) override;
+
+private:
+    enum ThreadState
+    {
+        NotRunning,
+        Running,
+        Stopping,
+        Failed
+    };
+
+    zmqpp::context* const context_;
+    std::string const endpoint_;
+    std::queue<std::string> message_queue_;
+
+    std::thread thread_;
+    std::mutex mutex_;
+    std::condition_variable cond_;
+    ThreadState thread_state_;
+    std::exception_ptr thread_exception_;
+
+    void publisher_thread();
+};
+
+} // namespace zmq_middleware
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H

=== added file 'include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	2014-05-21 14:02:43 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
+#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
+
+#include <unity/scopes/internal/MWSubscriber.h>
+
+#include <zmqpp/context.hpp>
+
+#include <condition_variable>
+#include <thread>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace zmq_middleware
+{
+
+class StopPublisher;
+
+class ZmqSubscriber : public virtual MWSubscriber
+{
+public:
+    ZmqSubscriber(zmqpp::context* context, std::string const& publisher_id,
+                  std::string const& endpoint_dir, std::string const& topic);
+    virtual ~ZmqSubscriber();
+
+    std::string endpoint() const override;
+    void set_message_callback(SubscriberCallback callback) override;
+
+private:
+    enum ThreadState
+    {
+        NotRunning,
+        Running,
+        Stopping,
+        Failed
+    };
+
+    zmqpp::context* const context_;
+    std::string const endpoint_;
+    std::string const topic_;
+
+    std::thread thread_;
+    std::unique_ptr<StopPublisher> thread_stopper_;
+    std::mutex mutex_;
+    std::condition_variable cond_;
+    ThreadState thread_state_;
+    std::exception_ptr thread_exception_;
+
+    SubscriberCallback callback_;
+
+    void subscriber_thread();
+};
+
+} // namespace zmq_middleware
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H

=== modified file 'scoperegistry/CMakeLists.txt'
--- scoperegistry/CMakeLists.txt	2014-05-06 09:00:45 +0000
+++ scoperegistry/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -1,7 +1,6 @@
 set(SRC
         FindFiles.cpp
         scoperegistry.cpp
-        ScopeSet.cpp
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

=== modified file 'scoperegistry/FindFiles.cpp'
--- scoperegistry/FindFiles.cpp	2014-04-04 13:22:38 +0000
+++ scoperegistry/FindFiles.cpp	2014-05-21 14:02:43 +0000
@@ -21,12 +21,14 @@
 #include <unity/UnityExceptions.h>
 #include <unity/util/ResourcePtr.h>
 
+#include <boost/filesystem/path.hpp>
+
+#include <map>
+
 #include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 
-#include <boost/filesystem/path.hpp>
-
 using namespace std;
 using namespace unity;
 using namespace boost;
@@ -86,10 +88,14 @@
 // Return all files of the form dir/*/<scomescope>.ini that are regular files or
 // symbolic links and have the specified suffix.
 // The empty suffix is legal and causes all regular files and symlinks to be returned.
+// Print error message for any scopes with an id that was seen previously.
 
-vector<string> find_scope_config_files(string const& install_dir, string const& suffix)
+vector<string> find_scope_config_files(string const& install_dir,
+                                       string const& suffix,
+                                       function<void(string const&)> error)
 {
     vector<string> files;
+    map<string, string> scopes_seen;
 
     auto subdirs = find_entries(install_dir, Directory);
     for (auto subdir : subdirs)
@@ -97,13 +103,18 @@
         auto candidates = find_entries(subdir, File);
         for (auto c : candidates)
         {
-            // TODO Check for multiple ini files
-
             filesystem::path path(c);
             if (path.extension() != suffix) {
                 continue;
             }
-
+            auto stem = path.stem().native();
+            auto const it = scopes_seen.find(stem);
+            if (it != scopes_seen.end())
+            {
+                error("ignoring second instance of non-unique scope: " + path.native() + "\n"
+                      "previous instance: " + it->second);
+            }
+            scopes_seen[stem] = path.native();
             files.emplace_back(c);
         }
     }

=== modified file 'scoperegistry/FindFiles.h'
--- scoperegistry/FindFiles.h	2013-11-21 21:44:00 +0000
+++ scoperegistry/FindFiles.h	2014-05-21 14:02:43 +0000
@@ -19,8 +19,9 @@
 #ifndef SCOPEREGISTRY_FINDFILES_H
 #define SCOPEREGISTRY_FINDFILES_H
 
+#include <functional>
+#include <string>
 #include <vector>
-#include <string>
 
 namespace scoperegistry
 {
@@ -34,11 +35,14 @@
 // we get those two .ini files, but no .ini files in canonical or underneath
 // further-nested directories.
 
-std::vector<std::string> find_scope_config_files(std::string const& install_dir, std::string const& suffix);
+std::vector<std::string> find_scope_config_files(std::string const& install_dir,
+                                                 std::string const& suffix,
+                                                 std::function<void(std::string const&)> error);
 
 // Return a vector of file names in dir with the given suffix.
 
-std::vector<std::string> find_files(std::string const& dir, std::string const& suffix);
+std::vector<std::string> find_files(std::string const& dir,
+                                    std::string const& suffix);
 
 } // namespace scoperegistry
 

=== removed file 'scoperegistry/ScopeSet.cpp'
--- scoperegistry/ScopeSet.cpp	2014-04-03 12:57:25 +0000
+++ scoperegistry/ScopeSet.cpp	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Jussi Pakkanen <[e-mail]>
- */
-
-#include"FindFiles.h"
-#include"ScopeSet.h"
-#include <unity/scopes/ScopeMetadata.h>
-#include <unity/scopes/internal/RegistryConfig.h>
-#include <unity/scopes/internal/ScopeConfig.h>
-#include <unity/scopes/ScopeExceptions.h>
-#include<memory>
-#include<map>
-#include<set>
-#include<cstring>
-
-using namespace std;
-using namespace unity::scopes;
-using namespace unity::scopes::internal;
-
-namespace scoperegistry
-{
-
-static string strip_suffix(string const& s, string const& suffix)
-{
-    auto s_len = s.length();
-    auto suffix_len = suffix.length();
-    if (s_len >= suffix_len)
-    {
-        if (s.compare(s_len - suffix_len, suffix_len, suffix) == 0)
-        {
-            return string(s, 0, s_len - suffix_len);
-        }
-    }
-    return s;
-}
-
-struct ScopeSetPrivate
-{
-    std::set<string> overridable_scopes;
-    std::map<string, unique_ptr<ScopeConfig>> scopes;
-};
-
-ScopeSet::ScopeSet(const RegistryConfig& c) : p(new ScopeSetPrivate())
-{
-    string canonical_dir = c.scope_installdir();
-    string oem_dir = c.oem_installdir();
-    auto canonical_files = find_scope_config_files(canonical_dir, ".ini");
-    auto oem_files = find_scope_config_files(oem_dir, ".ini");
-    for (const auto &path : canonical_files)
-    {
-        unique_ptr<ScopeConfig> sc(new ScopeConfig(path));
-        // basename() modifies its argument
-        string file_name = basename(const_cast<char*>(string(path).c_str()));
-        string scope_id = strip_suffix(file_name, ".ini");
-        if (sc->overrideable())
-        {
-            p->overridable_scopes.insert(path);
-        }
-        p->scopes[scope_id] = move(sc);
-    }
-    for (const auto &path : oem_files)
-    {
-        unique_ptr<ScopeConfig> sc(new ScopeConfig(path));
-        string file_name = basename(const_cast<char*>(string(path).c_str()));
-        string scope_id = strip_suffix(file_name, ".ini");
-        if (p->scopes.find(scope_id) != p->scopes.end())
-        {
-            if (p->overridable_scopes.find(scope_id) != p->overridable_scopes.end())
-            {
-                p->scopes[scope_id] = move(sc);
-            }
-            else
-            {
-                // print error about trying to override a non-overridable scope.
-            }
-        }
-        else
-        {
-            p->scopes[scope_id] = move(sc);
-        }
-    }
-    // Add click scope parsing here.
-}
-
-ScopeSet::~ScopeSet()
-{
-    delete p;
-}
-
-std::vector<std::string> ScopeSet::list() const
-{
-    vector<string> list;
-    for (auto &i : p->scopes)
-    {
-        list.push_back(i.first);
-    }
-    return list;
-}
-
-const unity::scopes::internal::ScopeConfig&
-ScopeSet::get(const std::string& name)
-{
-    if (p->scopes.find(name) == p->scopes.end())
-    {
-        throw NotFoundException("Scope does not exist", name);
-    }
-    return *p->scopes[name].get();
-}
-
-}

=== removed file 'scoperegistry/ScopeSet.h'
--- scoperegistry/ScopeSet.h	2014-01-14 13:36:43 +0000
+++ scoperegistry/ScopeSet.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Jussi Pakkanen <[e-mail]>
- */
-
-#ifndef SCOPEREGISTRY_SCOPESET_H_
-#define SCOPEREGISTRY_SCOPESET_H_
-
-#include<vector>
-#include<string>
-#include<unity/scopes/internal/RegistryConfig.h>
-#include<unity/scopes/internal/ScopeConfig.h>
-
-
-namespace scoperegistry
-{
-
-struct ScopeSetPrivate;
-
-
-class ScopeSet final
-{
-
-public:
-
-    ScopeSet(const ::unity::scopes::internal::RegistryConfig& c);
-    ~ScopeSet();
-
-    ScopeSet(const ScopeSet&) = delete;
-    ScopeSet& operator=(const ScopeSet&) = delete;
-
-    std::vector<std::string> list() const;
-    const unity::scopes::internal::ScopeConfig& get(const std::string& name);
-
-private:
-    ScopeSetPrivate* p;
-
-};
-
-
-}
-
-#endif

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-05-14 17:26:34 +0000
+++ scoperegistry/scoperegistry.cpp	2014-05-21 14:02:43 +0000
@@ -136,7 +136,7 @@
     map<string, string> fixed_scopes;           // Scopes that the OEM cannot override
     map<string, string> overrideable_scopes;    // Scopes that the OEM can override
 
-    auto config_files = find_scope_config_files(scope_installdir, ".ini");
+    auto config_files = find_scope_config_files(scope_installdir, ".ini", error);
     for (auto&& path : config_files)
     {
         filesystem::path p(path);
@@ -163,7 +163,7 @@
     {
         try
         {
-            auto oem_paths = find_scope_config_files(oem_installdir, ".ini");
+            auto oem_paths = find_scope_config_files(oem_installdir, ".ini", error);
             for (auto&& path : oem_paths)
             {
                 filesystem::path p(path);
@@ -199,7 +199,7 @@
     {
         try
         {
-            auto click_paths = find_scope_config_files(click_installdir, ".ini");
+            auto click_paths = find_scope_config_files(click_installdir, ".ini", error);
             for (auto&& path : click_paths)
             {
                 filesystem::path p(path);
@@ -424,7 +424,6 @@
 
         add_local_scopes(registry, local_scopes, middleware, scoperunner_path, config_file, false, process_timeout);
         add_local_scopes(registry, click_scopes, middleware, scoperunner_path, config_file, true, process_timeout);
-        local_scopes.insert(click_scopes.begin(), click_scopes.end());
         if (ss_reg_id.empty())
         {
             error("no remote registry configured, only local scopes will be available");

=== modified file 'scoperunner/scoperunner.cpp'
--- scoperunner/scoperunner.cpp	2014-05-09 04:04:06 +0000
+++ scoperunner/scoperunner.cpp	2014-05-21 14:02:43 +0000
@@ -93,7 +93,37 @@
         auto rt = RuntimeImpl::create(scope_id, runtime_config);
         auto mw = rt->factory()->create(scope_id, reg_conf.mw_kind(), reg_conf.mw_configfile());
 
-        ScopeLoader::SPtr loader = ScopeLoader::load(scope_id, lib_dir + "lib" + scope_id + ".so", rt->registry());
+        // For a scope_id "Fred", we look for the library as "libFred.so", "Fred.so", and "scope.so".
+        vector<string> libs;
+        libs.push_back(lib_dir + "lib" + scope_id + ".so");
+        libs.push_back(lib_dir + scope_id + ".so");
+        libs.push_back(lib_dir + "scope.so");
+        string failed_libs;
+        ScopeLoader::SPtr loader;
+        exception_ptr ep;
+        for (auto const& lib : libs)
+        {
+            try
+            {
+                loader = ScopeLoader::load(scope_id, lib, rt->registry());
+            }
+            catch (unity::ResourceException& e)
+            {
+                failed_libs += "\n    " + lib;
+                ep = e.remember(ep);
+            }
+            if (loader)
+            {
+                break;
+            }
+        }
+        if (!loader)
+        {
+            unity::ResourceException e("Cannot load scope " + scope_id + "; tried in the following locations:"
+                                       + failed_libs);
+            e.remember(ep);
+            throw e;
+        }
         loader->start();
 
         // Give a thread to the scope to do with as it likes. If the scope doesn't want to use it and

=== modified file 'src/scopes/CMakeLists.txt'
--- src/scopes/CMakeLists.txt	2014-05-08 14:49:31 +0000
+++ src/scopes/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -29,6 +29,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/PreviewWidget.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/QueryBase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/QueryCtrl.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RadioButtonsFilter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RatingFilter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Registry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Reply.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Result.cpp

=== modified file 'src/scopes/OptionSelectorFilter.cpp'
--- src/scopes/OptionSelectorFilter.cpp	2014-05-08 16:10:18 +0000
+++ src/scopes/OptionSelectorFilter.cpp	2014-05-21 14:02:43 +0000
@@ -30,9 +30,9 @@
 {
 }
 
-OptionSelectorFilter::SPtr OptionSelectorFilter::create(std::string const& id, std::string const& label, bool multi_select)
+OptionSelectorFilter::UPtr OptionSelectorFilter::create(std::string const& id, std::string const& label, bool multi_select)
 {
-    return std::shared_ptr<OptionSelectorFilter>(new OptionSelectorFilter(new internal::OptionSelectorFilterImpl(id, label, multi_select)));
+    return std::unique_ptr<OptionSelectorFilter>(new OptionSelectorFilter(new internal::OptionSelectorFilterImpl(id, label, multi_select)));
 }
 
 std::string OptionSelectorFilter::label() const
@@ -55,6 +55,11 @@
     return fwd()->options();
 }
 
+bool OptionSelectorFilter::has_active_option(FilterState const& filter_state) const
+{
+    return fwd()->has_active_option(filter_state);
+}
+
 std::set<FilterOption::SCPtr> OptionSelectorFilter::active_options(FilterState const& filter_state) const
 {
     return fwd()->active_options(filter_state);

=== added file 'src/scopes/RadioButtonsFilter.cpp'
--- src/scopes/RadioButtonsFilter.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/RadioButtonsFilter.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+*/
+
+#include <unity/scopes/RadioButtonsFilter.h>
+#include <unity/scopes/internal/RadioButtonsFilterImpl.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+RadioButtonsFilter::RadioButtonsFilter(internal::RadioButtonsFilterImpl *impl)
+    : FilterBase(impl)
+{
+}
+
+FilterOption::SCPtr RadioButtonsFilter::add_option(std::string const& id, std::string const& label)
+{
+    return fwd()->add_option(id, label);
+}
+
+std::string RadioButtonsFilter::label() const
+{
+    return fwd()->label();
+}
+
+FilterOption::SCPtr RadioButtonsFilter::active_option(FilterState const& filter_state) const
+{
+    return fwd()->active_option(filter_state);
+}
+
+bool RadioButtonsFilter::has_active_option(FilterState const& filter_state) const
+{
+    return fwd()->has_active_option(filter_state);
+}
+
+std::list<FilterOption::SCPtr> RadioButtonsFilter::options() const
+{
+    return fwd()->options();
+}
+
+void RadioButtonsFilter::update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const
+{
+    fwd()->update_state(filter_state, option, active);
+}
+
+void RadioButtonsFilter::update_state(FilterState& filter_state, std::string const& filter_id, std::string const& option_id, bool value)
+{
+    internal::RadioButtonsFilterImpl::update_state(filter_state, filter_id, option_id, value);
+}
+
+RadioButtonsFilter::UPtr RadioButtonsFilter::create(std::string const& id, std::string const& label)
+{
+    return std::unique_ptr<RadioButtonsFilter>(new RadioButtonsFilter(new internal::RadioButtonsFilterImpl(id, label)));
+}
+
+internal::RadioButtonsFilterImpl* RadioButtonsFilter::fwd() const
+{
+    return dynamic_cast<internal::RadioButtonsFilterImpl*>(p.get());
+}
+
+} // namespace scopes
+
+} // namespace unity

=== added file 'src/scopes/RatingFilter.cpp'
--- src/scopes/RatingFilter.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/RatingFilter.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+*/
+
+#include <unity/scopes/RatingFilter.h>
+#include <unity/scopes/internal/RatingFilterImpl.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+RatingFilter::RatingFilter(internal::RatingFilterImpl *impl)
+    : FilterBase(impl)
+{
+}
+
+RatingFilter::UPtr RatingFilter::create(std::string const& id, std::string const& label, int top_rating)
+{
+    return std::unique_ptr<RatingFilter>(new RatingFilter(new internal::RatingFilterImpl(id, label, top_rating)));
+}
+
+RatingFilter::UPtr RatingFilter::create(std::string const& id, std::string const& label)
+{
+    return std::unique_ptr<RatingFilter>(new RatingFilter(new internal::RatingFilterImpl(id, label)));
+}
+
+FilterOption::SCPtr RatingFilter::add_option(std::string const& id, std::string const& label)
+{
+    return fwd()->add_option(id, label);
+}
+
+void RatingFilter::set_on_icon(std::string const& on_icon)
+{
+    fwd()->set_on_icon(on_icon);
+}
+
+void RatingFilter::set_off_icon(std::string const& off_icon)
+{
+    fwd()->set_off_icon(off_icon);
+}
+
+std::string RatingFilter::label() const
+{
+    return fwd()->label();
+}
+
+std::list<FilterOption::SCPtr> RatingFilter::options() const
+{
+    return fwd()->options();
+}
+
+std::string RatingFilter::on_icon() const
+{
+    return fwd()->on_icon();
+}
+
+std::string RatingFilter::off_icon() const
+{
+    return fwd()->off_icon();
+}
+
+FilterOption::SCPtr RatingFilter::active_rating(FilterState const& filter_state) const
+{
+    return fwd()->active_option(filter_state);
+}
+
+bool RatingFilter::has_active_rating(FilterState const& filter_state) const
+{
+    return fwd()->has_active_option(filter_state);
+}
+
+void RatingFilter::update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const
+{
+    fwd()->update_state(filter_state, option, active);
+}
+
+void RatingFilter::update_state(FilterState& filter_state, std::string const& filter_id, std::string const& option_id, bool value)
+{
+    internal::RatingFilterImpl::update_state(filter_state, filter_id, option_id, value);
+}
+
+internal::RatingFilterImpl* RatingFilter::fwd() const
+{
+    return dynamic_cast<internal::RatingFilterImpl*>(p.get());
+}
+
+} // namespace scopes
+
+} // namespace unity

=== modified file 'src/scopes/internal/CMakeLists.txt'
--- src/scopes/internal/CMakeLists.txt	2014-05-08 14:49:31 +0000
+++ src/scopes/internal/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -29,12 +29,14 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/MiddlewareBase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MiddlewareFactory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWObject.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/MWPublisher.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWQuery.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWQueryCtrl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWRegistry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWReply.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWScope.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/MWStateReceiver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/MWSubscriber.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ObjectImpl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/OptionSelectorFilterImpl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/PreviewQueryObject.cpp
@@ -46,6 +48,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/QueryCtrlObject.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/QueryMetadataImpl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/QueryObject.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RadioButtonsFilterImpl.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RatingFilterImpl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RangeInputFilterImpl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Reaper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RegistryConfig.cpp

=== modified file 'src/scopes/internal/FilterBaseImpl.cpp'
--- src/scopes/internal/FilterBaseImpl.cpp	2014-05-15 22:32:00 +0000
+++ src/scopes/internal/FilterBaseImpl.cpp	2014-05-21 14:02:43 +0000
@@ -22,6 +22,8 @@
 #include <unity/scopes/internal/Utils.h>
 #include <unity/scopes/internal/OptionSelectorFilterImpl.h>
 #include <unity/scopes/internal/RangeInputFilterImpl.h>
+#include <unity/scopes/internal/RadioButtonsFilterImpl.h>
+#include <unity/scopes/internal/RatingFilterImpl.h>
 #include <unity/UnityExceptions.h>
 #include <sstream>
 
@@ -117,6 +119,14 @@
         {
             return RangeInputFilterImpl::create(var);
         }
+        if (ftype == "radio_buttons")
+        {
+            return RadioButtonsFilterImpl::create(var);
+        }
+        if (ftype == "rating")
+        {
+            return RatingFilterImpl::create(var);
+        }
         throw unity::LogicException("Unknown filter type: " + ftype);
     }
     throw unity::LogicException("FilterBase: Missing 'filter_type'");
@@ -142,6 +152,56 @@
     return filters;
 }
 
+void FilterBaseImpl::validate_filters(Filters const& filters)
+{
+    for (auto const& f: filters)
+    {
+        if (f == nullptr)
+        {
+            throw unity::LogicException("FilterBaseImpl::validate_filters(): invalid null filter pointer");
+        }
+        {
+            OptionSelectorFilter::SCPtr optsel = std::dynamic_pointer_cast<OptionSelectorFilter const>(f);
+            if (optsel)
+            {
+                if (optsel->options().size() == 0)
+                {
+                    std::stringstream err;
+                    err << "FilterBaseImpl::validate_filters(): invalid empty OptionSelectorFilter '" << f->id() << "'";
+                    throw unity::LogicException(err.str());
+                }
+                continue;
+            }
+        }
+        {
+            RatingFilter::SCPtr rating = std::dynamic_pointer_cast<RatingFilter const>(f);
+            if (rating)
+            {
+                if (rating->options().size() == 0)
+                {
+                    std::stringstream err;
+                    err << "FilterBaseImpl::validate_filters(): invalid empty RatingFilter '" << f->id() << "'";
+                    throw unity::LogicException(err.str());
+                }
+                continue;
+            }
+        }
+        {
+            RadioButtonsFilter::SCPtr radiobtn = std::dynamic_pointer_cast<RadioButtonsFilter const>(f);
+            if (radiobtn)
+            {
+                if (radiobtn->options().size() == 0)
+                {
+                    std::stringstream err;
+                    err << "FilterBaseImpl::validate_filters(): invalid empty RadioButtonsFilter '" << f->id() << "'";
+                    throw unity::LogicException(err.str());
+                }
+                continue;
+            }
+        }
+    }
+}
+
 } // namespace internal
 
 } // namespace scopes

=== added file 'src/scopes/internal/MWPublisher.cpp'
--- src/scopes/internal/MWPublisher.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/MWPublisher.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include <unity/scopes/internal/MWPublisher.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+MWPublisher::MWPublisher()
+{
+}
+
+MWPublisher::~MWPublisher()
+{
+}
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== added file 'src/scopes/internal/MWSubscriber.cpp'
--- src/scopes/internal/MWSubscriber.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/MWSubscriber.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include <unity/scopes/internal/MWSubscriber.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+MWSubscriber::MWSubscriber()
+{
+}
+
+MWSubscriber::~MWSubscriber()
+{
+}
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== modified file 'src/scopes/internal/OptionSelectorFilterImpl.cpp'
--- src/scopes/internal/OptionSelectorFilterImpl.cpp	2014-05-15 03:23:43 +0000
+++ src/scopes/internal/OptionSelectorFilterImpl.cpp	2014-05-21 14:02:43 +0000
@@ -131,6 +131,11 @@
     }
 }
 
+int OptionSelectorFilterImpl::num_of_options() const
+{
+    return options_.size();
+}
+
 std::list<FilterOption::SCPtr> OptionSelectorFilterImpl::options() const
 {
     return options_;
@@ -170,6 +175,33 @@
     return opts;
 }
 
+bool OptionSelectorFilterImpl::has_active_option(FilterState const& filter_state) const
+{
+    if (filter_state.has_filter(id()))
+    {
+        try
+        {
+            auto const var = FilterBaseImpl::get(filter_state, id()).get_array(); // this can throw if of different type
+
+            for (auto const& idvar: var)
+            {
+                auto const opt_id = idvar.get_string();
+                for (auto const& opt: options_)
+                {
+                    if (opt_id == opt->id())
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        catch (...)
+        {
+        }
+    }
+    return false;
+}
+
 void OptionSelectorFilterImpl::update_state(FilterState& filter_state, FilterOption::SCPtr option, bool active) const
 {
     auto const oid(option->id());

=== added file 'src/scopes/internal/RadioButtonsFilterImpl.cpp'
--- src/scopes/internal/RadioButtonsFilterImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/RadioButtonsFilterImpl.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+*/
+
+#include <unity/scopes/internal/RadioButtonsFilterImpl.h>
+#include <unity/scopes/FilterState.h>
+#include <sstream>
+#include <unity/UnityExceptions.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+RadioButtonsFilterImpl::RadioButtonsFilterImpl(std::string const& id, std::string const& label)
+    : OptionSelectorFilterImpl(id, label, false)
+{
+}
+
+RadioButtonsFilterImpl::RadioButtonsFilterImpl(VariantMap const& var)
+    : OptionSelectorFilterImpl(var)
+{
+    if (multi_select()) // this should never happen unless a client bypasses the api
+    {
+        std::stringstream err;
+        err << "RadioButtonsFilterImpl(): invalid filter data, multi selection is not available with RadioButtonsFilter, filter id '" << id() << "'";
+        throw unity::LogicException(err.str());
+    }
+}
+
+FilterOption::SCPtr RadioButtonsFilterImpl::active_option(FilterState const& filter_state) const
+{
+    auto const active = active_options(filter_state);
+    if (active.size() > 1) // this should never happen unless a client bypasses the api
+    {
+        std::stringstream err;
+        err << "RadioButtonsFilterImpl::active_option(): internal error, more than one button active, filter id '" << id() << "'";
+        throw unity::LogicException(err.str());
+    }
+
+    if (active.size() == 1)
+    {
+        return *active.begin();
+    }
+
+    return nullptr;
+}
+
+std::string RadioButtonsFilterImpl::filter_type() const
+{
+    return "radio_buttons";
+}
+
+RadioButtonsFilter::SPtr RadioButtonsFilterImpl::create(VariantMap const& var)
+{
+    return std::shared_ptr<RadioButtonsFilter>(new RadioButtonsFilter(new RadioButtonsFilterImpl(var)));
+}
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== added file 'src/scopes/internal/RatingFilterImpl.cpp'
--- src/scopes/internal/RatingFilterImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/RatingFilterImpl.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+*/
+
+#include <unity/scopes/RatingFilter.h>
+#include <unity/scopes/internal/RatingFilterImpl.h>
+#include <unity/UnityExceptions.h>
+#include <sstream>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+RatingFilterImpl::RatingFilterImpl(std::string const& id, std::string const& label)
+    : RadioButtonsFilterImpl(id, label)
+{
+}
+
+RatingFilterImpl::RatingFilterImpl(std::string const& id, std::string const& label, int top_rating)
+    : RadioButtonsFilterImpl(id, label)
+{
+    if (top_rating < 2 || top_rating > max_rating)
+    {
+        std::stringstream err;
+        err << "RatingFilterImpl(): top_rating " << top_rating << " outside of allowed range for filter '" << id << "'";
+        throw unity::LogicException(err.str());
+    }
+
+    // create rating options from 1..top_rating range, e.g. "1+", "2+", ..., "5".
+    for (int i = 1; i <= top_rating; i++)
+    {
+        auto const num = std::to_string(i);
+        RadioButtonsFilterImpl::add_option(num, i < top_rating ? num + "+" : num);
+    }
+}
+
+RatingFilterImpl::RatingFilterImpl(VariantMap const& var)
+    : RadioButtonsFilterImpl(var)
+{
+}
+
+FilterOption::SCPtr RatingFilterImpl::add_option(std::string const& id, std::string const& label)
+{
+    if (num_of_options() < max_rating)
+    {
+        return RadioButtonsFilterImpl::add_option(id, label);
+    }
+    else
+    {
+        std::stringstream err;
+        err << "RatingFilterImpl::add_option(): maximum number of rating options reached for filter '" << id << "'";
+        throw unity::LogicException(err.str());
+    }
+}
+
+void RatingFilterImpl::set_on_icon(std::string const& on_icon)
+{
+    on_icon_ = on_icon;
+}
+
+void RatingFilterImpl::set_off_icon(std::string const& off_icon)
+{
+    off_icon_ = off_icon;
+}
+
+std::string RatingFilterImpl::on_icon() const
+{
+    return on_icon_;
+}
+
+std::string RatingFilterImpl::off_icon() const
+{
+    return off_icon_;
+}
+
+RatingFilter::SPtr RatingFilterImpl::create(VariantMap const& var)
+{
+    return std::shared_ptr<RatingFilter>(new RatingFilter(new RatingFilterImpl(var)));
+}
+
+std::string RatingFilterImpl::filter_type() const
+{
+    return "rating";
+}
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== modified file 'src/scopes/internal/SearchReplyImpl.cpp'
--- src/scopes/internal/SearchReplyImpl.cpp	2014-04-29 11:20:57 +0000
+++ src/scopes/internal/SearchReplyImpl.cpp	2014-05-21 14:02:43 +0000
@@ -62,7 +62,7 @@
     }
     catch (unity::LogicException const &e)
     {
-        throw unity::LogicException("Reply::register_departments(): Failed to validate departments");
+        throw unity::LogicException("SearchReplyImpl::register_departments(): Failed to validate departments");
     }
 
     ReplyImpl::push(internal::DepartmentImpl::serialize_departments(departments, current_department_id)); // ignore return value?
@@ -129,6 +129,16 @@
 
 bool SearchReplyImpl::push(unity::scopes::Filters const& filters, unity::scopes::FilterState const& filter_state)
 {
+    // basic consistency check
+    try
+    {
+        internal::FilterBaseImpl::validate_filters(filters);
+    }
+    catch (unity::LogicException const &e)
+    {
+        throw unity::LogicException("SearchReplyImpl::push(): Failed to validate filters");
+    }
+
     VariantMap var;
     var["filters"] = internal::FilterBaseImpl::serialize_filters(filters);
     var["filter_state"] = filter_state.serialize();

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-05-09 08:20:57 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-05-21 14:02:43 +0000
@@ -232,6 +232,11 @@
                 metadata->set_art(*scope.art);
             }
 
+            if (scope.appearance)
+            {
+                metadata->set_appearance_attributes(*scope.appearance);
+            }
+
             metadata->set_invisible(scope.invisible);
 
             ScopeProxy proxy = ScopeImpl::create(middleware_->create_scope_proxy(scope.id, ss_scope_endpoint_),

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-05-09 09:56:09 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-05-21 14:02:43 +0000
@@ -259,6 +259,11 @@
                 scope.art.reset(new std::string(child_node->get_node("art")->as_string()));
             }
 
+            if (child_node->has_node("appearance"))
+            {
+                scope.appearance.reset(new VariantMap(child_node->get_node("appearance")->to_variant().get_dict()));
+            }
+
             scope.invisible = child_node->has_node("invisible") ? child_node->get_node("invisible")->as_bool() : false;
 
             remote_scopes.push_back(scope);

=== modified file 'src/scopes/internal/zmq_middleware/CMakeLists.txt'
--- src/scopes/internal/zmq_middleware/CMakeLists.txt	2014-04-15 00:30:07 +0000
+++ src/scopes/internal/zmq_middleware/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -21,6 +21,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqMiddleware.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqException.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqObject.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ZmqPublisher.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqQuery.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqQueryCtrl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqReceiver.cpp
@@ -29,5 +30,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqScope.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqSender.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ZmqStateReceiver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ZmqSubscriber.cpp
 )
 set(UNITY_SCOPES_LIB_SRC ${UNITY_SCOPES_LIB_SRC} ${SRC} PARENT_SCOPE)

=== modified file 'src/scopes/internal/zmq_middleware/ObjectAdapter.cpp'
--- src/scopes/internal/zmq_middleware/ObjectAdapter.cpp	2014-05-14 04:50:14 +0000
+++ src/scopes/internal/zmq_middleware/ObjectAdapter.cpp	2014-05-21 14:02:43 +0000
@@ -494,47 +494,6 @@
     }
 }
 
-// For the ipc transport, zmq permits more than one server to bind to the same endpoint.
-// If a server binds to an endpoint while another server is using that endpoint, the
-// second server silently "steals" the endpoint from the previous server, so all
-// connects after that point go to the new server, while connects that happened earlier
-// go to the old server. This is meant as a fail-over feature, and cannot be disabled.
-//
-// We don't want this and need an error if two servers try to use the same endpoint.
-// Hacky solution: we check whether it's possible to successfully connect to the
-// endpoint. If so, a server is still running there, and we throw. This has a
-// small race because a second server may connect after the check, but before
-// the bind. But, in practice, that's good enough for our purposes.
-
-void ObjectAdapter::safe_bind(zmqpp::socket& s, string const& endpoint)
-{
-    const std::string transport_prefix = "ipc://";
-    if (endpoint.substr(0, transport_prefix.size()) == transport_prefix)
-    {
-        string path = endpoint.substr(transport_prefix.size());
-        struct sockaddr_un addr;
-        memset(&addr, 0, sizeof(addr));
-        addr.sun_family = AF_UNIX;
-        strncpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path) - 1);
-        int fd = ::socket(AF_UNIX, SOCK_STREAM, 0);
-        if (fd == -1)
-        {
-            // LCOV_EXCL_START
-            throw MiddlewareException("ObjectAdapter: broker thread failure (adapter: " + name_ + "): " +
-                                      "cannot create socket: " + strerror(errno));
-            // LCOV_EXCL_STOP
-        }
-        util::ResourcePtr<int, decltype(&::close)> close_guard(fd, ::close);
-        if (::connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0)
-        {
-            // Connect succeeded, so another server is using the socket already.
-            throw MiddlewareException("ObjectAdapter: broker thread failure (adapter: " + name_ + "): " +
-                                      "address in use: " + endpoint);
-        }
-    }
-    s.bind(endpoint);
-}
-
 shared_ptr<ServantBase> ObjectAdapter::find_servant(string const& id, string const& category)
 {
     shared_ptr<ServantBase> servant = find(id);

=== modified file 'src/scopes/internal/zmq_middleware/Util.cpp'
--- src/scopes/internal/zmq_middleware/Util.cpp	2014-01-28 06:34:03 +0000
+++ src/scopes/internal/zmq_middleware/Util.cpp	2014-05-21 14:02:43 +0000
@@ -19,7 +19,10 @@
 #include <unity/scopes/internal/zmq_middleware/Util.h>
 
 #include <unity/scopes/ScopeExceptions.h>
+#include <unity/util/ResourcePtr.h>
 
+#include <unistd.h>
+#include <sys/socket.h>
 #include <sys/un.h>
 
 using namespace std;
@@ -55,6 +58,45 @@
     }
 }
 
+// For the ipc transport, zmq permits more than one server to bind to the same endpoint.
+// If a server binds to an endpoint while another server is using that endpoint, the
+// second server silently "steals" the endpoint from the previous server, so all
+// connects after that point go to the new server, while connects that happened earlier
+// go to the old server. This is meant as a fail-over feature, and cannot be disabled.
+//
+// We don't want this and need an error if two servers try to use the same endpoint.
+// Hacky solution: we check whether it's possible to successfully connect to the
+// endpoint. If so, a server is still running there, and we throw. This has a
+// small race because a second server may connect after the check, but before
+// the bind. But, in practice, that's good enough for our purposes.
+
+void safe_bind(zmqpp::socket& s, string const& endpoint)
+{
+    const std::string transport_prefix = "ipc://";
+    if (endpoint.substr(0, transport_prefix.size()) == transport_prefix)
+    {
+        string path = endpoint.substr(transport_prefix.size());
+        struct sockaddr_un addr;
+        memset(&addr, 0, sizeof(addr));
+        addr.sun_family = AF_UNIX;
+        strncpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path) - 1);
+        int fd = ::socket(AF_UNIX, SOCK_STREAM, 0);
+        if (fd == -1)
+        {
+            // LCOV_EXCL_START
+            throw MiddlewareException("safe_bind(): cannot create socket: " + std::string(strerror(errno)));
+            // LCOV_EXCL_STOP
+        }
+        util::ResourcePtr<int, decltype(&::close)> close_guard(fd, ::close);
+        if (::connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0)
+        {
+            // Connect succeeded, so another server is using the socket already.
+            throw MiddlewareException("safe_bind(): address in use: " + endpoint);
+        }
+    }
+    s.bind(endpoint);
+}
+
 } // namespace zmq_middleware
 
 } // namespace internal

=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-05-15 08:12:19 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-05-21 14:02:43 +0000
@@ -29,12 +29,14 @@
 #include <unity/scopes/internal/zmq_middleware/ReplyI.h>
 #include <unity/scopes/internal/zmq_middleware/ScopeI.h>
 #include <unity/scopes/internal/zmq_middleware/StateReceiverI.h>
+#include <unity/scopes/internal/zmq_middleware/ZmqPublisher.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqQuery.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqQueryCtrl.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqRegistry.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqReply.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqScope.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqStateReceiver.h>
+#include <unity/scopes/internal/zmq_middleware/ZmqSubscriber.h>
 #include <unity/scopes/internal/zmq_middleware/RethrowException.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
@@ -59,10 +61,11 @@
 namespace
 {
 
-char const* query_suffix = "-q";  // Appended to server_name_ to create query adapter name
-char const* ctrl_suffix = "-c";   // Appended to server_name_ to create control adapter name
-char const* reply_suffix = "-r";  // Appended to server_name_ to create reply adapter name
-char const* state_suffix = "-s";  // Appended to server_name_ to create state adapter name
+char const* query_suffix = "-q";     // Appended to server_name_ to create query adapter name
+char const* ctrl_suffix = "-c";      // Appended to server_name_ to create control adapter name
+char const* reply_suffix = "-r";     // Appended to server_name_ to create reply adapter name
+char const* state_suffix = "-s";     // Appended to server_name_ to create state adapter name
+char const* publisher_suffix = "-p"; // Appended to publisher_id to create a publisher endpoint
 
 char const* query_category = "Query";       // query adapter category name
 char const* ctrl_category = "QueryCtrl";    // control adapter category name
@@ -657,6 +660,16 @@
     return proxy;
 }
 
+MWPublisher::UPtr ZmqMiddleware::create_publisher(std::string const& publisher_id)
+{
+    return MWPublisher::UPtr(new ZmqPublisher(&context_, publisher_id + publisher_suffix, config_.public_dir()));
+}
+
+MWSubscriber::UPtr ZmqMiddleware::create_subscriber(std::string const& publisher_id, std::string const& topic)
+{
+    return MWSubscriber::UPtr(new ZmqSubscriber(&context_, publisher_id + publisher_suffix, config_.public_dir(), topic));
+}
+
 std::string ZmqMiddleware::get_scope_endpoint()
 {
     return "ipc://" + config_.private_dir() + "/" +  server_name_;

=== added file 'src/scopes/internal/zmq_middleware/ZmqPublisher.cpp'
--- src/scopes/internal/zmq_middleware/ZmqPublisher.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/zmq_middleware/ZmqPublisher.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include <unity/scopes/internal/zmq_middleware/ZmqPublisher.h>
+
+#include <unity/scopes/internal/zmq_middleware/Util.h>
+#include <unity/scopes/ScopeExceptions.h>
+#include <unity/util/ResourcePtr.h>
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace zmq_middleware
+{
+
+ZmqPublisher::ZmqPublisher(zmqpp::context* context, std::string const& publisher_id,
+                           std::string const& endpoint_dir)
+    : context_(context)
+    , endpoint_("ipc://" + endpoint_dir + "/" + publisher_id)
+    , thread_state_(NotRunning)
+    , thread_exception_(nullptr)
+{
+    // Validate publisher_id
+    if (publisher_id.find('/') != std::string::npos)
+    {
+        throw MiddlewareException("ZmqPublisher(): A publisher cannot contain a '/' in its id");
+    }
+
+    // Start the publisher thread
+    thread_ = std::thread(&ZmqPublisher::publisher_thread, this);
+
+    std::unique_lock<std::mutex> lock(mutex_);
+    cond_.wait(lock, [this] { return thread_state_ == Running || thread_state_ == Failed; });
+
+    if (thread_state_ == Failed)
+    {
+        if (thread_.joinable())
+        {
+            thread_.join();
+        }
+        try
+        {
+            std::rethrow_exception(thread_exception_);
+        }
+        catch (...)
+        {
+            throw MiddlewareException("ZmqPublisher(): publisher thread failed to start (endpoint: " +
+                                      endpoint_ + ")");
+        }
+    }
+}
+
+ZmqPublisher::~ZmqPublisher()
+{
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_state_ = Stopping;
+        cond_.notify_all();
+    }
+
+    if (thread_.joinable())
+    {
+        thread_.join();
+    }
+}
+
+std::string ZmqPublisher::endpoint() const
+{
+    return endpoint_;
+}
+
+void ZmqPublisher::send_message(std::string const& message, std::string const& topic)
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    // Write message in the format: "<topic>:<message>"
+    message_queue_.push(topic + ':' + message);
+    cond_.notify_all();
+}
+
+void ZmqPublisher::publisher_thread()
+{
+    try
+    {
+        // Create the publisher socket
+        zmqpp::socket pub_socket(zmqpp::socket(*context_, zmqpp::socket_type::publish));
+        pub_socket.set(zmqpp::socket_option::linger, 5000);
+        safe_bind(pub_socket, endpoint_);
+
+        // Notify constructor that the thread is now running
+        std::unique_lock<std::mutex> lock(mutex_);
+        thread_state_ = Running;
+        cond_.notify_all();
+
+        // Wait for send_message or stop
+        while (true)
+        {
+            // mutex_ unlocked
+            cond_.wait(lock, [this] { return thread_state_ == Stopping || !message_queue_.empty(); });
+            // mutex_ locked
+
+            // Flush out the message queue before stopping the thread
+            if (!message_queue_.empty())
+            {
+                pub_socket.send(message_queue_.front());
+                message_queue_.pop();
+            }
+            else if (thread_state_ == Stopping)
+            {
+                break;
+            }
+        }
+
+        // Clean up
+        pub_socket.close();
+    }
+    catch (...)
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_exception_ = std::current_exception();
+        thread_state_ = Failed;
+        cond_.notify_all();
+    }
+}
+
+} // namespace zmq_middleware
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== added file 'src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp'
--- src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include <unity/scopes/internal/zmq_middleware/ZmqSubscriber.h>
+
+#include <unity/scopes/internal/UniqueID.h>
+#include <unity/scopes/internal/zmq_middleware/StopPublisher.h>
+#include <unity/scopes/ScopeExceptions.h>
+
+#include <zmqpp/poller.hpp>
+#include <zmqpp/socket.hpp>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace zmq_middleware
+{
+
+ZmqSubscriber::ZmqSubscriber(zmqpp::context* context, std::string const& publisher_id,
+                             std::string const& endpoint_dir, std::string const& topic)
+    : context_(context)
+    , endpoint_("ipc://" + endpoint_dir + "/" + publisher_id)
+    , topic_(topic)
+    , thread_state_(NotRunning)
+    , thread_exception_(nullptr)
+    , callback_(nullptr)
+{
+    // Validate publisher_id
+    if (publisher_id.find('/') != std::string::npos)
+    {
+        throw MiddlewareException("ZmqSubscriber(): A publisher cannot contain a '/' in its id");
+    }
+
+    // Start thread_stopper_ publisher (used to send a stop message to the subscriber on destruction)
+    try
+    {
+        UniqueID unique_id;
+        thread_stopper_.reset(new StopPublisher(context, unique_id.gen()));
+    }
+    catch (...)
+    {
+        throw MiddlewareException("ZmqSubscriber(): thread_stopper_ failed to initialize (adapter: " + publisher_id + ")");
+    }
+
+    // Start the subscriber thread
+    thread_ = std::thread(&ZmqSubscriber::subscriber_thread, this);
+
+    std::unique_lock<std::mutex> lock(mutex_);
+    cond_.wait(lock, [this] { return thread_state_ == Running || thread_state_ == Failed; });
+
+    if (thread_state_ == Failed)
+    {
+        if (thread_.joinable())
+        {
+            thread_.join();
+        }
+        try
+        {
+            std::rethrow_exception(thread_exception_);
+        }
+        catch (...)
+        {
+            throw MiddlewareException("ZmqSubscriber(): subscriber thread failed to start (endpoint: " +
+                                      endpoint_ + ")");
+        }
+    }
+}
+
+ZmqSubscriber::~ZmqSubscriber()
+{
+    thread_stopper_->stop();
+
+    if (thread_.joinable())
+    {
+        thread_.join();
+    }
+}
+
+std::string ZmqSubscriber::endpoint() const
+{
+    return endpoint_;
+}
+
+void ZmqSubscriber::set_message_callback(SubscriberCallback callback)
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+    callback_ = callback;
+}
+
+void ZmqSubscriber::subscriber_thread()
+{
+    try
+    {
+        // Subscribe to our associated publisher socket
+        zmqpp::socket sub_socket(*context_, zmqpp::socket_type::subscribe);
+        sub_socket.set(zmqpp::socket_option::linger, 0);
+        sub_socket.connect(endpoint_);
+        sub_socket.subscribe(topic_);
+
+        // Subscribe to the thread_stopper_ socket
+        zmqpp::socket stop_socket = thread_stopper_->subscribe();
+
+        // Configure the message poller
+        zmqpp::poller poller;
+        poller.add(sub_socket);
+        poller.add(stop_socket);
+
+        // Notify constructor that the thread is now running
+        {
+            std::lock_guard<std::mutex> lock(mutex_);
+            thread_state_ = Running;
+            cond_.notify_all();
+        }
+
+        // Poll for messages
+        std::string message;
+        while (true)
+        {
+            poller.poll();
+
+            // Flush out the message queue before stopping the thread
+            if (poller.has_input(sub_socket))
+            {
+                sub_socket.receive(message);
+
+                // Discard the message if no callback is set
+                std::lock_guard<std::mutex> lock(mutex_);
+                if (callback_)
+                {
+                    // Message should arrive in the format: "<topic>:<message>"
+                    if (message.length() > topic_.length() &&
+                        message[topic_.length()] == ':')
+                    {
+                        callback_(message.substr(topic_.length() + 1));
+                    }
+                }
+            }
+            else if(poller.has_input(stop_socket))
+            {
+                break;
+            }
+        }
+
+        // Clean up
+        poller.remove(sub_socket);
+        poller.remove(stop_socket);
+        sub_socket.close();
+    }
+    catch (...)
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_exception_ = std::current_exception();
+        thread_state_ = Failed;
+        cond_.notify_all();
+    }
+}
+
+} // namespace zmq_middleware
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== modified file 'test/gtest/scopes/CMakeLists.txt'
--- test/gtest/scopes/CMakeLists.txt	2014-05-14 04:50:14 +0000
+++ test/gtest/scopes/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -14,7 +14,9 @@
 add_subdirectory(IdleShutdown)
 add_subdirectory(Invocation)
 add_subdirectory(OptionSelectorFilter)
+add_subdirectory(RadioButtonsFilter)
 add_subdirectory(RangeInputFilter)
+add_subdirectory(RatingFilter)
 add_subdirectory(PreviewWidget)
 add_subdirectory(QueryMetadata)
 add_subdirectory(Registry)

=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
--- test/gtest/scopes/Filters/Filters_test.cpp	2014-05-08 17:08:38 +0000
+++ test/gtest/scopes/Filters/Filters_test.cpp	2014-05-21 14:02:43 +0000
@@ -18,7 +18,10 @@
 
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
+#include <unity/scopes/internal/FilterBaseImpl.h>
 #include <unity/scopes/FilterOption.h>
+#include <unity/scopes/RadioButtonsFilter.h>
+#include <unity/scopes/RatingFilter.h>
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/UnityExceptions.h>
 #include <gtest/gtest.h>
@@ -133,3 +136,72 @@
         EXPECT_EQ("o1", option1->id());
     }
 }
+
+TEST(Filters, deserialize)
+{
+    // check that FilterBaseImpl::deserialize() creates valid instances of all filter types
+    {
+        OptionSelectorFilter::SPtr filter1 = OptionSelectorFilter::create("f1", "Options", false);
+        auto option1 = filter1->add_option("1", "Option 1");
+        auto var = filter1->serialize();
+
+        auto f = internal::FilterBaseImpl::deserialize(var);
+        EXPECT_TRUE(std::dynamic_pointer_cast<OptionSelectorFilter const>(f) != nullptr);
+        EXPECT_EQ("option_selector", f->filter_type());
+
+        const Filters filters {filter1};
+        EXPECT_NO_THROW(internal::FilterBaseImpl::validate_filters(filters));
+    }
+
+    {
+        RadioButtonsFilter::SPtr filter1 = RadioButtonsFilter::create("f1", "Options");
+        auto option1 = filter1->add_option("1", "Option 1");
+        auto var = filter1->serialize();
+
+        auto f = internal::FilterBaseImpl::deserialize(var);
+        EXPECT_TRUE(std::dynamic_pointer_cast<RadioButtonsFilter const>(f) != nullptr);
+        EXPECT_EQ("radio_buttons", f->filter_type());
+
+        const Filters filters {filter1};
+        EXPECT_NO_THROW(internal::FilterBaseImpl::validate_filters(filters));
+    }
+
+    {
+        RatingFilter::SPtr filter1 = RatingFilter::create("f1", "Options", 5);
+        auto var = filter1->serialize();
+
+        auto f = internal::FilterBaseImpl::deserialize(var);
+        EXPECT_TRUE(std::dynamic_pointer_cast<RatingFilter const>(f) != nullptr);
+        EXPECT_EQ("rating", f->filter_type());
+
+        const Filters filters {filter1};
+        EXPECT_NO_THROW(internal::FilterBaseImpl::validate_filters(filters));
+    }
+
+    {
+        // invalid data (no filter_type)
+        VariantMap var;
+        EXPECT_THROW(internal::FilterBaseImpl::deserialize(var), unity::LogicException);
+    }
+}
+
+TEST(Filters, validate)
+{
+    {
+        FilterBase::SPtr filter1 = OptionSelectorFilter::create("f1", "Options", false);
+        const Filters filters {filter1};
+        EXPECT_THROW(internal::FilterBaseImpl::validate_filters(filters), unity::LogicException);
+    }
+
+    {
+        FilterBase::SPtr filter1 = RadioButtonsFilter::create("f1", "Options");
+        const Filters filters {filter1};
+        EXPECT_THROW(internal::FilterBaseImpl::validate_filters(filters), unity::LogicException);
+    }
+
+    {
+        FilterBase::SPtr filter1 = RatingFilter::create("f1", "Options");
+        const Filters filters {filter1};
+        EXPECT_THROW(internal::FilterBaseImpl::validate_filters(filters), unity::LogicException);
+    }
+}

=== modified file 'test/gtest/scopes/Filters/TestScope.h'
--- test/gtest/scopes/Filters/TestScope.h	2014-03-07 01:07:28 +0000
+++ test/gtest/scopes/Filters/TestScope.h	2014-05-21 14:02:43 +0000
@@ -45,7 +45,7 @@
     virtual void run(SearchReplyProxy const& reply) override
     {
         Filters filters;
-        auto filter = OptionSelectorFilter::create("f1", "Choose an option", false);
+        OptionSelectorFilter::SPtr filter = OptionSelectorFilter::create("f1", "Choose an option", false);
         filter->add_option("o1", "Option 1");
         filter->add_option("o2", "Option 2");
         filters.push_back(filter);

=== modified file 'test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp'
--- test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2014-05-14 04:50:14 +0000
+++ test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2014-05-21 14:02:43 +0000
@@ -40,8 +40,12 @@
     {
     }
 
-    virtual void finished(ListenerBase::Reason /* reason */, string const& /* error_message */) override
+    virtual void finished(ListenerBase::Reason reason, string const& error_message) override
     {
+        EXPECT_EQ(ListenerBase::Reason::Error, reason);
+        EXPECT_EQ("unity::scopes::MiddlewareException: unity::scopes::MiddlewareException: "
+                  "Cannot invoke operations while middleware is stopped",
+                  error_message);
         lock_guard<mutex> lock(mutex_);
         query_complete_ = true;
         cond_.notify_one();
@@ -81,10 +85,10 @@
     }
 
     // Check that the scope has indeed timed out. The server shuts down after 2 seconds,
-    // so we allow between 2 and 3 seconds for it to time out.
+    // so we allow between 2 and 4 seconds for it to time out.
     auto duration = chrono::steady_clock::now() - start_time;
     EXPECT_TRUE(duration > chrono::seconds(2));
-    EXPECT_TRUE(duration < chrono::seconds(3));
+    EXPECT_TRUE(duration < chrono::seconds(4));
 }
 
 // Check that the idle timeout for a server waits for synchronous operations
@@ -122,11 +126,13 @@
 
     // Check that the run time doesn't shut down until
     // the search in the scope has completed, which takes 4 seconds.
-    // We allow 4 - 5 seconds for things to shut down before failing
-    // (or hanging).
+    // We allow 4 - 6 seconds for things to shut down before failing
+    // (or hanging). (On Arm, can be slow to shut down, so we allow
+    // a full two seconds for the server to go away before failing
+    // the test.)
     auto duration = chrono::steady_clock::now() - start_time;
     EXPECT_TRUE(duration > chrono::seconds(4));
-    EXPECT_TRUE(duration < chrono::seconds(5));
+    EXPECT_TRUE(duration < chrono::seconds(6));
 }
 
 int main(int argc, char **argv)

=== modified file 'test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp'
--- test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-05-14 04:50:14 +0000
+++ test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-05-21 14:02:43 +0000
@@ -64,7 +64,7 @@
 
 SearchQueryBase::UPtr SlowSearchScope::search(CannedQuery const&, SearchMetadata const &)
 {
-        this_thread::sleep_for(chrono::seconds(4));
+    this_thread::sleep_for(chrono::seconds(4));
     return SearchQueryBase::UPtr(new TestQuery());
 }
 

=== modified file 'test/gtest/scopes/IdleShutdown/Zmq.ini.in'
--- test/gtest/scopes/IdleShutdown/Zmq.ini.in	2014-05-14 04:50:14 +0000
+++ test/gtest/scopes/IdleShutdown/Zmq.ini.in	2014-05-21 14:02:43 +0000
@@ -1,3 +1,7 @@
 [Zmq]
 EndpointDir = /tmp
-Default.Twoway.Timeout = 5000
+# We set the idle timeout to something much larger than the expected
+# time for the test to finish, so we don't see a bogus completion
+# of the slow call due to the timeout on the client side triggering,
+# rather than the server shutting down.
+Default.Twoway.Timeout = 10000

=== modified file 'test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp'
--- test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp	2014-05-15 08:12:32 +0000
+++ test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp	2014-05-21 14:02:43 +0000
@@ -62,10 +62,12 @@
 
     FilterState fstate;
     EXPECT_FALSE(fstate.has_filter("f1"));
+    EXPECT_FALSE(filter1->has_active_option(fstate));
 
     // enable option1
     filter1->update_state(fstate, option1, true);
     EXPECT_TRUE(fstate.has_filter("f1"));
+    EXPECT_TRUE(filter1->has_active_option(fstate));
     auto active = filter1->active_options(fstate);
     EXPECT_EQ(1u, active.size());
     EXPECT_TRUE(active.find(option1) != active.end());
@@ -95,6 +97,7 @@
     filter1->update_state(fstate, option1, true);
     filter1->update_state(fstate, option2, true);
     EXPECT_TRUE(fstate.has_filter("f1"));
+    EXPECT_TRUE(filter1->has_active_option(fstate));
     auto active = filter1->active_options(fstate);
     EXPECT_EQ(2u, active.size());
     EXPECT_TRUE(active.find(option1) != active.end());

=== added directory 'test/gtest/scopes/RadioButtonsFilter'
=== added file 'test/gtest/scopes/RadioButtonsFilter/CMakeLists.txt'
--- test/gtest/scopes/RadioButtonsFilter/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/RadioButtonsFilter/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -0,0 +1,4 @@
+add_executable(RadioButtonsFilter_test RadioButtonsFilter_test.cpp)
+target_link_libraries(RadioButtonsFilter_test ${TESTLIBS})
+
+add_test(RadioButtonsFilter RadioButtonsFilter_test)

=== added file 'test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp'
--- test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <unity/scopes/FilterState.h>
+#include <unity/scopes/RadioButtonsFilter.h>
+#include <unity/UnityExceptions.h>
+
+using namespace unity::scopes;
+using namespace unity::scopes::internal;
+
+TEST(RadioButtonsFilter, basic)
+{
+    auto filter1 = RadioButtonsFilter::create("f1", "Choose");
+    EXPECT_EQ("f1", filter1->id());
+    EXPECT_EQ("Choose", filter1->label());
+    EXPECT_EQ(0u, filter1->options().size());
+
+    filter1->add_option("a", "A");
+    filter1->add_option("b", "B");
+
+    auto opts = filter1->options();
+    EXPECT_EQ(2u, opts.size());
+    EXPECT_EQ("a", opts.front()->id());
+    EXPECT_EQ("A", opts.front()->label());
+    EXPECT_EQ("b", opts.back()->id());
+    EXPECT_EQ("B", opts.back()->label());
+}
+
+TEST(RadioButtonsFilter, selection)
+{
+    auto filter1 = RadioButtonsFilter::create("f1", "Options");
+    auto option1 = filter1->add_option("1", "Option 1");
+    auto option2 = filter1->add_option("2", "Option 2");
+
+    FilterState fstate;
+    EXPECT_FALSE(fstate.has_filter("f1"));
+    EXPECT_EQ(nullptr, filter1->active_option(fstate));
+    EXPECT_FALSE(filter1->has_active_option(fstate));
+
+    // enable option1
+    filter1->update_state(fstate, option1, true);
+    EXPECT_TRUE(fstate.has_filter("f1"));
+    auto active = filter1->active_option(fstate);
+    EXPECT_EQ("1", active->id());
+
+    // enable option2, option1 get disabled
+    filter1->update_state(fstate, option2, true);
+    active = filter1->active_option(fstate);
+    EXPECT_EQ("2", active->id());
+
+    // disable option1; filter state remains in the FilterState, just no options are selected
+    filter1->update_state(fstate, option2, false);
+    EXPECT_TRUE(fstate.has_filter("f1"));
+    EXPECT_EQ(nullptr, filter1->active_option(fstate));
+}

=== added directory 'test/gtest/scopes/RatingFilter'
=== added file 'test/gtest/scopes/RatingFilter/CMakeLists.txt'
--- test/gtest/scopes/RatingFilter/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/RatingFilter/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -0,0 +1,4 @@
+add_executable(RatingFilter_test RatingFilter_test.cpp)
+target_link_libraries(RatingFilter_test ${TESTLIBS})
+
+add_test(RatingFilter RatingFilter_test)

=== added file 'test/gtest/scopes/RatingFilter/RatingFilter_test.cpp'
--- test/gtest/scopes/RatingFilter/RatingFilter_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/RatingFilter/RatingFilter_test.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <unity/scopes/FilterState.h>
+#include <unity/scopes/RatingFilter.h>
+#include <unity/UnityExceptions.h>
+
+using namespace unity::scopes;
+using namespace unity::scopes::internal;
+
+TEST(RatingFilter, basic)
+{
+    {
+        auto filter1 = RatingFilter::create("f1", "Rating");
+        filter1->set_on_icon("foo");
+        filter1->set_off_icon("bar");
+        EXPECT_EQ("f1", filter1->id());
+        EXPECT_EQ("Rating", filter1->label());
+        EXPECT_EQ("foo", filter1->on_icon());
+        EXPECT_EQ("bar", filter1->off_icon());
+        EXPECT_EQ(0u, filter1->options().size());
+
+        auto o1 = filter1->add_option("a", "A");
+        auto o2 = filter1->add_option("b", "B");
+        EXPECT_EQ("a", o1->id());
+        EXPECT_EQ("b", o2->id());
+
+        auto opts = filter1->options();
+        EXPECT_EQ(2u, opts.size());
+        EXPECT_EQ("a", opts.front()->id());
+        EXPECT_EQ("A", opts.front()->label());
+        EXPECT_EQ("b", opts.back()->id());
+        EXPECT_EQ("B", opts.back()->label());
+    }
+
+    {
+        auto filter1 = RatingFilter::create("f1", "Rating", 3);
+        EXPECT_EQ("f1", filter1->id());
+        EXPECT_EQ("Rating", filter1->label());
+
+        auto opts = filter1->options();
+        EXPECT_EQ(3u, opts.size());
+        auto it = opts.begin();
+        EXPECT_EQ("1", (*it)->id());
+        EXPECT_EQ("1+", (*it)->label());
+        EXPECT_EQ("2", (*++it)->id());
+        EXPECT_EQ("2+", (*it)->label());
+        EXPECT_EQ("3", (*++it)->id());
+        EXPECT_EQ("3", (*it)->label());
+    }
+
+    {
+        EXPECT_THROW(RatingFilter::create("f1", "Rating", 11), unity::LogicException);
+    }
+
+    {
+        auto filter1 = RatingFilter::create("f1", "Rating", 10);
+        EXPECT_THROW(filter1->add_option("11", "11"), unity::LogicException);
+    }
+}
+
+TEST(RatingFilter, selection)
+{
+    auto filter1 = RatingFilter::create("f1", "Rating", 2);
+
+    FilterState fstate;
+    EXPECT_FALSE(fstate.has_filter("f1"));
+    EXPECT_FALSE(filter1->has_active_rating(fstate));
+    EXPECT_EQ(nullptr, filter1->active_rating(fstate));
+
+    auto opts = filter1->options();
+    EXPECT_EQ(2u, opts.size());
+
+    auto it = opts.begin();
+    auto option1 = *(it++);
+    auto option2 = *it;
+
+    // enable option1
+    filter1->update_state(fstate, option1, true);
+    EXPECT_TRUE(fstate.has_filter("f1"));
+    EXPECT_TRUE(filter1->has_active_rating(fstate));
+    auto active = filter1->active_rating(fstate);
+    EXPECT_EQ("1", active->id());
+
+    // enable option2, option1 get disabled
+    filter1->update_state(fstate, option2, true);
+    active = filter1->active_rating(fstate);
+    EXPECT_EQ("2", active->id());
+
+    // disable option1; filter state remains in the FilterState, just no options are selected
+    filter1->update_state(fstate, option2, false);
+    EXPECT_TRUE(fstate.has_filter("f1"));
+    EXPECT_FALSE(filter1->has_active_rating(fstate));
+    EXPECT_EQ(nullptr, filter1->active_rating(fstate));
+}

=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-05-06 04:29:02 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-05-21 14:02:43 +0000
@@ -77,25 +77,6 @@
     Runtime::UPtr rt = Runtime::create(TEST_RUNTIME_FILE);
     RegistryProxy r = rt->registry();
 
-    // wait for the registry to become available on middleware
-    // FIXME: remove this once we have async queries and can set arbitrary timeout when calling registry
-    const int num_retries = 10;
-    bool registry_started = false;
-    for (int i = 0; i < num_retries; ++i)
-    {
-        try
-        {
-            r->list(); // this will throw if the registry is not yet available on middleware
-            registry_started = true;
-            break;
-        }
-        catch (std::exception const&)
-        {
-            sleep(1);
-        }
-    }
-    ASSERT_TRUE(registry_started);
-
     auto meta = r->get_metadata("testscopeA");
     EXPECT_EQ("testscopeA", meta.scope_id());
     EXPECT_EQ("Canonical Ltd.", meta.author());

=== modified file 'test/gtest/scopes/Registry/Zmq.ini.in'
--- test/gtest/scopes/Registry/Zmq.ini.in	2014-05-06 09:00:45 +0000
+++ test/gtest/scopes/Registry/Zmq.ini.in	2014-05-21 14:02:43 +0000
@@ -1,2 +1,3 @@
 [Zmq]
 EndpointDir = /tmp
+Default.Twoway.Timeout = 2000

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2014-05-09 09:56:09 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2014-05-21 14:02:43 +0000
@@ -60,7 +60,7 @@
 [{"base_url": "http://127.0.0.1:' + str(port) + '/fail", "id" : "fail.scope", "name": "Fail Scope", "description": "Fails due to no author.", "icon": "icon" },\
 {"base_url": "http://127.0.0.1:' + str(port) + '/demo", "id" : "dummy.scope", "name": "Dummy Demo Scope", "description": "Dummy demo scope.", "author": "Mr.Fake", "icon": "icon" },\
 {"base_url": "http://127.0.0.1:' + str(port) + '/fail2", "name": "Fail Scope 2", "description": "Fails due to no id.", "author": "Mr.Fake", "icon": "icon" },\
-{"base_url": "http://127.0.0.1:' + str(port) + '/demo2", "id" : "dummy.scope.2", "name": "Dummy Demo Scope 2", "description": "Dummy demo scope 2.", "author": "Mr.Fake", "art": "art", "invisible": true },\
+{"base_url": "http://127.0.0.1:' + str(port) + '/demo2", "id" : "dummy.scope.2", "name": "Dummy Demo Scope 2", "description": "Dummy demo scope 2.", "author": "Mr.Fake", "art": "art", "invisible": true, "appearance": {"background": "#00BEEF"} },\
 {"id" : "fail.scope.3", "name": "Fail Scope 3", "description": "Fails due to no base_url.", "author": "Mr.Fake", "art": "art" }]'
 
 search_response = '\

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-05-09 09:56:09 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-05-21 14:02:43 +0000
@@ -81,6 +81,7 @@
     EXPECT_EQ("icon", *scopes[0].icon);
     EXPECT_EQ(nullptr, scopes[0].art);
     EXPECT_FALSE(scopes[0].invisible);
+    EXPECT_EQ(nullptr, scopes[0].appearance);
 
     EXPECT_EQ("dummy.scope.2", scopes[1].id);
     EXPECT_EQ("Dummy Demo Scope 2", scopes[1].name);
@@ -90,6 +91,7 @@
     EXPECT_EQ(nullptr, scopes[1].icon);
     EXPECT_EQ("art", *scopes[1].art);
     EXPECT_TRUE(scopes[1].invisible);
+    EXPECT_EQ("#00BEEF", (*scopes[1].appearance)["background"].get_string());
 }
 
 TEST_F(SmartScopesClientTest, search)

=== modified file 'test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt'
--- test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt	2014-04-14 23:47:33 +0000
+++ test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(ObjectAdapter)
+add_subdirectory(PubSub)
 add_subdirectory(RegistryI)
 add_subdirectory(ServantBase)
 add_subdirectory(StopPublisher)

=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-05-02 00:00:08 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-05-21 14:02:43 +0000
@@ -1071,8 +1071,7 @@
         {
             EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::run_workers(): broker thread failure "
                          "(adapter: testscope):\n"
-                         "    unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
-                         "(adapter: testscope): address in use: ipc://testscope", e.what());
+                         "    unity::scopes::MiddlewareException: safe_bind(): address in use: ipc://testscope", e.what());
         }
 
         {
@@ -1108,8 +1107,7 @@
         {
             EXPECT_STREQ("unity::scopes::MiddlewareException: ObjectAdapter::run_workers(): broker thread failure "
                          "(adapter: testscope):\n"
-                         "    unity::scopes::MiddlewareException: ObjectAdapter: broker thread failure "
-                         "(adapter: testscope): address in use: ipc://testscope", e.what());
+                         "    unity::scopes::MiddlewareException: safe_bind(): address in use: ipc://testscope", e.what());
         }
 
         {

=== added directory 'test/gtest/scopes/internal/zmq_middleware/PubSub'
=== added file 'test/gtest/scopes/internal/zmq_middleware/PubSub/CMakeLists.txt'
--- test/gtest/scopes/internal/zmq_middleware/PubSub/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/zmq_middleware/PubSub/CMakeLists.txt	2014-05-21 14:02:43 +0000
@@ -0,0 +1,6 @@
+configure_file(Zmq.ini.in Zmq.ini)
+
+add_executable(PubSub_test PubSub_test.cpp)
+target_link_libraries(PubSub_test ${LIBS} ${TESTLIBS})
+
+add_test(PubSub PubSub_test)

=== added file 'test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	2014-05-21 14:02:43 +0000
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/lzmqnses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#include <scope-api-testconfig.h>
+#include <unity/scopes/internal/RuntimeImpl.h>
+#include <unity/scopes/internal/zmq_middleware/ZmqMiddleware.h>
+#include <unity/scopes/ScopeExceptions.h>
+
+#include <gtest/gtest.h>
+#include <condition_variable>
+#include <mutex>
+
+using namespace std::placeholders;
+using namespace unity::scopes;
+using namespace unity::scopes::internal;
+using namespace unity::scopes::internal::zmq_middleware;
+
+TEST(PubSub, endpoints)
+{
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
+
+    auto publisher = mw.create_publisher("testpublisher");
+    auto subscriber = mw.create_subscriber("testpublisher", "");
+
+    EXPECT_EQ("ipc:///tmp/testpublisher-p", publisher->endpoint());
+    EXPECT_EQ(subscriber->endpoint(), publisher->endpoint());
+}
+
+TEST(PubSub, exceptions)
+{
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
+
+    // Test that only one publisher can be created on a single endpoint
+    auto publisher = mw.create_publisher("testpublisher");
+    try
+    {
+        auto publisher2 = mw.create_publisher("testpublisher");
+        FAIL();
+    }
+    catch (MiddlewareException const& e)
+    {
+        EXPECT_STREQ("unity::scopes::MiddlewareException: ZmqPublisher(): publisher thread failed to start "
+                     "(endpoint: ipc:///tmp/testpublisher-p):\n    unity::scopes::MiddlewareException: "
+                     "safe_bind(): address in use: ipc:///tmp/testpublisher-p",
+                     e.what());
+    }
+
+    // Test that multiple subscribers can be created on a single endpoint
+    auto subscriber = mw.create_subscriber("testpublisher", "");
+    try
+    {
+        auto subscriber2 = mw.create_subscriber("testpublisher", "testtopic1");
+        auto subscriber3 = mw.create_subscriber("testpublisher", "testtopic2");
+        auto subscriber4 = mw.create_subscriber("testpublisher", "testtopic3");
+        auto subscriber5 = mw.create_subscriber("testpublisher", "testtopic4");
+    }
+    catch (MiddlewareException const& e)
+    {
+        FAIL();
+    }
+
+    // Test that an invalid publisher_id throws
+    try
+    {
+        auto publisher2 = mw.create_publisher("/test/");
+        FAIL();
+    }
+    catch (MiddlewareException const& e)
+    {
+        EXPECT_STREQ("unity::scopes::MiddlewareException: ZmqPublisher(): A publisher cannot contain a '/' in its id",
+                     e.what());
+    }
+    try
+    {
+        auto subscriber2 = mw.create_subscriber("/test/", "testtopic");
+        FAIL();
+    }
+    catch (MiddlewareException const& e)
+    {
+        EXPECT_STREQ("unity::scopes::MiddlewareException: ZmqSubscriber(): A publisher cannot contain a '/' in its id",
+                     e.what());
+    }
+}
+
+class SubMsgReceiver
+{
+public:
+    void receive1(std::string const& message)
+    {
+        last_sub_index_ = 1;
+        last_message_ = message;
+        received();
+    }
+
+    void receive2(std::string const& message)
+    {
+        last_sub_index_ = 2;
+        last_message_ = message;
+        received();
+    }
+
+    void receive3(std::string const& message)
+    {
+        last_sub_index_ = 3;
+        last_message_ = message;
+        received();
+    }
+
+    void receive4(std::string const& message)
+    {
+        last_sub_index_ = 4;
+        last_message_ = message;
+        received();
+    }
+
+    void received()
+    {
+        // Signal wait_for_message
+        std::lock_guard<std::mutex> lock(mutex_);
+        message_received_ = true;
+        cond_.notify_one();
+    }
+
+    bool wait_for_message()
+    {
+        std::unique_lock<std::mutex> lock(mutex_);
+        bool message_received = cond_.wait_for(lock, std::chrono::milliseconds(500), [this] { return this->message_received_; });
+        message_received_ = false;
+        return message_received;
+    }
+
+    int last_sub_index_ = 0;
+    std::string last_message_;
+
+    bool message_received_ = false;
+    std::mutex mutex_;
+    std::condition_variable cond_;
+};
+
+TEST(PubSub, send_receive)
+{
+    SubMsgReceiver message_receiver;
+
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
+
+    // Create 2 publishers
+    auto publisher = mw.create_publisher("testpublisher");
+    auto publisher2 = mw.create_publisher("testpublisher2");
+
+    // Create a few subscribers
+    auto subscriber1 = mw.create_subscriber("testpublisher", "testtopic1");
+    subscriber1->set_message_callback(std::bind(&SubMsgReceiver::receive1, &message_receiver, _1));
+
+    auto subscriber2 = mw.create_subscriber("testpublisher", "testtopic2");
+    subscriber2->set_message_callback(std::bind(&SubMsgReceiver::receive2, &message_receiver, _1));
+
+    auto subscriber3 = mw.create_subscriber("testpublisher", "");
+    subscriber3->set_message_callback(std::bind(&SubMsgReceiver::receive3, &message_receiver, _1));
+
+    auto subscriber4 = mw.create_subscriber("testpublisher2", "testtopic4");
+    subscriber4->set_message_callback(std::bind(&SubMsgReceiver::receive4, &message_receiver, _1));
+
+    // Give the subscribers some time to connect
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+
+    // Send a "testtopic1" topic message (subscriber1)
+    publisher->send_message("hello", "testtopic1");
+    EXPECT_TRUE(message_receiver.wait_for_message());
+    EXPECT_EQ(1, message_receiver.last_sub_index_);
+    EXPECT_EQ("hello", message_receiver.last_message_);
+
+    // Send a blank "testtopic2" topic message (subscriber2)
+    publisher->send_message("", "testtopic2");
+    EXPECT_TRUE(message_receiver.wait_for_message());
+    EXPECT_EQ(2, message_receiver.last_sub_index_);
+    EXPECT_EQ("", message_receiver.last_message_);
+
+    // Send an empty topic message (subscriber3)
+    publisher->send_message("hello again!", "");
+    EXPECT_TRUE(message_receiver.wait_for_message());
+    EXPECT_EQ(3, message_receiver.last_sub_index_);
+    EXPECT_EQ("hello again!", message_receiver.last_message_);
+
+    // Send a "testtopic4" topic message (subscriber4)
+    // (no message should be received as subscriber4 is subscribed to a different publisher)
+    publisher->send_message("test", "testtopic4");
+    EXPECT_FALSE(message_receiver.wait_for_message());
+
+    // Now send a "testtopic4" topic message from the correct publisher (subscriber4)
+    publisher2->send_message("test", "testtopic4");
+    EXPECT_TRUE(message_receiver.wait_for_message());
+    EXPECT_EQ(4, message_receiver.last_sub_index_);
+    EXPECT_EQ("test", message_receiver.last_message_);
+
+    // Send a "unknown" topic message
+    // (no message should be received as none of the subscribers are listening for "unknown")
+    publisher->send_message("hello?", "unknown");
+    EXPECT_FALSE(message_receiver.wait_for_message());
+
+    publisher2->send_message("hello??", "unknown");
+    EXPECT_FALSE(message_receiver.wait_for_message());
+}
+
+TEST(PubSub, threading)
+{
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
+
+    {
+        // Create a publisher and a subscriber in seperate thread
+        auto subscriber_future = std::async(std::launch::async, [&mw]{ return mw.create_subscriber("testpublisher", "testtopic"); });
+        auto publisher_future = std::async(std::launch::async, [&mw]{ return mw.create_publisher("testpublisher"); });
+
+        // Obtain the publisher and subscriber handles
+        MWSubscriber::UPtr subscriber = subscriber_future.get();
+        MWPublisher::UPtr publisher = publisher_future.get();
+    }
+    // The publisher and subscriber are now destroyed in this thread (should not hang / crash)
+}

=== added file 'test/gtest/scopes/internal/zmq_middleware/PubSub/Zmq.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/PubSub/Zmq.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/zmq_middleware/PubSub/Zmq.ini.in	2014-05-21 14:02:43 +0000
@@ -0,0 +1,2 @@
+[Zmq]
+EndpointDir = /tmp

=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-05-09 08:51:19 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-05-21 14:02:43 +0000
@@ -705,7 +705,7 @@
     // check that we still have 1 child process
     EXPECT_EQ(1, process_count());
 
-    std::this_thread::sleep_for(std::chrono::seconds{2});
+    std::this_thread::sleep_for(std::chrono::seconds{3});
 
     // check now that the scope has shutdown automatically (timed out after 2s)
     EXPECT_FALSE(reg->is_scope_running("testscopeB"));