Merge lp:~dobey/unity-scope-click/fix-fallback into lp:unity-scope-click/devel

[dobey]

Use the "self" sub-object for getting the resoruce url under hal+json.
Handle falling back to plain resource_url for when parsing plain json.

The parsing code for hal+json is currently using {"_links": {"href": "https://..."}} to get the URL, but the structure is actually {"_links": {"self": {"href": "https://..."}}} when getting hal+json from the server.
Also, we were not falling back to using "resource_url" from the plain json, and so were getting failures with the new scopes-api as we were getting an empty url for the package. We need to handle this fallback correctly here, to get a valid URL.

[Paweł Stołowski (stolowski)]

Ah, my bad :/. Looks fine, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'scope/click/package.cpp'
--- scope/click/package.cpp	2014-05-16 17:53:39 +0000
+++ scope/click/package.cpp	2014-05-23 14:24:18 +0000
@@ -73,7 +73,10 @@
     p.title = item[Package::JsonKeys::title].asString();
     p.price = item[Package::JsonKeys::price].asDouble();
     p.icon_url = item[Package::JsonKeys::icon_url].asString();
-    p.url = item[Package::JsonKeys::links][Package::JsonKeys::resource_url].asString();
+    p.url = item[Package::JsonKeys::links][Package::JsonKeys::self][Package::JsonKeys::href].asString();
+    if (p.url.empty()) {
+        p.url = item[Package::JsonKeys::resource_url].asString();
+    }
     return p;
 }
 

=== modified file 'scope/click/package.h'
--- scope/click/package.h	2014-05-16 17:53:39 +0000
+++ scope/click/package.h	2014-05-23 14:24:18 +0000
@@ -48,12 +48,14 @@
 
         constexpr static const char* embedded {"_embedded"};
         constexpr static const char* links{"_links"};
+        constexpr static const char* self{"self"};
+        constexpr static const char* href{"href"};
         constexpr static const char* ci_package {"clickindex:package"};
         constexpr static const char* name{"name"};
         constexpr static const char* title{"title"};
         constexpr static const char* price{"price"};
         constexpr static const char* icon_url{"icon_url"};
-        constexpr static const char* resource_url{"href"};
+        constexpr static const char* resource_url{"resource_url"};
     };
 
     Package() = default;

=== modified file 'scope/tests/fake_json.h'
--- scope/tests/fake_json.h	2014-05-14 18:34:20 +0000
+++ scope/tests/fake_json.h	2014-05-23 14:24:18 +0000
@@ -64,7 +64,9 @@
                     "price": 1.99,
                     "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
                     "_links": {
-                        "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        "self": {
+                            "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
                     }
                 }
             ]
@@ -82,7 +84,9 @@
             "price": 1.99,
             "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
             "_links": {
-                "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                }
             }
           },
           {
@@ -92,7 +96,9 @@
             "price": 0.0,
             "icon_url": "http://assets.ubuntu.com/sites/ubuntu/504/u/img/ubuntu/features/icon-find-more-apps-64x64.png",
             "_links": {
-                "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.fantasticapp"
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.fantasticapp"
+                }
             }
           },
           {
@@ -102,7 +108,9 @@
             "price": 1.99,
             "icon_url": "http://assets.ubuntu.com/sites/ubuntu/504/u/img/ubuntu/features/icon-photos-and-videos-64x64.png",
             "_links": {
-                "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomewidget"
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomewidget"
+                }
             }
           }
         ]