Merge lp:~marcustomlinson/unity-scopes-api/metadata_tags_attr into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Added support for 'Tags' scope .ini option.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/57/console

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

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-api/metadata_tags_attr]

543. By Marcus Tomlinson on 2014-11-27

Added missing symbol

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:543
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/58

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

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Looks good and very thorough, thanks!

My only comment: we probably need a public list of tags that are used. It's no good if each and every scope invents its own tags (with possibly different spelling).

What would the best place for this be? The doxygen doc, I would think?

review: Approve

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-11-13 00:28:01 +0000
+++ CONFIGFILES	2014-11-27 05:38:38 +0000
@@ -403,6 +403,14 @@
 
   If not set, the default value is false.
 
+- Tags
+
+  A list of tags this scope falls under (if any). The values in this list must be separated by semicolons.
+
+  E.g. "Tags = music;video"
+
+  Note: make sure there are no trailing spaces following the tags, as they will be preserved.
+
 
 The following keys are recognized in the Appearance group:
 

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-11-21 09:59:33 +0000
+++ RELEASE_NOTES.md	2014-11-27 05:38:38 +0000
@@ -11,6 +11,7 @@
     not vice versa).
   - Added missing methods for settings_definitions(), location_data_needed(),
     and child_scope_ids() to testing::ScopeMetadataBuilder.
+  - Added support for Tags scope .ini option.
 
 Changes in version 0.6.8
 ========================

=== modified file 'STRUCTS'
--- STRUCTS	2014-11-10 03:57:03 +0000
+++ STRUCTS	2014-11-27 05:38:38 +0000
@@ -79,6 +79,7 @@
  'location_data_needed'  : bool, optional
  'child_scopes'          : array of strings, optional
  'version'               : int, optional
+ 'tags'                  : array of strings, optional
 
 Query (returned by serialize())
 ===============================

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-21 09:59:33 +0000
+++ debian/changelog	2014-11-27 05:38:38 +0000
@@ -11,7 +11,10 @@
   * Added missing methods for settings_definitions(), location_data_needed(),
     and child_scope_ids() to testing::ScopeMetadataBuilder.
 
