Merge pull request #2 from maxmind/greg/gift-inputs

Add new gift inputs

Author: mateu

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+0.2.0 (2015-XX-XX)
+------------------
+
+* Added `is_gift` and `has_gift_message` to `order` input dictionary
+  validation.
+
 0.1.0 (2015-06-29)
 ++++++++++++++++++
 

minfraud/validation.py

@@ -230,6 +230,8 @@ def _uri(s):
         'amount': _price,
         'currency': _currency_code,
         'discount_code': _unicode_or_printable_ascii,
+        'has_gift_message': bool,
+        'is_gift': bool,
         'referrer_uri': _uri,
         'subaffiliate_id': _unicode_or_printable_ascii,
     },

tests/data/full-request.json

@@ -60,6 +60,8 @@
     "discount_code": "FIRST",
     "affiliate_id": "af12",
     "subaffiliate_id": "saf42",
+    "is_gift": true,
+    "has_gift_message": false,
     "referrer_uri": "http://www.amazon.com/"
   },
   "shopping_cart": [

tests/test_validation.py

@@ -46,6 +46,12 @@ def check_positive_number(self, f):
         for bad in ('1.2', '1', -1, -1.1, 0):
             self.check_invalid_transaction(f(bad))
 
+    def check_bool(self, object, key):
+        for good in (True, False):
+            self.check_transaction({object: {key: good}})
+        for bad in ('', 0, 'True'):
+            self.check_invalid_transaction({object: {key: bad}})
+
 
 class TestAccount(unittest.TestCase, ValidationBase):
     def test_account_user_id(self):
@@ -160,7 +166,7 @@ def test_missing_device(self):
     def test_user_agent(self):
         self.check_str_type('device', 'user_agent')
 
-    def test_user_agent(self):
+    def test_accept_language(self):
         self.check_str_type('device', 'accept_language')
 
 
@@ -219,6 +225,12 @@ def test_affiliate_id(self):
     def test_subaffiliate_id(self):
         self.check_str_type('order', 'subaffiliate_id')
 
+    def test_is_gift(self):
+        self.check_bool('order', 'is_gift')
+
+    def test_has_gift_message(self):
+        self.check_bool('order', 'has_gift_message')
+
     def test_referrer_uri(self):
         for good in ('http://www.mm.com/fadsf', 'https://x.org/'):
             self.check_transaction({'order': {'referrer_uri': good}})
@@ -234,11 +246,7 @@ def test_processor(self):
             self.check_invalid_transaction({'payment': {'processor': bad}})
 
     def test_was_authorized(self):
-        for good in (True, False):
-            self.check_transaction({'payment': {'was_authorized': good}})
-        for bad in ('', 0, 'True'):
-            self.check_invalid_transaction(
-                {'payment': {'was_authorized': bad}})
+        self.check_bool('payment', 'was_authorized')
 
     def test_decline_code(self):
         self.check_str_type('payment', 'decline_code')
@@ -251,9 +259,6 @@ def test_category(self):
     def test_item_id(self):
         self.check_transaction({'shopping_cart': [{'item_id': 'cat'}]})
 
-    def test_item_id(self):
-        self.check_transaction({'shopping_cart': [{'item_id': 'cat'}]})
-
     def test_amount(self):
         self.check_positive_number(lambda v: {'shopping_cart': [{'price': v}]})
 

tests/test_webservice.py

@@ -99,13 +99,11 @@ def test_400_with_no_body(self):
 
     def test_400_with_unexpected_content_type(self):
         with self.assertRaisesRegex(
-            HTTPError,
-            "Received a 400 error but it did not include the expected JSON"
-            " body: b?'?plain'?"):
+            HTTPError, "Received a 400 with the following body: b?'?plain'?"):
             self.create_error(headers={'Content-Type': 'text/plain'},
                               text='plain')
 
-    def test_400_with_unexpected_content_type(self):
+    def test_400_without_json_body(self):
         with self.assertRaisesRegex(
             HTTPError,
             "Received a 400 error but it did not include the expected JSON"
@@ -147,9 +145,10 @@ def create_error(self, mock, status_code=400, text='', headers=None):
     def create_success(self, mock, text=None, headers=None, client=None):
         if headers is None:
             headers = {
-                'Content-Type': 'application/vnd.maxmind.com-minfraud-{0}+json;'
-                                ' charset=UTF-8; version=2.0'.format(
-                                    self.type)
+                'Content-Type':
+                'application/vnd.maxmind.com-minfraud-{0}+json;'
+                ' charset=UTF-8; version=2.0'.format(
+                    self.type)
             }
         if text is None:
             text = self.response