Ubuntu Rest Scopes

Merge lp:~facundo/ubuntu-rest-scopes/update-amazon into lp:ubuntu-rest-scopes

  1. update-amazon
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Approved by: Roberto Alsina
Approved revision: 485
Merged at revision: 486
Proposed branch: lp:~facundo/ubuntu-rest-scopes/update-amazon
Merge into: lp:ubuntu-rest-scopes
Diff against target: 147 lines (+24/-16)
2 files modified
configs/scopes/amazon_sorting.yaml (+10/-8)
src/scopes/tests/test_amazon.py (+14/-8)
To merge this branch: bzr merge lp:~facundo/ubuntu-rest-scopes/update-amazon
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+273406@code.launchpad.net

Commit message

Fixed sorting data for Amazon.

Description of the change

Fixed sorting data for Amazon.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configs/scopes/amazon_sorting.yaml'
2--- configs/scopes/amazon_sorting.yaml 2014-06-10 13:10:35 +0000
3+++ configs/scopes/amazon_sorting.yaml 2015-10-05 13:45:25 +0000
4@@ -9,7 +9,7 @@
5 HealthPersonalCare: [price, -price, relevancerank, reviewrank, reviewrank_authority, salesrank]
6 KindleStore: [relevancerank, salesrank, price, -price, reviewrank, daterank]
7 Kitchen: [relevancerank, salesrank, price, -price, reviewrank]
8- LawnAndGarden: [relevancerank, reviewrank, salesrank, price, -price]
9+ LawnGarden: [relevancerank, reviewrank, salesrank, price, -price]
10 Luggage: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
11 Music: [salesrank, titlerank, orig-rel-date]
12 PetSupplies: [+pmrank, salesrank, price, -price, titlerank, -titlerank, relevancerank, reviewrank]
13@@ -30,11 +30,11 @@
14 Electronics: [salesrank, price, -price, titlerank, -titlerank, release-date, -release-date]
15 Grocery: [relevancerank, salesrank, price, -price, reviewrank]
16 HealthPersonalCare: [salesrank, price, -price, titlerank, -titlerank, release-date, -release-date]
17- HomeGarden: [relevancerank, salesrank, price, -price, reviewrank]
18+ Home: [relevancerank, salesrank, price, -price, reviewrank]
19 HomeImprovement: [relevancerank, salesrank, price, -price, reviewrank]
20 Jewelry: [relevancerank, salesrank, price, -price, reviewrank]
21 KindleStore: [daterank, price, -price, relevancerank, reviewrank, salesrank]
22- Misc: [relevancerank, salesrank, price, -price, reviewrank, -launch-date]
23+ Miscellaneous: [relevancerank, salesrank, price, -price, reviewrank, -launch-date]
24 Music: [relevancerank, salesrank, price, -price, titlerank, -titlerank, orig-rel-date, -orig-rel-date]
25 MusicalInstruments: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
26 OfficeProducts: [relevancerank, salesrank, reviewrank, price, -price]
27@@ -66,7 +66,7 @@
28 KindleStore: [relevancerank, -edition-sales-velocity, price, -price, reviewrank, daterank, salesrank]
29 Kitchen: [price, -price, relevancerank, salesrank]
30 Lighting: [relevancerank, price, -price, reviewrank]
31- Luggage: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
32+ Luggage & Bags: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
33 MP3Downloads: [salesrank, relevancerank, reviewrank, price, -price, artistalbumrank, -artistalbumrank, albumrank, -albumrank, runtime, -runtime, -releasedate, titlerank, -titlerank]
34 Magazines: [salesrank, titlerank, -titlerank]
35 Marketplace: [salesrank, price, -price, titlerank, -titlerank, -launch-date]
36@@ -103,6 +103,7 @@
37 Music: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority, -releasedate]
38 Shoes: [-launch-date, popularityrank, price, -price, relevancerank, reviewrank]
39 Software: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority, -releasedate]
40+ SportingGoods: [relevancerank, salesrank, pricerank, inverseprice, launch-date, sale-flag]
41 Toys: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
42 VideoGames: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority, -releasedate]
43 Watches: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
44@@ -123,7 +124,7 @@
45 KindleStore: [-edition-sales-velocity, price, -price, relevancerank, reviewrank, salesrank, daterank]
46 Kitchen: [price, -price, relevancerank, salesrank]
47 Lighting: [salesrank, relevancerank, price, -price, reviewrank]
48- Luggage: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
49+ Luggage & Bags: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
50 MP3Downloads: [albumrank, -albumrank, artistalbumrank, -artistalbumrank, price, -price, runtime, -runtime, -releasedate, relevancerank, reviewrank, salesrank, titlerank, -titlerank]
51 MobileApps: [relevancerank, pmrank, price, -price, reviewrank, reviewrank_authority]
52 Music: [releasedate, -releasedate, salesrank, pricerank, inverse-pricerank, price, -price, titlerank, -titlerank]
53@@ -157,7 +158,7 @@
54 KindleStore: [relevancerank, -edition-sales-velocity, price, -price, reviewrank, daterank, salesrank]
55 Kitchen: [relevancerank, salesrank, price, -price, reviewrank]
56 Lighting: [relevancerank, salesrank, price, -price, reviewrank]
57- Luggage: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
58+ Luggage & Bags: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
59 MP3Downloads: [price, -price, -releasedate, relevancerank, salesrank]
60 MobileApps: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
61 Music: [relevancerank, salesrank, price, -price, reviewrank, reviewrank, -releasedate]
62@@ -218,7 +219,7 @@
63 KindleStore: [relevancerank, -edition-sales-velocity, price, -price, reviewrank, daterank, salesrank]
64 Kitchen: [salesrank, reviewrank, price, -price, daterank, titlerank, -titlerank]
65 Lighting: [salesrank, relevancerank, price, -price, reviewrank]
66- Luggage: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
67+ Luggage & Bags: [relevancerank, salesrank, price, -price, reviewrank, reviewrank_authority]
68 MP3Downloads: [price, -price, -releasedate, relevancerank, reviewrank, salesrank]
69 Marketplace: [salesrank, price, -price, titlerank, -titlerank, -launch-date]
70 MobileApps: [relevancerank, pmrank, price, -price, reviewrank, reviewrank_authority]
71@@ -231,6 +232,7 @@
72 Shoes: [-launch-date, price, -price, relevancerank, reviewrank, salesrank]
73 Software: [salesrank, reviewrank, price, inverse-pricerank, daterank, titlerank, -titlerank]
74 SoftwareVideoGames: [salesrank, reviewrank, price, inverse-pricerank, daterank, titlerank, -titlerank]
75+ SportingGoods: [relevancerank, salesrank, pricerank, inverseprice, launch-date, sale-flag]
76 Toys: [salesrank, price, -price, -mfg-age-min, mfg-age-min]
77 VHS: [salesrank, reviewrank, price, -price, inverse-pricerank, daterank, releasedate, titlerank, -titlerank]
78 Video: [salesrank, reviewrank, price, -price, inverse-pricerank, daterank, releasedate, titlerank, -titlerank]
79@@ -257,7 +259,7 @@
80 Jewelry: [pmrank, salesrank, pricerank, inverseprice, launch-date]
81 KindleStore: [daterank, -edition-sales-velocity, price, -price, relevancerank, reviewrank]
82 Kitchen: [pmrank, salesrank, price, -price, titlerank, -titlerank]
83- LawnAndGarden: [relevancerank, reviewrank, salesrank, price, -price]
84+ LawnGarden: [relevancerank, reviewrank, salesrank, price, -price]
85 MP3Downloads: [price, -price, -releasedate, relevancerank, salesrank]
86 Magazines: [subslot-salesrank, reviewrank, price, -price, daterank, titlerank, -titlerank]
87 Marketplace: [salesrank, price, -price, titlerank, -titlerank, -launch-date]
88
89=== modified file 'src/scopes/tests/test_amazon.py'
90--- src/scopes/tests/test_amazon.py 2015-03-16 19:42:18 +0000
91+++ src/scopes/tests/test_amazon.py 2015-10-05 13:45:25 +0000
92@@ -1,6 +1,6 @@
93 # -*- coding: utf8 -*-
94
95-# Copyright 2014 Canonical
96+# Copyright 2014-2015 Canonical
97 # All Rights Reserved
98
99 """Tests for the Simple App base stuff."""
100@@ -212,11 +212,10 @@
101 def test_surfacing_with_sorting(self):
102 app = amazon.App(CONFIG)
103 fake_amazon = FakeAmazon("search.xml")
104- with nested(
105- patch.object(amazon, 'Amazon'),
106- patch.object(amazon, '_get_department_tree'),
107- patch.object(amazon, '_get_sorting_filters'),
108- ) as (mock_amz, mock_dtree, mock_srtf):
109+ with nested(patch.object(amazon, 'Amazon'),
110+ patch.object(amazon, '_get_department_tree'),
111+ patch.object(amazon, '_get_sorting_filters'),
112+ ) as (mock_amz, mock_dtree, mock_srtf):
113 mock_amz.return_value = fake_amazon
114 mock_dtree.return_value = 'fake department tree'
115 mock_srtf.return_value = ('new_sort_list', 'new_filter_state')
116@@ -405,6 +404,13 @@
117 self.assertIn(None, app.subtitle_attribs)
118 self.assertIn('x:Brand', app.subtitle_attribs[None])
119
120+ def test_all_roots_have_sorting(self):
121+ app = amazon.App(CONFIG)
122+ for shop, shop_data in app.departments_map.items():
123+ root_cats = set(x[0] for x in shop_data.values())
124+ missing = root_cats - set(app.sorting_info[shop])
125+ self.assertFalse(missing, "Missing in %r: %s" % (shop, missing))
126+
127
128 class HelpersTestCase(TestCase):
129 """Test some helping functions."""
130@@ -457,7 +463,7 @@
131 encf = urllib.quote(json.dumps(filters))
132 resp = amazon._get_department_tree('amz', root_dep, None, None,
133 'te_ST', filters)
134- self.assertEqual(resp, {
135+ self.assertEqual(resp, {
136 'canned_query': 'scope://com.canonical.scopes.amazon?'
137 'filters=' + encf,
138 'subdepartments': [{
139@@ -489,7 +495,7 @@
140 'amz', 'roots', 'dep_code', 'dep_id', 'te_ST', filters)
141
142 mock.assert_called_with('amz', 'dep_id')
143- self.assertEqual(resp, {
144+ self.assertEqual(resp, {
145 'canned_query': 'scope://com.canonical.scopes.amazon?'
146 'dep=dep_code:parentid&filters=' + encf,
147 'subdepartments': [{

Subscribers

People subscribed via source and target branches