- -- Pawel Stolowski <[e-mail]>  Fri, 21 Nov 2014 10:56:49 +0100
+  [ Marcus Tomlinson ]
+  * Added support for Tags scope .ini option.
+
+ -- Marcus Tomlinson <[e-mail]>  Wed, 26 Nov 2014 09:36:56 +0200
 
 unity-scopes-api (0.6.8+15.04.20141119-0ubuntu1) vivid; urgency=medium
 

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2014-11-21 09:59:33 +0000
+++ debian/libunity-scopes3.symbols	2014-11-27 05:38:38 +0000
@@ -457,6 +457,7 @@
  (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > 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::search_hint() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::ScopeConfig::tags() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeConfig::version() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeImpl::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, unity::scopes::internal::RuntimeImpl*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -516,8 +517,10 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_scope_id(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_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_settings_definitions(std::vector<unity::scopes::Variant, std::allocator<unity::scopes::Variant> > const&)@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_tags(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::settings_definitions() const@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_version(int)@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::tags() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::version() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
@@ -787,6 +790,7 @@
  (c++)"unity::scopes::ScopeMetadata::search_hint() 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::settings_definitions() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::ScopeMetadata::tags() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeMetadata::version() const@Base" 0replaceme
  (c++)"unity::scopes::Scope::~Scope()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Scope::Scope()@Base" 0.4.0+14.04.20140312.1
@@ -875,6 +879,7 @@
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::ScopeMetadataBuilder()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::search_hint(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::settings_definitions(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<unity::scopes::Variant, std::allocator<unity::scopes::Variant> > > const&)@Base" 0replaceme
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::tags(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::version(unity::scopes::testing::ScopeMetadataBuilder::Optional<int> const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::StudentsTTest::one_sample(unity::scopes::testing::Sample const&, double, double)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::StudentsTTest::Result::~Result()@Base" 0.4.2+14.04.20140404.2

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2014-11-13 03:09:45 +0000
+++ doc/tutorial.dox	2014-11-27 05:38:38 +0000
@@ -1061,6 +1061,7 @@
     HotKey =
     ResultsTtlType = None, Small, Medium, or Large
     ChildScopes =
+    Tags =
 
     [Appearance]
     ForegroundColor = default text color (defaults to theme-provided foreground color)
@@ -1108,6 +1109,10 @@
 
 This list of scopes is translated to the names of children scopes when in the scopes overview page of the Unity Dash.
 
+The `Tags` key is optional, but we recommend that you use it. Tags are used by aggregators to collect results from scopes of
+similar type (E.g. The Music scope will aggregate scopes with the tag "music", and so on). The value of `Tags` should specify a
+list of tags your scope falls under. Like `ChildScopes`, this value must be a semicolon separated list (E.g. `Tags = music;video`).
+
 \subsection scopetool The scope tool
 
 The Unity Scope Tool is a stand-alone redering tool that allows you

=== modified file 'include/unity/scopes/ScopeMetadata.h'
--- include/unity/scopes/ScopeMetadata.h	2014-11-10 03:57:03 +0000
+++ include/unity/scopes/ScopeMetadata.h	2014-11-27 05:38:38 +0000
@@ -203,6 +203,16 @@
     */
     int version() const;
 
+    /**
+    \brief Return the list of tags specified by this scope.
+
+    The list returned by this method is formulated from the value specified under
+    the "Tags" key in the scope's .ini file.
+
+    \return The list of scope tags specified by this scope.
+    */
+    std::vector<std::string> tags() const;
+
 private:
     ScopeMetadata(std::unique_ptr<internal::ScopeMetadataImpl>);           // Instantiable only by ScopeMetadataImpl
     std::unique_ptr<internal::ScopeMetadataImpl> p;

=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
--- include/unity/scopes/internal/ScopeConfig.h	2014-11-10 03:57:03 +0000
+++ include/unity/scopes/internal/ScopeConfig.h	2014-11-27 05:38:38 +0000
@@ -52,8 +52,9 @@
     int idle_timeout() const;              // Optional, returns default value if not present
     ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
     bool debug_mode() const;               // Optional, returns false if not present
-    std::vector<std::string> child_scope_ids() const;
+    std::vector<std::string> child_scope_ids() const;  // Optional, returns an empty vector if no ids are present
     int version() const;                   // Optional, returns 0 if not present
+    std::vector<std::string> tags() const; // Optional, returns an empty vector if no tags are present
 
     VariantMap appearance_attributes() const; // Optional, returns empty map if no attributes are present
 
@@ -76,6 +77,7 @@
     bool debug_mode_;
     std::vector<std::string> child_scope_ids_;
     int version_;
+    std::vector<std::string> tags_;
 
     VariantMap appearance_attributes_;
 };

=== modified file 'include/unity/scopes/internal/ScopeMetadataImpl.h'
--- include/unity/scopes/internal/ScopeMetadataImpl.h	2014-11-10 03:57:03 +0000
+++ include/unity/scopes/internal/ScopeMetadataImpl.h	2014-11-27 05:38:38 +0000
@@ -59,6 +59,7 @@
     bool location_data_needed() const;                           // optional (default: false)
     std::vector<std::string> child_scope_ids() const;            // optional (default: empty array)
     int version() const;                                         // optional (default: 0)
+    std::vector<std::string> tags() const;                       // optional (default: empty array)
 
     void set_scope_id(std::string const& scope_id);
     void set_proxy(ScopeProxy const& proxy);
@@ -77,6 +78,7 @@
     void set_location_data_needed(bool location_data_needed);
     void set_child_scope_ids(std::vector<std::string> const& ids);
     void set_version(int v);
+    void set_tags(std::vector<std::string> const& tags);
 
     VariantMap serialize() const;
     void deserialize(VariantMap const& var);
@@ -103,6 +105,7 @@
     std::unique_ptr<bool> location_data_needed_;          // Optional, hence a pointer
     std::vector<std::string> child_scope_ids_;
     int version_;
+    std::vector<std::string> tags_;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScopesClient.h'
--- include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-11-19 13:05:49 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-11-27 05:38:38 +0000
@@ -61,6 +61,7 @@
     std::shared_ptr<bool> needs_location_data;  // optional
     bool invisible = false;
     int version;
+    std::vector<std::string> tags;              // optional
 };
 
 struct SearchCategory

=== modified file 'include/unity/scopes/testing/ScopeMetadataBuilder.h'
--- include/unity/scopes/testing/ScopeMetadataBuilder.h	2014-11-12 02:15:46 +0000
+++ include/unity/scopes/testing/ScopeMetadataBuilder.h	2014-11-27 05:38:38 +0000
@@ -97,6 +97,7 @@
     ScopeMetadataBuilder& location_data_needed(Optional<bool> const& value);
     ScopeMetadataBuilder& child_scope_ids(Optional<std::vector<std::string>> const& value);
     ScopeMetadataBuilder& version(Optional<int> const& value);
+    ScopeMetadataBuilder& tags(Optional<std::vector<std::string>> const& value);
 
     ScopeMetadata operator()() const;
 

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-11-20 03:11:18 +0000
+++ scoperegistry/scoperegistry.cpp	2014-11-27 05:38:38 +0000
@@ -319,6 +319,7 @@
     mi->set_appearance_attributes(sc.appearance_attributes());
     mi->set_child_scope_ids(sc.child_scope_ids());
     mi->set_version(sc.version());
+    mi->set_tags(sc.tags());
 
     // Prepend scope_dir to pageheader logo path if logo path is relative.
     // TODO: Once we have type-safe parsing in the config files, remove

=== modified file 'src/scopes/ScopeMetadata.cpp'
--- src/scopes/ScopeMetadata.cpp	2014-11-10 03:57:03 +0000
+++ src/scopes/ScopeMetadata.cpp	2014-11-27 05:38:38 +0000
@@ -157,6 +157,11 @@
     return p->version();
 }
 
+std::vector<std::string> ScopeMetadata::tags() const
+{
+    return p->tags();
+}
+
 //! @endcond
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-11-10 03:57:03 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-11-27 05:38:38 +0000
@@ -58,6 +58,7 @@
     const string debug_mode_key = "DebugMode";
     const string child_scope_ids_key = "ChildScopes";
     const string version_key = "Version";
+    const string tags_key = "Tags";
 
     const string scope_appearance_group = "Appearance";
     const string fg_color_key = "ForegroundColor";
@@ -223,6 +224,22 @@
 
     try
     {
+        tags_ = parser()->get_string_array(scope_config_group, tags_key);
+    }
+    catch (LogicException const&)
+    {
+    }
+
+    for (auto const& tag: tags_)
+    {
+        if (tag.empty())
+        {
+            throw_ex("Invalid empty tag string found in \"Tags\" list");
+        }
+    }
+
+    try
+    {
         debug_mode_ = parser()->get_boolean(scope_config_group, debug_mode_key);
     }
     catch (LogicException const&)
@@ -444,6 +461,11 @@
     return version_;
 }
 
+std::vector<std::string> ScopeConfig::tags() const
+{
+    return tags_;
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ScopeMetadataImpl.cpp'
--- src/scopes/internal/ScopeMetadataImpl.cpp	2014-11-12 23:16:14 +0000
+++ src/scopes/internal/ScopeMetadataImpl.cpp	2014-11-27 05:38:38 +0000
@@ -61,6 +61,7 @@
     , results_ttl_type_(other.results_ttl_type_)
     , child_scope_ids_(other.child_scope_ids_)
     , version_(other.version_)
+    , tags_(other.tags_)
 {
     if (other.art_)
     {
@@ -118,6 +119,7 @@
         location_data_needed_.reset(rhs.location_data_needed_ ? new bool(*rhs.location_data_needed_) : nullptr);
         child_scope_ids_ = rhs.child_scope_ids_;
         version_ = rhs.version_;
+        tags_ = rhs.tags_;
     }
     return *this;
 }
@@ -239,6 +241,11 @@
     return version_;
 }
 
+std::vector<std::string> ScopeMetadataImpl::tags() const
+{
+    return tags_;
+}
+
 void ScopeMetadataImpl::set_scope_id(std::string const& scope_id)
 {
     scope_id_ = scope_id;
@@ -328,6 +335,11 @@
     version_ = v;
 }
 
+void ScopeMetadataImpl::set_tags(std::vector<std::string> const& tags)
+{
+    tags_ = tags;
+}
+
 namespace
 {
 
@@ -413,6 +425,15 @@
         }
         var["child_scopes"] = Variant(va);
     }
+    if (tags_.size())
+    {
+        VariantArray va;
+        for (auto const& tag: tags_)
+        {
+            va.push_back(Variant(tag));
+        }
+        var["tags"] = Variant(va);
+    }
 
     return var;
 }
