Merge lp:~dobey/unity-scope-click/multistar into lp:unity-scope-click

[dobey]

Use 5 stars for visualizing the rating value.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/741/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/141/console

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

This should be moved to its own function, and needs some unit tests.

review: Needs Fixing

[lp:~dobey/unity-scope-click/multistar]

445. By dobey on 2016-05-17

Refactor to separate method with tests.

[Alejandro J. Cura (alecu)]

We don't check whatever comes in the json for pkg.rating, so please add tests for -1.0 and 6.0.

review: Needs Fixing

[lp:~dobey/unity-scope-click/multistar]

446. By dobey on 2016-05-17

Bound the rating betwen 0.0 and 5.0 for star rendering.

[Alejandro J. Cura (alecu)]

Looks great

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/746/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/146/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'libclickscope/click/utils.cpp'
--- libclickscope/click/utils.cpp	2014-07-25 22:06:11 +0000
+++ libclickscope/click/utils.cpp	2016-05-17 18:05:09 +0000
@@ -57,6 +57,29 @@
     return s.str();
 }
 
+std::string click::Formatter::render_rating_stars(double rating)
+{
+    std::ostringstream ss;
+    int rounded;
+
+    // Only support values of rating between 0.0 and 5.0
+    if (rating < 0.0f) {
+        rounded = 0;
+    } else if (rating > 5.0f) {
+        rounded = 5;
+    } else {
+        rounded = round(rating);
+    }
+
+    for (int i = 0; i < rounded; i++) {
+        ss << "★";
+    }
+    for (int j = 0; j < 5 - rounded; j++) {
+        ss << "☆";
+    }
+    return ss.str();
+}
+
 using namespace boost::posix_time;
 
 time_input_facet* build_input_facet(std::stringstream& ss)

=== modified file 'libclickscope/click/utils.h'
--- libclickscope/click/utils.h	2014-07-25 05:35:28 +0000
+++ libclickscope/click/utils.h	2016-05-17 18:05:09 +0000
@@ -55,6 +55,7 @@
 {
 public:
     static std::string human_readable_filesize(long num_bytes);
+    static std::string render_rating_stars(double rating);
 };
 
 } // namespace click

=== modified file 'libclickscope/tests/test_utils.cpp'
--- libclickscope/tests/test_utils.cpp	2014-07-25 20:25:49 +0000
+++ libclickscope/tests/test_utils.cpp	2016-05-17 18:05:09 +0000
@@ -92,6 +92,31 @@
     ASSERT_EQ(click::Formatter::human_readable_filesize(42*1024*1024+512*1024+512), "42.5 MiB");
 }
 
+TEST_F(UtilsTest, testRatingStarsFull)
+{
+    ASSERT_EQ(click::Formatter::render_rating_stars(2.0f), "★★☆☆☆");
+}
+
+TEST_F(UtilsTest, testRatingStarsHalf)
+{
+    ASSERT_EQ(click::Formatter::render_rating_stars(3.5f), "★★★★☆");
+}
+
+TEST_F(UtilsTest, testRatingStarsQuarter)
+{
+    ASSERT_EQ(click::Formatter::render_rating_stars(3.25f), "★★★☆☆");
+}
+
+TEST_F(UtilsTest, testRatingStarsNegative)
+{
+    ASSERT_EQ(click::Formatter::render_rating_stars(-1.0f), "☆☆☆☆☆");
+}
+
+TEST_F(UtilsTest, testRatingStarOverload)
+{
+    ASSERT_EQ(click::Formatter::render_rating_stars(6.0f), "★★★★★");
+}
+
 class TestableDate : public click::Date
 {
 public:

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2016-05-10 14:56:11 +0000
+++ scope/clickstore/store-query.cpp	2016-05-17 18:05:09 +0000
@@ -35,6 +35,7 @@
 #include <click/key_file_locator.h>
 #include <click/qtbridge.h>
 #include <click/departments-db.h>
+#include <click/utils.h>
 
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategoryRenderer.h>
@@ -298,7 +299,8 @@
         std::string price = _("FREE");
         std::stringstream ss;
         ss << std::fixed << std::setprecision(1);
-        ss << "☆ " << pkg.rating;
+        ss << click::Formatter::render_rating_stars(pkg.rating);
+        ss << " " << pkg.rating;
         std::string rating{ss.str()};
 
         bool was_purchased = false;