Merge lp:~stolowski/unity-scope-click/update-for-design into lp:unity-scope-click/devel

[Paweł Stołowski]

Minor updates to be more in line with latest designs: use big card for app of the week, pass search string in a canned query of Ubuntu Store link.

Minor updates to be more in line with latest designs:
1) Use big card (full width) for App of the Week (note: app of the week is currently shown at a random position among other categories; this will be fixed on the server).
2) When searching in Apps scope, create "Ubuntu Store" card with a canned query that perform same search in the store scope (note: there is https://bugs.launchpad.net/unity8/+bug/1340195 that affects it).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/178/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Please add unit tests to this branch.

review: Needs Fixing

[lp:~stolowski/unity-scope-click/update-for-design]

325. By Paweł Stołowski on 2014-07-11

Merged devel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/160

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/186/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-click/update-for-design]

326. By Paweł Stołowski on 2014-07-11

Added test for fake ubuntu store result.

[Paweł Stołowski (stolowski)]

> Please add unit tests to this branch.

Done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/161

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/187/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks mostly fine. There's a bit of code that could use one more test, and to not delay this branch I'm adding it here: lp:~alecu/unity-scope-click/update-for-design-onemoretest

review: Approve

=== modified file 'libclickscope/click/highlights.cpp'
--- libclickscope/click/highlights.cpp	2014-06-24 19:39:13 +0000
+++ libclickscope/click/highlights.cpp	2014-07-11 16:49:25 +0000
@@ -38,8 +38,9 @@
 {
 }
 
-Highlight::Highlight(const std::string& name, const Packages& pkgs)
-    : name_(name),
+Highlight::Highlight(const std::string& slug, const std::string& name, const Packages& pkgs)
+    : slug_(slug),
+      name_(name),
       packages_(pkgs)
 {
 }
@@ -49,6 +50,11 @@
     packages_.push_back(pkg);
 }
 
+std::string Highlight::slug() const
+{
+    return slug_;
+}
+
 std::string Highlight::name() const
 {
     return name_;
@@ -69,9 +75,10 @@
         if (item.isObject() && item.isMember(Highlight::JsonKeys::name))
         {
             auto name = item[Highlight::JsonKeys::name].asString();
+            auto slug = item[Highlight::JsonKeys::slug].asString();
             auto pkg_node = item[Package::JsonKeys::embedded][Package::JsonKeys::ci_package];
             auto pkgs = package_list_from_json_node(pkg_node);
-            highlights.push_back(Highlight(name, pkgs));
+            highlights.push_back(Highlight(slug, name, pkgs));
         }
     }
 

=== modified file 'libclickscope/click/highlights.h'
--- libclickscope/click/highlights.h	2014-06-18 17:37:13 +0000
+++ libclickscope/click/highlights.h	2014-07-11 16:49:25 +0000
@@ -45,15 +45,17 @@
     {
         JsonKeys() = delete;
         constexpr static const char* name {"name"};
+        constexpr static const char* slug {"slug"};
         constexpr static const char* embedded {"_embedded"};
         constexpr static const char* highlight {"clickindex:highlight"};
     };
 
     Highlight(const std::string& name);
-    Highlight(const std::string& name, const Packages& pkgs);
+    Highlight(const std::string& slug, const std::string& name, const Packages& pkgs);
     void add_package(const Package& pkg);
 
     std::string name() const;
+    std::string slug() const;
     Packages packages() const;
 
     static std::list<Highlight> from_json_root_node(const Json::Value& val);
@@ -61,6 +63,7 @@
 private:
     static std::list<Highlight> from_json_node(const Json::Value& val);
 