@@ -557,6 +578,16 @@
             child_scope_ids_.push_back(v.get_string());
         }
     }
+
+    tags_.clear();
+    it = var.find("tags");
+    if (it != var.end())
+    {
+        for (auto const& v: it->second.get_array())
+        {
+            tags_.push_back(v.get_string());
+        }
+    }
 }
 
 ScopeMetadata ScopeMetadataImpl::create(unique_ptr<ScopeMetadataImpl> impl)

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-11-11 05:05:33 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-11-27 05:38:38 +0000
@@ -337,6 +337,8 @@
 
             metadata->set_version(scope.version);
 
+            metadata->set_tags(scope.tags);
+
             ScopeProxy proxy = ScopeImpl::create(middleware_->create_scope_proxy(scope.id, ss_scope_endpoint_),
                                                  middleware_->runtime(),
                                                  scope.id);

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-11-19 13:05:49 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-11-27 05:38:38 +0000
@@ -284,6 +284,32 @@
 
             scope.version = child_node->has_node("version") ? child_node->get_node("version")->as_int() : 0;
 
+            if (child_node->has_node("tags"))
+            {
+                auto node = child_node->get_node("tags");
+                if (node->type() == JsonNodeInterface::NodeType::Array)
+                {
+                    auto tags = node->to_variant().get_array();
+                    for (auto const& tag : tags)
+                    {
+                        try
+                        {
+                            scope.tags.push_back(tag.get_string());
+                        }
+                        catch (unity::LogicException const& e)
+                        {
+                            std::cerr << "SmartScopesClient.get_remote_scopes(): Scope: \""
+                                      << scope.id << "\" returned a non-string tag" << std::endl;
+                        }
+                    }
+                }
+                else
+                {
+                    std::cerr << "SmartScopesClient.get_remote_scopes(): Scope: \""
+                              << scope.id << "\" returned an invalid value type for \"tags\"" << std::endl;
+                }
+            }
+
             remote_scopes.push_back(scope);
         }
         catch (std::exception const& e)

