Merge lp:~alecu/unity-scope-click/missing-preview-fields into lp:unity-scope-click/devel

[Alejandro J. Cura]

Adds pending fields for the store preview.

[lp:~alecu/unity-scope-click/missing-preview-fields]

359. By Alejandro J. Cura on 2014-07-25

Minimize diff

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/209/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/208/console

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/missing-preview-fields]

360. By Alejandro J. Cura on 2014-07-25

Me4rged with tip of /devel

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

I'm a bit worried about the lack of translation in the size formatting code. For example, here is the glib code for formatting sizes: https://git.gnome.org/browse/glib/tree/glib/gutils.c#n2103

It looks like we're expecting boost to do some magic here, and just tack a 'b' or 'bytes' on the end (and 'b' is wrong there, since 'B' is the correct symbol for bytes, at least in US).

review: Needs Information

[lp:~alecu/unity-scope-click/missing-preview-fields]

361. By Alejandro J. Cura on 2014-07-25

Disable the human-readable formatting of file sizes, as per review

[dobey (dobey)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~alecu/unity-scope-click/missing-preview-fields]

362. By Alejandro J. Cura on 2014-07-25

Use the human readable again, with more tests and fixes.

[dobey (dobey)]

review: Needs Fixing

[dobey (dobey)]

Oh, and you'll also need to add libclickscope/click/utils.cpp to po/POTFILES.in.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~alecu/unity-scope-click/missing-preview-fields]

363. By Alejandro J. Cura on 2014-07-25

Use dngettext instead of boost::locale::translate, added utils.cpp to POTFILES.in

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-07-10 07:20:26 +0000
+++ libclickscope/click/CMakeLists.txt	2014-07-25 22:06:29 +0000
@@ -31,6 +31,7 @@
   scope_activation.cpp
   smartconnect.cpp
   ubuntuone_credentials.cpp
+  utils.cpp
   webclient.cpp
 )
 

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-07-02 15:24:07 +0000
+++ libclickscope/click/package.cpp	2014-07-25 22:06:29 +0000
@@ -55,15 +55,22 @@
             lhs.rating == rhs.rating &&
             // TODO: keywords should be a list of strings
             lhs.keywords == rhs.keywords &&
+
             lhs.terms_of_service == rhs.terms_of_service &&
             lhs.license == rhs.license &&
             lhs.publisher == rhs.publisher &&
+            lhs.developer_name == rhs.developer_name &&
+            lhs.company_name == rhs.company_name &&
+            lhs.website == rhs.website &&
+            lhs.support_url == rhs.support_url &&
+
             lhs.main_screenshot_url == rhs.main_screenshot_url &&
-            // TODO: more_screenshots_urls should be a list of strings
             lhs.more_screenshots_urls == rhs.more_screenshots_urls &&
-            // TODO: binary_filesize should be a int/long
             lhs.binary_filesize == rhs.binary_filesize &&
             lhs.version == rhs.version &&
+            lhs.date_published == rhs.date_published &&
+            lhs.last_updated == rhs.last_updated &&
+            lhs.changelog == rhs.changelog &&
             lhs.framework == rhs.framework;
 }
 
@@ -172,6 +179,27 @@
         if (root[JsonKeys::framework].isString())
             details.framework = root[JsonKeys::framework].asString();
 