+    std::string slug_;
     std::string name_;
     Packages packages_;
 };

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-07 14:57:25 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-11 16:49:25 +0000
@@ -47,7 +47,7 @@
 namespace
 {
 
-std::string CATEGORY_APPS_DISPLAY = R"(
+static const std::string CATEGORY_APPS_DISPLAY = R"(
     {
         "schema-version" : 1,
         "template" : {
@@ -238,30 +238,33 @@
 void click::apps::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply)
 {
     static const std::string title = _("Ubuntu Store");
-    static const std::string cat_title = _("Get more apps from the store");
-    auto name = title;
+    std::string cat_title = _("Get more apps from the store");
 
-    std::string querystr = query().query_string();
-    std::transform(querystr.begin(), querystr.end(), querystr.begin(), ::tolower);
-    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
-    if (querystr.empty() || name.find(querystr) != std::string::npos)
+    const std::string querystr = query().query_string();
+    if (!querystr.empty())
     {
-        scopes::CategoryRenderer rdr(CATEGORY_STORE);
-        auto cat = searchReply->register_category("store", cat_title, "", rdr);
-
-        static const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore");
-
-        scopes::CategorisedResult res(cat);
-        res.set_title(title);
-        res.set_art(STORE_DATA_DIR "/store-scope-icon.svg");
-        res.set_uri(store_scope.to_uri());
-        res[click::apps::Query::ResultKeys::NAME] = title;
-        res[click::apps::Query::ResultKeys::DESCRIPTION] = "";
-        res[click::apps::Query::ResultKeys::MAIN_SCREENSHOT] = "";
-        res[click::apps::Query::ResultKeys::INSTALLED] = true;
-        res[click::apps::Query::ResultKeys::VERSION] = "";
-        searchReply->push(res);
+        char tmp[512];
+        if (snprintf(tmp, sizeof(tmp), _("Search for '%s' in the store"), querystr.c_str()) > 0)
+        {
+            cat_title = tmp;
+        }
     }
+
+    scopes::CategoryRenderer rdr(CATEGORY_STORE);
+    auto cat = searchReply->register_category("store", cat_title, "", rdr);
+
+    static const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, "");
+
+    scopes::CategorisedResult res(cat);
+    res.set_title(title);
+    res.set_art(STORE_DATA_DIR "/store-scope-icon.svg");
+    res.set_uri(store_scope.to_uri());
+    res[click::apps::Query::ResultKeys::NAME] = title;
+    res[click::apps::Query::ResultKeys::DESCRIPTION] = "";
+    res[click::apps::Query::ResultKeys::MAIN_SCREENSHOT] = "";
+    res[click::apps::Query::ResultKeys::INSTALLED] = true;
+    res[click::apps::Query::ResultKeys::VERSION] = "";
+    searchReply->push(res);
 }
 
 void click::apps::Query::run(scopes::SearchReplyProxy const& searchReply)

=== modified file 'scope/clickapps/apps-query.h'
--- scope/clickapps/apps-query.h	2014-07-07 14:34:27 +0000
+++ scope/clickapps/apps-query.h	2014-07-11 16:49:25 +0000
@@ -72,7 +72,6 @@
 
     virtual void run(scopes::SearchReplyProxy const& reply) override;
 
-protected:
     virtual void add_fake_store_app(scopes::SearchReplyProxy const &replyProxy);
 private:
     struct Private;

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-07-10 15:29:10 +0000
+++ scope/clickstore/store-query.cpp	2014-07-11 16:49:25 +0000
@@ -55,7 +55,7 @@
 namespace
 {
 
-std::string CATEGORY_APPS_DISPLAY = R"(
+static const std::string CATEGORY_APPS_DISPLAY = R"(
     {
         "schema-version" : 1,
         "template" : {
@@ -73,7 +73,24 @@
     }
 )";
 
-std::string CATEGORY_APPS_SEARCH = R"(
+static const std::string CATEGORY_APP_OF_THE_WEEK = R"(
+{
+    "schema-version" : 1,
+    "template": {
+        "category-layout": "grid",
+        "card-size": "large"
+    },
+    "components": {
+        "title": "title",
+        "subtitle": "subtitle",
+        "art": {
+            "aspect-ratio": 2.5,
+            "field": "art"
+        }
+    }
+})";
+
+static const std::string CATEGORY_APPS_SEARCH = R"(
     {
         "schema-version" : 1,
         "template" : {
@@ -246,12 +263,17 @@
 
 void click::Query::push_highlights(const scopes::SearchReplyProxy& searchReply, const HighlightList& highlights, const PackageSet &locallyInstalledApps)
 {
-    std::string categoryTemplate = CATEGORY_APPS_DISPLAY; //FIXME
-    scopes::CategoryRenderer renderer(categoryTemplate);
+    const scopes::CategoryRenderer renderer(CATEGORY_APPS_DISPLAY);
+    const scopes::CategoryRenderer aotw_renderer(CATEGORY_APP_OF_THE_WEEK);
 
     for (auto const& hl: highlights)
     {
-        auto category = register_category(searchReply, hl.name(), hl.name(), "", renderer); //FIXME: highlight slug
+        scopes::CategoryRenderer const* rdr = &renderer;
+        if (hl.slug() == "app-of-the-week" || hl.packages().size() == 1)
+        {
+            rdr = &aotw_renderer;
+        }
+        auto category = register_category(searchReply, hl.slug(), hl.name(), "", *rdr);
         for (auto const& pkg: hl.packages())
         {
             push_package(searchReply, category, locallyInstalledApps, pkg);

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-07 14:34:27 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-11 16:49:25 +0000
@@ -36,6 +36,8 @@
 #include <clickapps/apps-query.h>
 
 #include <unity/scopes/SearchReply.h>
+#include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/testing/MockSearchReply.h>
 
 #include "test_helpers.h"
@@ -82,3 +84,32 @@
     pusher.push_local_results(apps, categoryTemplate);
 }
 
+MATCHER_P(ResultUriMatchesCannedQuery, q, "") {
+    auto const query = unity::scopes::CannedQuery::from_uri(arg.uri());
+    return query.scope_id() == q.scope_id()
+        && query.query_string() == q.query_string()
+        && query.department_id() == q.department_id();
+}
+
+MATCHER_P(CategoryTitleContains, s, "") { return arg.find(s) != std::string::npos; }
+
+TEST(Query, testUbuntuStoreFakeResult)
+{
+    const scopes::SearchMetadata metadata("en_EN", "phone");
+    const unity::scopes::CannedQuery query("foo.scope", "FooBar", "");
+    click::apps::Query q(query, metadata);
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    const unity::scopes::CannedQuery target_query("com.canonical.scopes.clickstore", "FooBar", "");
+
+    EXPECT_CALL(mock_reply, register_category("store", CategoryTitleContains("FooBar"), _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(mock_reply, push(Matcher<const unity::scopes::CategorisedResult&>(ResultUriMatchesCannedQuery(target_query))));
+
+    q.add_fake_store_app(reply);
+}
+