=== modified file 'src/scopes/testing/ScopeMetadataBuilder.cpp'
--- src/scopes/testing/ScopeMetadataBuilder.cpp	2014-11-12 02:15:46 +0000
+++ src/scopes/testing/ScopeMetadataBuilder.cpp	2014-11-27 05:38:38 +0000
@@ -48,6 +48,7 @@
     Optional<bool> location_data_needed;
     Optional<std::vector<std::string>> child_scope_ids;
     Optional<int> version;
+    Optional<std::vector<std::string>> tags;
 };
 
 testing::ScopeMetadataBuilder::ScopeMetadataBuilder() : p(new Private())
@@ -160,6 +161,12 @@
     return *this;
 }
 
+testing::ScopeMetadataBuilder& testing::ScopeMetadataBuilder::tags(Optional<std::vector<std::string>> const& value)
+{
+    p->tags = value;
+    return *this;
+}
+
 unity::scopes::ScopeMetadata testing::ScopeMetadataBuilder::operator()() const
 {
     auto impl = new unity::scopes::internal::ScopeMetadataImpl(Private::invalid_middleware);
@@ -193,6 +200,8 @@
         impl->set_child_scope_ids(*p->child_scope_ids);
     if (p->version)
         impl->set_version(*p->version);
+    if (p->tags)
+        impl->set_tags(*p->tags);
 
     return unity::scopes::internal::ScopeMetadataImpl::create(
                 std::move(

=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-11-20 21:33:33 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-11-27 05:38:38 +0000
@@ -109,6 +109,11 @@
     EXPECT_EQ("com.foo.bar", children[0]);
     EXPECT_EQ("com.foo.baz", children[1]);
     EXPECT_EQ(1, meta.version());
+    auto tags = meta.tags();
+    EXPECT_EQ(3u, tags.size());
+    EXPECT_EQ("music", tags[0]);
+    EXPECT_EQ("news", tags[1]);
+    EXPECT_EQ("foo", tags[2]);
 
     auto attrs = meta.appearance_attributes();
     EXPECT_EQ("fg_color", attrs["foreground-color"].get_string());
@@ -140,6 +145,7 @@
     EXPECT_EQ(0, defs.size());
     EXPECT_FALSE(meta.location_data_needed());
     EXPECT_EQ(0, meta.child_scope_ids().size());
+    EXPECT_EQ(0, meta.tags().size());
     EXPECT_EQ(0, meta.version());
 }
 

=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in'
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-11-10 03:57:03 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-11-27 05:38:38 +0000
@@ -9,6 +9,7 @@
 LocationDataNeeded = true
 ChildScopes = com.foo.bar;com.foo.baz
 Version = 1
+Tags = music;news;foo
 
 [Appearance]
 ForegroundColor = fg_color

=== modified file 'test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt'
--- test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2014-11-10 03:57:03 +0000
+++ test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2014-11-27 05:38:38 +0000
@@ -8,6 +8,9 @@
 configure_file(bad_child_ids.ini.in bad_child_ids.ini copyonly)
 configure_file(empty_child_ids.ini.in empty_child_ids.ini copyonly)
 configure_file(single_child_id.ini.in single_child_id.ini copyonly)
+configure_file(bad_tags.ini.in bad_tags.ini copyonly)
+configure_file(empty_tags.ini.in empty_tags.ini copyonly)
+configure_file(single_tag.ini.in single_tag.ini copyonly)
 
 add_definitions(-DCOMPLETE_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/complete_config.ini")
 add_definitions(-DMANDATORY_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/mandatory_config.ini")
@@ -19,6 +22,9 @@
 add_definitions(-DSINGLE_CHILD_ID="${CMAKE_CURRENT_BINARY_DIR}/single_child_id.ini")
 add_definitions(-DBAD_TTL="${CMAKE_CURRENT_BINARY_DIR}/bad_ttl.ini")
 add_definitions(-DBAD_VERSION="${CMAKE_CURRENT_BINARY_DIR}/bad_version.ini")
+add_definitions(-DBAD_TAGS="${CMAKE_CURRENT_BINARY_DIR}/bad_tags.ini")
+add_definitions(-DEMPTY_TAGS="${CMAKE_CURRENT_BINARY_DIR}/empty_tags.ini")
+add_definitions(-DSINGLE_TAG="${CMAKE_CURRENT_BINARY_DIR}/single_tag.ini")
 
 add_executable(ScopeConfig_test ScopeConfig_test.cpp)
 target_link_libraries(ScopeConfig_test ${TESTLIBS})

=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-11-10 03:57:03 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-11-27 05:38:38 +0000
@@ -57,6 +57,11 @@
         EXPECT_EQ("com.foo.bar2", children[1]);
         EXPECT_EQ("com.foo.boo", children[2]);
 
+        auto tags = cfg.tags();
+        EXPECT_EQ(2u, tags.size());
+        EXPECT_EQ("foo", tags[0]);
+        EXPECT_EQ("bar", tags[1]);
+
         auto attrs = cfg.appearance_attributes();
         EXPECT_EQ(5, attrs.size());
         EXPECT_TRUE(attrs["arbitrary_key"].get_bool());
@@ -180,6 +185,31 @@
     }
 }
 
+TEST(ScopeConfig, bad_tags)
+{
+    try
+    {
+        ScopeConfig cfg(BAD_TAGS);
+    }
+    catch(ConfigException const& e)
+    {
+        boost::regex r("unity::scopes::ConfigException: \".*\": Invalid empty tag string found in \"Tags\" list");
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
+    }
+}
+
+TEST(ScopeConfig, empty_tags)
+{
+    ScopeConfig cfg(EMPTY_TAGS);
+    EXPECT_EQ(cfg.tags().size(), 0);
+}
+
+TEST(ScopeConfig, single_tag)
+{
+    ScopeConfig cfg(SINGLE_TAG);
+    EXPECT_EQ(cfg.tags().size(), 1);
+}
+
 class ScopeConfigWithIntl: public ::testing::Test
 {
 public:

=== added file 'test/gtest/scopes/internal/ScopeConfig/bad_tags.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/bad_tags.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/bad_tags.ini.in	2014-11-27 05:38:38 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = Scope description
+Author = Canonical
+Tags = foo;;

=== modified file 'test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-11-10 03:57:03 +0000
+++ test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-11-27 05:38:38 +0000
@@ -19,6 +19,7 @@
 DebugMode = true
 Version = 1
 ChildScopes = com.foo.bar;com.foo.bar2;com.foo.boo
+Tags = foo;bar
 
 [Appearance]
 arbitrary_key = true

=== added file 'test/gtest/scopes/internal/ScopeConfig/empty_tags.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/empty_tags.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/empty_tags.ini.in	2014-11-27 05:38:38 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = Scope description
+Author = Canonical
+Tags =

=== added file 'test/gtest/scopes/internal/ScopeConfig/single_tag.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/single_tag.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/single_tag.ini.in	2014-11-27 05:38:38 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = Scope description
+Author = Canonical
+Tags = foo

=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-11-10 03:57:03 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-11-27 05:38:38 +0000
@@ -162,6 +162,7 @@
     mi2->set_settings_definitions(va);
     mi2->set_location_data_needed(true);
     mi2->set_child_scope_ids(vector<string>{"abc", "def"});
+    mi2->set_tags(vector<string>{"music", "video", "news"});
 
     // Make another copy, so we get coverage on the entire copy constructor
     unique_ptr<ScopeMetadataImpl> mi3(new ScopeMetadataImpl(*mi2));
@@ -175,6 +176,7 @@
     EXPECT_EQ(va, m.settings_definitions());
     EXPECT_TRUE(m.location_data_needed());
     EXPECT_EQ((vector<string>{"abc", "def"}), m.child_scope_ids());
+    EXPECT_EQ((vector<string>{"music", "video", "news"}), m.tags());
 
     // Make another value
     unique_ptr<ScopeMetadataImpl> ti(new ScopeMetadataImpl(&mw));
@@ -198,6 +200,7 @@
     ti->set_settings_definitions(tmp_va);
     ti->set_location_data_needed(true);
     ti->set_child_scope_ids(vector<string>{"tmp abc", "tmp def"});
+    ti->set_tags(vector<string>{"music", "video"});
 
     // Check impl assignment operator
     ScopeMetadataImpl ci(&mw);
@@ -220,6 +223,7 @@
     EXPECT_TRUE(ci.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), ci.child_scope_ids());
     EXPECT_EQ(99, ci.version());
+    EXPECT_EQ((vector<string>{"music", "video"}), ci.tags());
 
     // Check public assignment operator
     auto tmp = ScopeMetadataImpl::create(move(ti));
@@ -242,6 +246,7 @@
     EXPECT_EQ(tmp_va, m.settings_definitions());
     EXPECT_TRUE(m.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), m.child_scope_ids());
+    EXPECT_EQ((vector<string>{"music", "video"}), m.tags());
 
     // Self-assignment
     tmp = tmp;
@@ -263,6 +268,7 @@
     EXPECT_EQ(tmp_va, tmp.settings_definitions());
     EXPECT_TRUE(tmp.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), tmp.child_scope_ids());