+        if (root[JsonKeys::developer_name].isString())
+            details.developer_name = root[JsonKeys::developer_name].asString();
+
+        if (root[JsonKeys::company_name].isString())
+            details.company_name = root[JsonKeys::company_name].asString();
+
+        if (root[JsonKeys::website].isString())
+            details.website = root[JsonKeys::website].asString();
+
+        if (root[JsonKeys::support_url].isString())
+            details.support_url = root[JsonKeys::support_url].asString();
+
+        if (root[JsonKeys::date_published].isString())
+            details.date_published.parse_iso8601(root[JsonKeys::date_published].asString());
+
+        if (root[JsonKeys::last_updated].isString())
+            details.last_updated.parse_iso8601(root[JsonKeys::last_updated].asString());
+
+        if (root[JsonKeys::changelog].isString())
+            details.changelog = root[JsonKeys::changelog].asString();
+
     } catch(const std::exception& e)
     {
         std::cerr << "PackageDetails::loadJson: Exception thrown while decoding JSON: " << e.what() << std::endl;
@@ -221,10 +249,19 @@
         << print_string_if_not_empty(details.terms_of_service) << ", "
         << print_string_if_not_empty(details.license) << ", "
         << print_string_if_not_empty(details.publisher) << ", "
+        << print_string_if_not_empty(details.developer_name) << ", "
+        << print_string_if_not_empty(details.company_name) << ", "
+        << print_string_if_not_empty(details.website) << ", "
+        << print_string_if_not_empty(details.support_url) << ", "
+
         << print_string_if_not_empty(details.main_screenshot_url) << ", "
         << print_list_if_not_empty(details.more_screenshots_urls) << ", "
         << details.binary_filesize << ", "
         << print_string_if_not_empty(details.version) << ", "
+        << print_string_if_not_empty(details.date_published.formatted()) << ", "
+        << print_string_if_not_empty(details.last_updated.formatted()) << ", "
+        << print_string_if_not_empty(details.changelog) << ", "
+
         << print_string_if_not_empty(details.framework)
         << ")";
 

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-07-02 15:24:07 +0000
+++ libclickscope/click/package.h	2014-07-25 22:06:29 +0000
@@ -38,6 +38,7 @@
 
 #include <json/json.h>
 
+#include <click/utils.h>
 
 namespace json = Json;
 
@@ -123,14 +124,24 @@
         constexpr static const char* download_url{"download_url"};
         constexpr static const char* rating{"rating"};
         constexpr static const char* keywords{"keywords"};
+
         constexpr static const char* terms_of_service{"terms_of_service"};
         constexpr static const char* license{"license"};
         constexpr static const char* publisher{"publisher"};
+        constexpr static const char* developer_name{"developer_name"};
+        constexpr static const char* company_name{"company_name"};
+        constexpr static const char* website{"website"};
+        constexpr static const char* support_url{"support_url"};
+
         constexpr static const char* department{"department"};
         constexpr static const char* main_screenshot_url{"screenshot_url"};
         constexpr static const char* more_screenshot_urls{"screenshot_urls"};
         constexpr static const char* binary_filesize{"binary_filesize"};
         constexpr static const char* version{"version"};
+        constexpr static const char* date_published{"date_published"};
+        constexpr static const char* last_updated{"last_updated"};
+        constexpr static const char* changelog{"changelog"};
+
         constexpr static const char* framework{"framework"};
     };
 
@@ -142,13 +153,23 @@
     std::string download_url;
     double rating;
     std::string keywords;
+
     std::string terms_of_service;
     std::string license;
     std::string publisher;
+    std::string developer_name;
+    std::string company_name;
+    std::string website;
+    std::string support_url;
+
     std::string main_screenshot_url;
     std::list<std::string> more_screenshots_urls;
     json::Value::UInt64 binary_filesize;
     std::string version;
+    click::Date date_published;
+    click::Date last_updated;
+    std::string changelog;
+
     std::string framework;
     std::string department;
 };

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-07-22 13:02:28 +0000
+++ libclickscope/click/preview.cpp	2014-07-25 22:06:29 +0000
@@ -35,6 +35,7 @@
 #include <click/launcher.h>
 #include <click/dbus_constants.h>
 #include <click/departments-db.h>
