update to include canada

Author: craigjmidwinter

pizzapi/address.py

@@ -1,13 +1,15 @@
 from .store import Store
 from .utils import request_json
-from .urls import FIND_URL
+from .urls import Urls, COUNTRY_USA
 
 class Address(object):
-    def __init__(self, street, city, region='', zip='', *args):
+    def __init__(self, street, city, region='', zip='', country=COUNTRY_USA, *args):
         self.street = street.strip()
         self.city = city.strip()
         self.region = region.strip()
-        self.zip = str(zip).strip()
+        self.zip = str(zip).strip(),
+        self.urls = Urls(country)
+        self.country = country
 
     @property
     def data(self):
@@ -23,8 +25,8 @@ def line2(self):
         return '{City}, {Region}, {PostalCode}'.format(**self.data)
 
     def nearby_stores(self, service='Delivery'):
-        data = request_json(FIND_URL, line1=self.line1, line2=self.line2, type=service)
-        return [Store(x) for x in data['Stores']
+        data = request_json(self.urls.find_url(), line1=self.line1, line2=self.line2, type=service)
+        return [Store(x, self.country) for x in data['Stores']
                 if x['IsOnlineNow'] and x['ServiceIsOpen'][service]]
 
     def closest_store(self, service='Delivery'):

pizzapi/menu.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from .urls import MENU_URL
+from .urls import Urls, COUNTRY_USA
 from .utils import request_json
 
 
@@ -28,10 +28,12 @@ def __init__(self, data={}):
 
 
 class Menu(object):
-    def __init__(self, data={}):
+    def __init__(self, data={}, country=COUNTRY_USA):
         self.variants = data.get('Variants', {})
         self.menu_by_code = {}
         self.root_categories = {}
+        self.country = COUNTRY_USA
+
         if self.variants:
             self.products = self.parse_items(data['Products'])
             self.coupons = self.parse_items(data['Coupons'])
@@ -40,8 +42,8 @@ def __init__(self, data={}):
                 self.root_categories[key] = self.build_categories(value)
 
     @classmethod
-    def from_store(cls, store_id, lang='en'):
-        response = request_json(MENU_URL, store_id=store_id, lang=lang)
+    def from_store(self, cls, store_id, lang='en', country=COUNTRY_USA):
+        response = request_json(Urls(country).menu_url(), store_id=store_id, lang=lang)
         menu = cls(response)
         return menu
 

pizzapi/order.py

@@ -1,16 +1,17 @@
 import requests
 
 from .menu import Menu
-from .urls import PRICE_URL, PLACE_URL, VALIDATE_URL
+from .urls import Urls, COUNTRY_USA 
 
 
 # TODO: Add add_coupon and remove_coupon methods
 class Order(object):
-    def __init__(self, store, customer, address):
+    def __init__(self, store, customer, address, country=COUNTRY_USA):
         self.store = store
-        self.menu = Menu.from_store(store_id=store.id)
+        self.menu = Menu.from_store(store_id=store.id, country=country)
         self.customer = customer
         self.address = address
+        self.urls = Urls(country)
         self.data = {
             'Address': {'Street': self.address.street,
                         'City': self.address.city,
@@ -81,22 +82,22 @@ def _send(self, url, merge):
                     self.data[key] = value
         return json_data
 
-    # TODO: Figure out if this validates anything that PRICE_URL does not
+    # TODO: Figure out if this validates anything that self.urls.price_url() does not
     def validate(self):
-        response = self._send(VALIDATE_URL, True)
+        response = self._send(self.urls.validate_url(), True)
         return response['Status'] != -1
 
     # TODO: Actually test this
     def place(self, card):
         self.pay_with(card)
-        response = self._send(PLACE_URL, False)
+        response = self._send(self.urls.place_url(), False)
         return response
 
     # TODO: Add self.price() and update whenever called and items were changed
     def pay_with(self, card):
         """Use this instead of self.place when testing"""
         # get the price to check that everything worked okay
-        response = self._send(PRICE_URL, True)
+        response = self._send(self.urls.price_url(), True)
 
         if response['Status'] == -1:
             raise Exception('get price failed: %r' % response)

pizzapi/store.py

@@ -1,18 +1,20 @@
 from .menu import Menu
-from .urls import INFO_URL, MENU_URL
+from .urls import Urls, COUNTRY_USA
 from .utils import request_json
 
 
 class Store(object):
-    def __init__(self, data={}):
+    def __init__(self, data={}, country=COUNTRY_USA):
         self.id = str(data.get('StoreID', -1))
+        self.country = country
+        self.urls = Urls(country)
         self.data = data
 
     def get_details(self):
-        details = request_json(INFO_URL, store_id=self.id)
+        details = request_json(self.urls.info_url(), store_id=self.id)
         return details
 
     def get_menu(self, lang='en'):
-        response = request_json(MENU_URL, store_id=self.id, lang=lang)
-        menu = Menu(response)
+        response = request_json(self.urls.menu_url(), store_id=self.id, lang=lang)
+        menu = Menu(response, self.country)
         return menu

pizzapi/track.py

@@ -1,13 +1,13 @@
-from .urls import TRACK_BY_PHONE, TRACK_BY_ORDER
+from .urls import Urls, COUNTRY_USA
 from .utils import request_xml, request_json
 
 
-def track_by_phone(phone):
+def track_by_phone(phone, country=COUNTRY_USA):
     phone = str(phone).strip()
-    data = request_xml(TRACK_BY_PHONE, phone=phone)['soap:Envelope']['soap:Body']
+    data = request_xml(Urls(country).track_by_phone(), phone=phone)['soap:Envelope']['soap:Body']
     response = data['GetTrackerDataResponse']['OrderStatuses']['OrderStatus']
     return response
 
 
-def track_by_order(store_id, order_key):
-    return request_json(TRACK_BY_ORDER, store_id=store_id, order_key=order_key)
+def track_by_order(store_id, order_key, country=COUNTRY_USA):
+    return request_json(Urls(country).track_by_order(), store_id=store_id, order_key=order_key)

pizzapi/urls.py

@@ -1,9 +1,61 @@
-FIND_URL = 'https://order.dominos.com/power/store-locator?s={line1}&c={line2}&type={type}'
-INFO_URL = 'https://order.dominos.com/power/store/{store_id}/profile'
-MENU_URL = 'https://order.dominos.com/power/store/{store_id}/menu?lang={lang}&structured=true'
-PLACE_URL = 'https://order.dominos.com/power/place-order'
-PRICE_URL = 'https://order.dominos.com/power/price-order'
-TRACK_BY_ORDER = 'https://trkweb.dominos.com/orderstorage/GetTrackerData?StoreID={store_id}&OrderKey={order_key}'
-TRACK_BY_PHONE = 'https://trkweb.dominos.com/orderstorage/GetTrackerData?Phone={phone}'
-VALIDATE_URL = 'https://order.dominos.com/power/validate-order'
-COUPON_URL = 'https://order.dominos.com/power/store/{store_id}/coupon/{couponid}?lang={lang}'
+COUNTRY_USA = 'us'
+COUNTRY_CANADA = 'ca'
+
+class Urls(object):
+    def __init__(self, country=COUNTRY_USA):
+
+        self.country = country
+        self.urls = {
+            COUNTRY_USA: {
+                'find_url' : 'https://order.dominos.com/power/store-locator?s={line1}&c={line2}&type={type}',
+                'info_url' : 'https://order.dominos.com/power/store/{store_id}/profile',
+                'menu_url' : 'https://order.dominos.com/power/store/{store_id}/menu?lang={lang}&structured=true',
+                'place_url' : 'https://order.dominos.com/power/place-order',
+                'price_url' : 'https://order.dominos.com/power/price-order',
+                'track_by_order' : 'https://trkweb.dominos.com/orderstorage/GetTrackerData?StoreID={store_id}&OrderKey={order_key}',
+                'track_by_phone' : 'https://trkweb.dominos.com/orderstorage/GetTrackerData?Phone={phone}',
+                'validate_url' : 'https://order.dominos.com/power/validate-order',
+                'coupon_url' : 'https://order.dominos.com/power/store/{store_id}/coupon/{couponid}?lang={lang}',
+            },
+            COUNTRY_CANADA: {
+                'find_url' : 'https://order.dominos.ca/power/store-locator?s={line1}&c={line2}&type={type}',
+                'info_url' : 'https://order.dominos.ca/power/store/{store_id}/profile',
+                'menu_url' : 'https://order.dominos.ca/power/store/{store_id}/menu?lang={lang}&structured=true',
+                'place_url' : 'https://order.dominos.ca/power/place-order',
+                'price_url' : 'https://order.dominos.ca/power/price-order',
+                'track_by_order' : 'https://trkweb.dominos.ca/orderstorage/GetTrackerData?StoreID={store_id}&OrderKey={order_key}',
+                'track_by_phone' : 'https://trkweb.dominos.ca/orderstorage/GetTrackerData?Phone={phone}',
+                'validate_url' : 'https://order.dominos.ca/power/validate-order',
+                'coupon_url' : 'https://order.dominos.ca/power/store/{store_id}/coupon/{couponid}?lang={lang}',
+            }
+        }
+    
+    def find_url(self):
+        return self.urls[self.country]['find_url']
+    
+    def info_url(self):
+        return self.urls[self.country]['info_url']
+
+    def menu_url(self):
+        return self.urls[self.country]['menu_url']
+
+    def place_url(self):
+        return self.urls[self.country]['place_url']
+
+    def price_url(self):
+        return self.urls[self.country]['price_url']
+
+    def track_by_order(self):
+        return self.urls[self.country]['track_by_order']
+
+    def track_by_phone(self):
+        return self.urls[self.country]['track_by_phone']
+    
+    def validate_url(self):
+        return self.urls[self.country]['validate_url']
+    
+    def coupon_url(self):
+        return self.urls[self.country]['coupon_url']
+    
+    
+

tests/test_address.py

@@ -6,7 +6,7 @@
 from pytest import mark
 
 from pizzapi.address import Address
-from pizzapi.urls import FIND_URL
+from pizzapi.urls import Urls, COUNTRY_USA
 
 
 fixture_path = os.path.join('tests', 'fixtures', 'stores.json')
@@ -25,7 +25,8 @@
 
 
 def mocked_request_json(url, **kwargs):
-    assert_that(url, equal_to(FIND_URL))
+
+    assert_that(url, equal_to(Urls(COUNTRY_USA).find_url()))
     assert_that(kwargs, has_entries(
         line1='700 Pennsylvania Avenue NW',
         line2='Washington, DC, 20408',

tests/test_menu.py

@@ -6,7 +6,7 @@
 from pytest import mark
 
 from pizzapi.menu import Menu
-from pizzapi.urls import MENU_URL
+from pizzapi.urls import Urls, COUNTRY_USA
 
 
 fixture_path = os.path.join('tests', 'fixtures', 'menu.json')
@@ -16,7 +16,8 @@
 
 
 def mocked_request_json(url, **kwargs):
-    assert_that(url, equal_to(MENU_URL))
+
+    assert_that(url, equal_to(Urls(COUNTRY_USA).menu_url()))
     assert_that(kwargs, has_items('store_id', 'lang'))
     return menu_fixture