+    EXPECT_EQ((vector<string>{"music", "video"}), tmp.tags());
 
     // Copy constructor
     ScopeMetadata tmp2(tmp);
@@ -284,6 +290,7 @@
     EXPECT_EQ(tmp_va, tmp2.settings_definitions());
     EXPECT_TRUE(tmp2.location_data_needed());
     EXPECT_EQ((vector<string>{"tmp abc", "tmp def"}), tmp2.child_scope_ids());
+    EXPECT_EQ((vector<string>{"music", "video"}), tmp2.tags());
 }
 
 TEST(ScopeMetadataImpl, serialize)
@@ -315,11 +322,12 @@
     mi->set_settings_definitions(va);
     mi->set_location_data_needed(false);
     mi->set_child_scope_ids({"com.foo.bar", "com.foo.baz"});
+    mi->set_tags({"news", "games"});
 
     // Check that serialize() sets the map values correctly
     auto m = ScopeMetadataImpl::create(move(mi));
     auto var = m.serialize();
-    EXPECT_EQ(17u, var.size());
+    EXPECT_EQ(18u, var.size());
     EXPECT_EQ("scope_id", var["scope_id"].get_string());
     EXPECT_EQ("display_name", var["display_name"].get_string());
     EXPECT_EQ("description", var["description"].get_string());
