Merge lp:~dobey/unity-scope-click/result-attrs into lp:unity-scope-click/devel

[dobey]

Add the price and rating as attributes in search results.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/result-attrs]

412. By dobey on 2014-08-22

Merge alecu's scopes branch.

413. By dobey on 2014-08-22

Add the attributes on the scopes category as well.

Unmerged revisions

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-08-11 18:30:00 +0000
+++ libclickscope/click/package.cpp	2014-08-22 20:29:37 +0000
@@ -84,6 +84,8 @@
     p.icon_url = item[Package::JsonKeys::icon_url].asString();
     p.url = item[Package::JsonKeys::links][Package::JsonKeys::self][Package::JsonKeys::href].asString();
     p.content = item[Package::JsonKeys::content].asString();
+    p.publisher = item[Package::JsonKeys::publisher].asString();
+    p.rating = item[Package::JsonKeys::rating].asDouble();
     return p;
 }
 

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-08-11 18:30:00 +0000
+++ libclickscope/click/package.h	2014-08-22 20:29:37 +0000
@@ -61,6 +61,8 @@
         constexpr static const char* price{"price"};
         constexpr static const char* icon_url{"icon_url"};
         constexpr static const char* content{"content"};
+        constexpr static const char* publisher{"publisher"};
+        constexpr static const char* rating{"ratings_average"};
     };
 
     Package() = default;
@@ -96,6 +98,8 @@
     std::string icon_url;
     std::string url;
     std::string version;
+    std::string publisher;
+    double rating;
     void matches (std::string query, std::function<bool> callback);
     std::string content;
 

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-21 21:15:13 +0000
+++ scope/clickstore/store-query.cpp	2014-08-22 20:29:37 +0000
@@ -43,7 +43,11 @@
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/Variant.h>
+#include <unity/scopes/VariantBuilder.h>
 
+#include <iostream>
+#include <iomanip>
 #include<vector>
 #include<set>
 #include<sstream>
@@ -69,6 +73,7 @@
         "components" : {
             "title" : "title",
             "subtitle": "subtitle",
+            "attributes": "attributes",
             "art" : {
                 "field": "art",
                 "aspect-ratio": 1.13
@@ -88,6 +93,7 @@
         "components" : {
             "title" : "title",
             "subtitle": "subtitle",
+            "attributes": "attributes",
             "art" : {
                 "field": "art",
                 "aspect-ratio": 0.55
@@ -106,6 +112,7 @@
     "components": {
         "title": "title",
         "subtitle": "subtitle",
+        "attributes": "attributes",
         "art": {
             "aspect-ratio": 2.5,
             "field": "art"
@@ -128,7 +135,8 @@
                 "field": "art",
                 "aspect-ratio": 1.13
             },
-            "subtitle": "subtitle"
+            "subtitle": "subtitle",
+            "attributes": "attributes"
         }
     }
 )";
@@ -298,8 +306,15 @@
         res.set_art(pkg.icon_url);
         res.set_uri(pkg.url);
         res[click::Query::ResultKeys::NAME] = pkg.name;
+        res["subtitle"] = pkg.publisher;
         auto installed = installedPackages.find(pkg);
 
+        std::string price = _("FREE");
+        std::stringstream ss;
+        ss << std::fixed << std::setprecision(1);
+        ss << "☆ " << pkg.rating;
+        std::string rating{ss.str()};
+
         bool purchased = false;
         if (pkg.price > 0.00f) {
             if (!Configuration::get_purchases_enabled()) {
@@ -312,24 +327,31 @@
         if (installed != installedPackages.end()) {
             res[click::Query::ResultKeys::INSTALLED] = true;
             res[click::Query::ResultKeys::PURCHASED] = purchased;
-            res["subtitle"] = _("✔ INSTALLED");
+            price = _("✔ INSTALLED");
             res[click::Query::ResultKeys::VERSION] = installed->version;
         } else if (purchased) {
             res[click::Query::ResultKeys::PURCHASED] = true;
             res[click::Query::ResultKeys::INSTALLED] = false;
-            res["subtitle"] = _("✔ PURCHASED");
+            price = _("✔ PURCHASED");
         } else {
             res[click::Query::ResultKeys::INSTALLED] = false;
             res[click::Query::ResultKeys::PURCHASED] = false;
             if (pkg.price > 0.00f) {
                 QLocale locale;
-                res["subtitle"] = locale.toCurrencyString(pkg.price, "$").toUtf8().data();
-            } else {
-                res["subtitle"] = _("FREE");
+                price = locale.toCurrencyString(pkg.price, "$").toUtf8().data();
             }
-            // TODO: get the real price from the webservice (upcoming branch)
         }
 
+        // Add the price and rating as attributes.
+        scopes::VariantBuilder builder;
+        builder.add_tuple({
+                {"value", scopes::Variant(price)},
+            });
+        builder.add_tuple({
+                {"value", scopes::Variant(rating)},
+            });
+        res["attributes"] = builder.end();
+
         this->push_result(searchReply, res);
     } catch(const std::exception& e){
         qDebug() << "PackageDetails::loadJson: Exception thrown while decoding JSON: " << e.what() ;

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-08-05 14:16:26 +0000
+++ scope/tests/test_query.cpp	2014-08-22 20:29:37 +0000
@@ -528,3 +528,30 @@
 
     ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
 }
+
+MATCHER_P(HasAttributes, b, "") { return !arg["attributes"].is_null() == b; }
+
+TEST(QueryTest, testPushPackagePushesAttributes)
+{
+    click::Packages packages {
+        {"org.example.app1", "app title1", 0.0, "icon", "uri"},
+    };
+    MockIndex mock_index(packages);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    PackageSet no_installed_packages;
+    click::DepartmentLookup dept_lookup;
+    click::HighlightList highlights;
+    MockPayPackage pay_pkg;
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, push_result(_, HasAttributes(true)));
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}