+#include <click/utils.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -54,6 +55,10 @@
 
 namespace click {
 
+const std::string PreviewStrategy::INFO_LABEL = _("Info");
+const std::string PreviewStrategy::UPDATES_LABEL = _("Updates");
+const std::string PreviewStrategy::WHATS_NEW_LABEL = _("What's new");
+
 DepartmentUpdater::DepartmentUpdater(const std::shared_ptr<click::DepartmentsDb>& depts)
     : depts(depts)
 {
@@ -198,6 +203,37 @@
     submit_operation.cancel();
 }
 
+// TODO: replace this big string with a TABLE widget
+std::string PreviewStrategy::build_other_metadata(const PackageDetails &details)
+{
+    std::stringstream b;
+    b << _("Publisher/Creator") << ": " << details.publisher << std::endl;
+    b << _("Seller") << ": " << details.company_name << std::endl;
+    b << _("Website") << ": " << details.website << std::endl;
+    b << _("Contact") << ": " << details.support_url << std::endl;
+    b << _("License") << ": " << details.license << std::endl;
+    return b.str();
+}
+
+// TODO: replace this big string with a TABLE widget
+std::string PreviewStrategy::build_updates_table(const PackageDetails& details)
+{
+    std::stringstream b;
+    b << _("Version number") << ": " << details.version << std::endl;
+    b << _("Last updated") << ": " << details.last_updated.formatted() << std::endl;
+    b << _("First released") << ": " << details.date_published.formatted() << std::endl;
+    b << _("Size") << ": " <<
+         click::Formatter::human_readable_filesize(details.binary_filesize) << std::endl;
+    return b.str();
+}
+
+std::string PreviewStrategy::build_whats_new(const PackageDetails& details)
+{
+    std::stringstream b;
+    b << _("Version") << ": " << details.version << std::endl;
+    b << details.changelog;
+    return b.str();
+}
 
 // TODO: error handling - once get_details provides errors, we can
 // return them from populateDetails and check them in the calling code
@@ -291,14 +327,27 @@
 scopes::PreviewWidgetList PreviewStrategy::descriptionWidgets(const click::PackageDetails& details)
 {
     scopes::PreviewWidgetList widgets;
-    if (details.description.empty())
+    if (!details.description.empty())
     {
-        return widgets;
+        scopes::PreviewWidget summary("summary", "text");
+        summary.add_attribute_value("title", scopes::Variant(INFO_LABEL));
+        summary.add_attribute_value("text", scopes::Variant(details.description));
+        widgets.push_back(summary);
     }
 
-    scopes::PreviewWidget summary("summary", "text");
-    summary.add_attribute_value("text", scopes::Variant(details.description));
-    widgets.push_back(summary);
+    scopes::PreviewWidget other_metadata("other_metadata", "text");
+    other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
+    widgets.push_back(other_metadata);
+
+    scopes::PreviewWidget updates("updates", "text");
+    updates.add_attribute_value("title", scopes::Variant(UPDATES_LABEL));
+    updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
+    widgets.push_back(updates);
+
+    scopes::PreviewWidget whats_new("whats_new", "text");
+    whats_new.add_attribute_value("title", scopes::Variant(WHATS_NEW_LABEL));
+    whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
+    widgets.push_back(whats_new);
 
     return widgets;
 }
@@ -311,6 +360,10 @@
     scopes::VariantBuilder builder;
 
     if (reviewlist.size() > 0) {
+        scopes::PreviewWidget title("reviews_title", "text");
+        title.add_attribute_value("title", scopes::Variant(_("Reviews")));
+        widgets.push_back(title);
+
         for (const auto& kv : reviewlist) {
             builder.add_tuple({
                     {"rating", scopes::Variant(kv.rating)},

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-07-22 13:02:28 +0000
+++ libclickscope/click/preview.h	2014-07-25 22:06:29 +0000
@@ -115,7 +115,9 @@
 
     virtual void cancelled();
     virtual void run(unity::scopes::PreviewReplyProxy const& reply) = 0;
-
+    static const std::string INFO_LABEL;
+    static const std::string UPDATES_LABEL;
+    static const std::string WHATS_NEW_LABEL;
 protected:
     virtual void populateDetails(std::function<void(const PackageDetails &)> details_callback,
                                  std::function<void(const click::ReviewList&,
@@ -134,6 +136,10 @@
     virtual void pushPackagePreviewWidgets(const unity::scopes::PreviewReplyProxy &reply,
                                            const PackageDetails& details,
                                            const scopes::PreviewWidgetList& button_area_widgets);
+    virtual std::string build_other_metadata(const PackageDetails& details);
+    virtual std::string build_updates_table(const PackageDetails& details);
+    virtual std::string build_whats_new(const PackageDetails& details);
+
     scopes::Result result;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;

=== added file 'libclickscope/click/utils.cpp'
--- libclickscope/click/utils.cpp	1970-01-01 00:00:00 +0000
+++ libclickscope/click/utils.cpp	2014-07-25 22:06:29 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <sstream>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/date_time/time_facet.hpp>
+#include <boost/locale.hpp>
+#include <boost/units/systems/si/io.hpp>
+
+#include <click/utils.h>
+
+struct byte_base_unit : boost::units::base_unit<byte_base_unit, boost::units::dimensionless_type, 3>
+{
+  static const char* name() { return("byte"); }
+  static const char* symbol() { return("B"); }
+};
+
+std::string click::Formatter::human_readable_filesize(long num_bytes)
+{
+    std::ostringstream s;
+    std::cout.imbue(std::locale());
+
+    if (num_bytes > 1023) {
+        s << boost::units::symbol_format << boost::units::binary_prefix;
+        s << boost::locale::format("{1,num=fixed,precision=1}") % (num_bytes * byte_base_unit::unit_type());
+    } else {
+        std::string tpl(dngettext(GETTEXT_PACKAGE, "{1} byte", "{1} bytes", num_bytes));
+        s << boost::locale::format(tpl) % num_bytes;
+    }
+    return s.str();
+}
+
+using namespace boost::posix_time;
+
+time_input_facet* build_input_facet(std::stringstream& ss)
+{
+    time_input_facet* input_facet = new time_input_facet(1);
+    input_facet->set_iso_extended_format();
+    ss.imbue(std::locale(ss.getloc(), input_facet));
+    return input_facet;
+}
+
+void click::Date::setup_system_locale()
+{
+    boost::locale::generator gen;
+    std::locale loc=gen("");
+    std::locale::global(loc);
+}
+
+void click::Date::parse_iso8601(std::string iso8601)
+{
+    static std::stringstream ss;
+    static ptime epoch(boost::gregorian::date(1970,1,1));
+    static time_input_facet* input_facet = NULL;
+
+    if (input_facet == NULL) {
+        build_input_facet(ss);
+    }
+
+    ptime time;
+    ss.str(iso8601);
+    ss >> time;
+    ss.clear();
+
+    timestamp = (time - epoch).total_seconds();
+}
+
+std::string click::Date::formatted() const
+{
+    std::stringstream s;
+    s << boost::locale::as::date << timestamp;
+    return s.str();
+}

=== added file 'libclickscope/click/utils.h'
--- libclickscope/click/utils.h	1970-01-01 00:00:00 +0000
+++ libclickscope/click/utils.h	2014-07-25 22:06:29 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef CLICK_UTILS_H
+#define CLICK_UTILS_H
+
+#include <ctime>
+#include <string>
+
+namespace click
+{
+
+class Date
+{
+protected:
+    std::time_t timestamp;
+public:
+    void parse_iso8601(std::string iso8601);
+    std::string formatted() const;
+    static void setup_system_locale();
+    inline bool operator==(const Date& other) const
+    {
+        return timestamp == other.timestamp;
+    }
+};
+
+
+class Formatter
+{
+public:
+    static std::string human_readable_filesize(long num_bytes);
+};
+
+} // namespace click
+#endif // CLICK_UTILS_H

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2014-07-23 14:53:10 +0000
+++ libclickscope/tests/CMakeLists.txt	2014-07-25 22:06:29 +0000
@@ -26,6 +26,7 @@
   test_bootstrap.cpp
   test_configuration.cpp
   test_departments.cpp
+  test_departments-db.cpp
   test_download_manager.cpp
   test_index.cpp
   test_interface.cpp
@@ -33,9 +34,8 @@
   test_preview.cpp
   test_reviews.cpp
   test_smartconnect.cpp
+  test_utils.cpp
   test_webclient.cpp
-  test_departments.cpp
-  test_departments-db.cpp
 
   ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
 )

=== modified file 'libclickscope/tests/fake_json.cpp'
--- libclickscope/tests/fake_json.cpp	2014-07-17 18:37:23 +0000
+++ libclickscope/tests/fake_json.cpp	2014-07-25 22:06:29 +0000
@@ -175,26 +175,31 @@
         "download_url": "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
         "rating": 3.5,
         "keywords": "these, are, key, words",
+
         "terms_of_service": "tos",
         "license": "Proprietary",
-        "publisher": "Beuno",
+        "publisher": "Fake Publisher",
+        "developer_name": "Fake Developer",
+        "company_name": "Fake Company",
+        "website": "http://example.com",
+        "support_url": "http://example.com/support",
+
         "screenshot_url": "sshot0",
         "screenshot_urls": ["sshot1", "sshot2"],
         "binary_filesize": 177582,
         "version": "0.2",
+        "date_published": "2013-11-04T00:40:24.686298Z",
+        "last_updated": "2014-07-03T08:16:34.532525Z",
+        "changelog": "This is the changelog",
+
         "framework": "None",
-
-        "website": "",
-        "support_url": "http://beuno.com.ar",
         "price": 1.99,
         "license_key_path": "",
         "click_version": "0.1",
-        "company_name": "",
         "icon_urls": {
             "64": "http://developer.staging.ubuntu.com/site_media/appmedia/2013/07/weather-icone-6797-64.png"
         },
-        "requires_license_key": false,
-        "date_published": "2013-07-16T21:50:34.874000"
+        "requires_license_key": false
     }
 )foo";
 

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2014-07-02 15:24:07 +0000
+++ libclickscope/tests/test_index.cpp	2014-07-25 22:06:29 +0000
@@ -28,6 +28,7 @@
  */
 
 #include <click/index.h>
+#include <click/utils.h>
 #include <click/webclient.h>
 
 #include <tests/mock_network_access_manager.h>
@@ -322,6 +323,13 @@
     indexPtr->get_details("", [this](click::PackageDetails details, click::Index::Error error){
         details_callback(details, error);
     });
+
+    click::Date published;
+    published.parse_iso8601("2013-11-04T00:40:24.686298Z");
+
+    click::Date updated;
+    updated.parse_iso8601("2014-07-03T08:16:34.532525Z");
+
     click::PackageDetails fake_details {
         {
             "ar.com.beuno.wheather-touch",
@@ -335,13 +343,23 @@
         "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
         3.5,
         "these, are, key, words",
+
         "tos",
         "Proprietary",
-        "Beuno",
+        "Fake Publisher",
+        "Fake Developer",
+        "Fake Company",
+        "http://example.com",
+        "http://example.com/support",
+
         "sshot0",
         {"sshot1", "sshot2"},
         177582,
         "0.2",
+        published,
+        updated,
+        "This is the changelog",
+
         "None",
         "tools"
     };
@@ -370,6 +388,12 @@
         details_callback(details, error);
     });
 
+    click::Date published;
+    published.parse_iso8601("2013-11-04T00:40:24.686298Z");
+
+    click::Date updated;
+    updated.parse_iso8601("2014-07-03T08:16:34.532525Z");
+
     click::PackageDetails fake_details {
         {
             "ar.com.beuno.wheather-touch",
@@ -383,13 +407,23 @@
         "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
         3.5,
         "these, are, key, words",
+
         "tos",
         "Proprietary",
-        "Beuno",
+        "Fake Publisher",
+        "Fake Developer",
+        "Fake Company",
+        "http://example.com",
+        "http://example.com/support",
+
         "sshot0",
         {"sshot1", "sshot2"},
         177582,
         "0.2",
+        published,
+        updated,
+        "This is the changelog",
+
         "None",
         "tools"
     };

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2014-07-22 16:05:53 +0000
+++ libclickscope/tests/test_preview.cpp	2014-07-25 22:06:29 +0000
@@ -31,6 +31,7 @@
 
 #include <gtest/gtest.h>
 #include <click/preview.h>
+#include <fake_json.h>
 
 using namespace ::testing;
 using namespace unity::scopes;
@@ -57,6 +58,10 @@
 
     }
     using click::PreviewStrategy::screenshotsWidgets;
+    using click::PreviewStrategy::descriptionWidgets;
+    using click::PreviewStrategy::build_other_metadata;
+    using click::PreviewStrategy::build_updates_table;
+    using click::PreviewStrategy::build_whats_new;
 };
 
 class PreviewsBaseTest : public Test
@@ -97,6 +102,43 @@
     ASSERT_EQ(sources[2].get_string(), "sshot3");
 }
 
+class PreviewStrategyDescriptionTest : public PreviewStrategyTest
+{
+public:
+    FakeResult result{vm};
+    FakePreview preview{result};
+    click::PackageDetails details;
+    unity::scopes::PreviewWidgetList widgets;
+
+    PreviewStrategyDescriptionTest() : details(click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS))
+    {
+        widgets = preview.descriptionWidgets(details);
+
+    }
+    void assertWidgetAttribute(int n, std::string attribute_name, std::string expected_value)
+    {
+        ASSERT_GT(widgets.size(), n);
+        auto widget = std::next(widgets.begin(), n);
+        auto attributes = widget->attribute_values();
+        ASSERT_EQ(expected_value, attributes[attribute_name].get_string());
+    }
+};
+
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgets)
+{
+    assertWidgetAttribute(0, "title", click::PreviewStrategy::INFO_LABEL);
+    assertWidgetAttribute(0, "text", details.description);
+
+    assertWidgetAttribute(1, "text", preview.build_other_metadata(details));
+
+    assertWidgetAttribute(2, "title", click::PreviewStrategy::UPDATES_LABEL);
+    assertWidgetAttribute(2, "text", preview.build_updates_table(details));
+
+    assertWidgetAttribute(3, "title", click::PreviewStrategy::WHATS_NEW_LABEL);
+    assertWidgetAttribute(3, "text", preview.build_whats_new(details));
+
+}
+
 class FakePreviewStrategy :  public click::PreviewStrategy
 {
 public:

=== added file 'libclickscope/tests/test_utils.cpp'
--- libclickscope/tests/test_utils.cpp	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/test_utils.cpp	2014-07-25 22:06:29 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <gtest/gtest.h>
+#include <boost/locale.hpp>
+#include <boost/locale/time_zone.hpp>
+
+#include <click/utils.h>
+
+using namespace ::testing;
+
+class UtilsTest : public Test
+{
+public:
+    void SetUp()
+    {
+        // The tests assume they run always under the same environment
+        setDefaultTimezone();
+        setDefaultLocale();
+    }
+
+    void setDefaultTimezone()
+    {
+        boost::locale::time_zone::global("UTC");
+    }
+
+    void setDefaultLocale()
+    {
+        boost::locale::generator gen;
+        std::locale::global(gen("C"));
+    }
+};
+
+TEST_F(UtilsTest, testHumanReadableZeroBytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(0), "0 bytes");
+}
+
+TEST_F(UtilsTest, testHumanReadableOneByte)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(1), "1 byte");
+}
+
+TEST_F(UtilsTest, testHumanReadableMoreBytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(102), "102 bytes");
+}
+
+TEST_F(UtilsTest, testHumanReadableKilobytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(102*1024), "102.0 KiB");
+}
+
+TEST_F(UtilsTest, testHumanReadableFractionalKilobytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(102*1024+512+1), "102.5 KiB");
+}
+
+TEST_F(UtilsTest, testHumanReadableMegabytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(42*1024*1024), "42.0 MiB");
+}
+
+TEST_F(UtilsTest, testHumanReadableFractionalMegabytes)
+{
+    ASSERT_EQ(click::Formatter::human_readable_filesize(42*1024*1024+512*1024+512), "42.5 MiB");
+}
+
+class TestableDate : public click::Date
+{
+public:
+    using click::Date::timestamp;
+};
+
+TEST_F(UtilsTest, testDateParseIso8601)
+{
+    TestableDate d;
+    d.parse_iso8601("1975-11-30T00:00:00Z");
+    ASSERT_EQ(186537600, d.timestamp);
+}
+
+TEST_F(UtilsTest, testDateFormatted)
+{
+    TestableDate d;
+    d.timestamp = 186537600;
+    ASSERT_EQ("Nov 30, 1975", d.formatted());
+}
+
+TEST_F(UtilsTest, testAFewDatesFormatted)
+{
+    TestableDate d;
+    d.parse_iso8601("2008-12-06T00:00:00Z");
+    ASSERT_EQ("Dec 6, 2008", d.formatted());
+    d.parse_iso8601("2013-12-16T00:00:00Z");
+    ASSERT_EQ("Dec 16, 2013", d.formatted());
+}
+
+TEST_F(UtilsTest, testDateComparesOk)
+{
+    TestableDate d1;
+    d1.parse_iso8601("1975-11-30T00:00:00Z");
+
+    TestableDate d2;
+    d2.timestamp = 186537600;
+
+    ASSERT_EQ(d1, d2);
+}

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-06-25 13:43:08 +0000
+++ po/POTFILES.in	2014-07-25 22:06:29 +0000
@@ -1,5 +1,6 @@
 [type: gettext/ini] data/com.canonical.scopes.clickstore.ini.in.in
 [type: gettext/ini] data/clickscope.ini.in.in
 libclickscope/click/preview.cpp
+libclickscope/click/utils.cpp
 scope/clickapps/apps-query.cpp
 scope/clickstore/store-query.cpp

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-07-18 15:12:22 +0000
+++ scope/clickapps/apps-scope.cpp	2014-07-25 22:06:29 +0000
@@ -38,6 +38,7 @@
 #include <click/key_file_locator.h>
 #include <click/network_access_manager.h>
 #include <click/click-i18n.h>
+#include <click/utils.h>
 #include <unity/scopes/CannedQuery.h>
 
 #include "apps-scope.h"
@@ -69,6 +70,7 @@
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    click::Date::setup_system_locale();
 }
 
 void click::Scope::run()

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-07-22 10:20:38 +0000
+++ scope/clickstore/store-scope.cpp	2014-07-25 22:06:29 +0000
@@ -75,6 +75,7 @@
     setlocale(LC_MONETARY, "C");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    click::Date::setup_system_locale();
 }
 
 void click::Scope::run()