@@ -340,6 +348,9 @@
     EXPECT_EQ(2u, var["child_scopes"].get_array().size());
     EXPECT_EQ("com.foo.bar", var["child_scopes"].get_array()[0].get_string());
     EXPECT_EQ("com.foo.baz", var["child_scopes"].get_array()[1].get_string());
+    EXPECT_EQ(2u, var["tags"].get_array().size());
+    EXPECT_EQ("news", var["tags"].get_array()[0].get_string());
+    EXPECT_EQ("games", var["tags"].get_array()[1].get_string());
 
     // Make another instance from the VariantMap and check its fields
     ScopeMetadataImpl c(var, &mw);

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2014-11-11 05:05:33 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2014-11-27 05:38:38 +0000
@@ -88,7 +88,7 @@
 \
 {"id" : "fail.scope.3", "name": "Fail Scope 3", "description": "Fails due to no base_url.", "author": "Mr.Fake", "art": "art" },\
 \
-{"base_url": "http://127.0.0.1:' + str(port) + '/demo3", "id" : "dummy.scope.3", "name": "Dummy Demo Scope 3", "description": "Dummy demo scope 3.", "author": "Mr.Fake",\
+{"base_url": "http://127.0.0.1:' + str(port) + '/demo3", "id" : "dummy.scope.3", "name": "Dummy Demo Scope 3", "description": "Dummy demo scope 3.", "author": "Mr.Fake", "tags": ["music", "video", "news", "games"],\
 "settings":\
     [\
         {\

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-11-19 13:05:49 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-11-27 05:38:38 +0000
@@ -85,6 +85,7 @@
     EXPECT_EQ(0, scopes[0].version);
     EXPECT_EQ(nullptr, scopes[0].appearance);
     EXPECT_EQ(nullptr, scopes[0].settings);
+    EXPECT_TRUE(scopes[0].tags.empty());
 
     EXPECT_EQ("dummy.scope.2", scopes[1].id);
     EXPECT_EQ("Dummy Demo Scope 2", scopes[1].name);
@@ -98,6 +99,7 @@
     EXPECT_EQ("#00BEEF", (*scopes[1].appearance)["background"].get_string());
     EXPECT_EQ("logo.png", (*scopes[1].appearance)["PageHeader"].get_dict()["logo"].get_string());
     EXPECT_EQ(nullptr, scopes[1].settings);
+    EXPECT_TRUE(scopes[1].tags.empty());
 
     EXPECT_EQ("dummy.scope.3", scopes[2].id);
     EXPECT_EQ("Dummy Demo Scope 3", scopes[2].name);
@@ -115,6 +117,11 @@
               "\"defaultValue\":23},\"type\":\"number\"},{\"displayName\":\"Enabled\",\"id\":"
               "\"enabled\",\"parameters\":{\"defaultValue\":true},\"type\":\"boolean\"}]\n",
               *scopes[2].settings);
+    ASSERT_EQ(4, scopes[2].tags.size());
+    EXPECT_EQ("music", scopes[2].tags[0]);
+    EXPECT_EQ("video", scopes[2].tags[1]);
+    EXPECT_EQ("news", scopes[2].tags[2]);
+    EXPECT_EQ("games", scopes[2].tags[3]);
 }
 
 TEST_F(SmartScopesClientTest, search)

=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-11-20 03:11:18 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-11-27 05:38:38 +0000
@@ -140,6 +140,11 @@
         EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
         EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[0].get_string());
         EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[1].get_string());
+        ASSERT_EQ(4, meta.tags().size());
+        EXPECT_EQ("music", meta.tags()[0]);
+        EXPECT_EQ("video", meta.tags()[1]);
+        EXPECT_EQ("news", meta.tags()[2]);
+        EXPECT_EQ("games", meta.tags()[3]);
     }
 
     // non-existent scope (via mw)