Merge branch 'develop' of github.com:laterpay/laterpay-client-python into develop

Author: MarkusH

laterpay/__init__.py

@@ -66,7 +66,8 @@ class ItemDefinition(object):
     For Single item purchases: http://docs.laterpay.net/platform/dialogs/buy/
     """
 
-    def __init__(self, item_id, pricing, url, title, expiry=None, sub_id=None, period=None, item_type=None):
+    def __init__(self, item_id, pricing, url, title, expiry=None, sub_id=None,
+                 period=None, item_type=None, election_id=None):
         for price in pricing.split(','):
             if not _PRICING_RE.match(price):
                 raise InvalidItemDefinition('Pricing is not valid: %s' % pricing)
@@ -82,9 +83,16 @@ def __init__(self, item_id, pricing, url, title, expiry=None, sub_id=None, perio
             'expiry': expiry,
         }
 
-        if item_type in {constants.ITEM_TYPE_CONTRIBUTION, constants.ITEM_TYPE_DONATION}:
+        if item_type in {
+            constants.ITEM_TYPE_CONTRIBUTION,
+            constants.ITEM_TYPE_DONATION,
+            constants.ITEM_TYPE_POLITICAL_CONTRIBUTION,
+        }:
             self.data['campaign_id'] = item_id
             self.item_type = item_type
+
+            if item_type == constants.ITEM_TYPE_POLITICAL_CONTRIBUTION:
+                self.data['election_id'] = election_id
         else:
             self.data['article_id'] = item_id
             self.item_type = None
@@ -320,6 +328,8 @@ def get_buy_url(self, item_definition, *args, **kwargs):
             page_type = 'contribute/pay_now'
         elif item_type == constants.ITEM_TYPE_DONATION:
             page_type = 'donate/pay_now'
+        elif item_type == constants.ITEM_TYPE_POLITICAL_CONTRIBUTION:
+            page_type = 'political_contribution/pay_now'
         else:
             page_type = 'buy'
 
@@ -339,6 +349,8 @@ def get_add_url(self, item_definition, *args, **kwargs):
             page_type = 'contribute/pay_later'
         elif item_type == constants.ITEM_TYPE_DONATION:
             page_type = 'donate/pay_later'
+        elif item_type == constants.ITEM_TYPE_POLITICAL_CONTRIBUTION:
+            page_type = 'political_contribution/pay_later'
         else:
             page_type = 'add'
 

laterpay/constants.py

@@ -14,3 +14,4 @@
 
 ITEM_TYPE_CONTRIBUTION = 'contribution'
 ITEM_TYPE_DONATION = 'donation'
+ITEM_TYPE_POLITICAL_CONTRIBUTION = 'political'

tests/test_client.py

@@ -72,6 +72,19 @@ def test_sub_id(self):
             'url': 'http://example.com/t',
         })
 
+    def test_election_id_for_non_poltical_contribution(self):
+        it = ItemDefinition(
+            1, 'EUR20', 'http://example.com/t', 'title', item_type=constants.ITEM_TYPE_CONTRIBUTION,
+            election_id='123-election',
+        )
+        self.assertEqual(it.data, {
+            'campaign_id': 1,
+            'expiry': None,
+            'pricing': 'EUR20',
+            'title': 'title',
+            'url': 'http://example.com/t',
+        })
+
     def test_item_type_contribution(self):
         it = ItemDefinition(1, 'EUR20', 'http://example.com/t', 'title', item_type=constants.ITEM_TYPE_CONTRIBUTION)
         self.assertEqual(it.data, {
@@ -94,6 +107,21 @@ def test_item_type_donation(self):
         })
         self.assertEqual(it.item_type, 'donation')
 
+    def test_item_type_political_contribution(self):
+        it = ItemDefinition(
+            1, 'EUR20', 'http://example.com/t', 'title', item_type=constants.ITEM_TYPE_POLITICAL_CONTRIBUTION,
+            election_id='123-election',
+        )
+        self.assertEqual(it.data, {
+            'campaign_id': 1,
+            'expiry': None,
+            'pricing': 'EUR20',
+            'title': 'title',
+            'url': 'http://example.com/t',
+            'election_id': '123-election',
+        })
+        self.assertEqual(it.item_type, 'political')
+
     def test_item_type_unknown(self):
         it = ItemDefinition(1, 'EUR20', 'http://example.com/t', 'title', item_type='whatever')
         self.assertEqual(it.data, {
@@ -285,6 +313,19 @@ def test_get_add_url_donation(self):
         self.assertQueryString(url, 'url', 'http://example.net/t')
         self.assertQueryString(url, 'title', 'Save the World!')
 
+    def test_get_add_url_political_contribution(self):
+        item = ItemDefinition(
+            '2', 'EUR20', 'http://example.net/t', 'Vote for Sue!',
+            item_type=constants.ITEM_TYPE_POLITICAL_CONTRIBUTION, election_id='123-election',
+        )
+        url = self.lp.get_add_url(item, item_type='political')
+        self.assertTrue(url.startswith('https://web.laterpay.net/dialog/political_contribution/pay_later?'))
+        self.assertQueryString(url, 'campaign_id', '2')
+        self.assertQueryString(url, 'pricing', 'EUR20')
+        self.assertQueryString(url, 'url', 'http://example.net/t')
+        self.assertQueryString(url, 'title', 'Vote for Sue!')
+        self.assertQueryString(url, 'election_id', '123-election')
+
     def test_get_buy_url(self):
         item = ItemDefinition(1, 'EUR20', 'http://example.net/t', 'title')
         url = self.lp.get_buy_url(
@@ -336,6 +377,19 @@ def test_get_buy_url_donation(self):
         self.assertQueryString(url, 'url', 'http://example.net/t')
         self.assertQueryString(url, 'title', 'Save the World!')
 
+    def test_get_buy_url_political_contribution(self):
+        item = ItemDefinition(
+            'vote-for-sue', 'EUR20', 'http://example.net/t', 'Vote for Sue!',
+            item_type=constants.ITEM_TYPE_POLITICAL_CONTRIBUTION, election_id='123-election',
+        )
+        url = self.lp.get_buy_url(item)
+        self.assertTrue(url.startswith('https://web.laterpay.net/dialog/political_contribution/pay_now?'))
+        self.assertQueryString(url, 'campaign_id', 'vote-for-sue')
+        self.assertQueryString(url, 'pricing', 'EUR20')
+        self.assertQueryString(url, 'url', 'http://example.net/t')
+        self.assertQueryString(url, 'title', 'Vote for Sue!')
+        self.assertQueryString(url, 'election_id', '123-election')
+
     def test_get_subscribe_url(self):
         item = ItemDefinition(1, 'EUR20', 'http://example.net/t', 'title', sub_id='a0_-9Z', period=12345)
         url = self.lp.get_subscribe_url(