Merge pull request #9 from jstol/json-decimal-encode

Added in support for `Decimal` objects in SMTP API JSON messages

Author: thinkingserious

smtpapi/__init__.py

@@ -1,5 +1,12 @@
-import json
+import json, decimal
 
+class _CustomJSONEncoder(json.JSONEncoder):
+
+    def default(self, o):
+        if isinstance(o, decimal.Decimal):
+            return float(o)
+        # Provide a fallback to the default encoder if we haven't implemented special support for the object's class
+        return super(_CustomJSONEncoder, self).default(o)
 
 class SMTPAPIHeader(object):
 
@@ -88,4 +95,4 @@ def json_string(self):
         for key in self.data.keys():
             if self.data[key] != [] and self.data[key] != {}:
                 result[key] = self.data[key]
-        return json.dumps(result)
+        return json.dumps(result, cls=_CustomJSONEncoder)

test/__init__.py

@@ -1,14 +1,12 @@
-import unittest
-import json
+import unittest, json, decimal
 from smtpapi import SMTPAPIHeader
 
-
 class TestSMTPAPI(unittest.TestCase):
 
     def setUp(self):
         self.validHeader = json.loads('''{"to":["[email protected]",
         "[email protected]", "[email protected]"],
-        "sub":{"subKey":["subValue"]},
+        "sub":{"subKey":["subValue"],"decimalKey":[1.23456789]},
         "section":{"testSection":"sectionValue"},
         "category":["testCategory"],
         "unique_args":{"testUnique":"uniqueValue"},
@@ -19,7 +17,7 @@ def setUp(self):
         "filters":{"testFilter":{"settings":{"filter":"filterValue"}}}}''')
 
         self.dropsHeader = json.loads('''{
-        "sub":{"subKey":["subValue"]},
+        "sub":{"subKey":["subValue"],"decimalKey":[1.23456789]},
         "unique_args":{"testUnique":"uniqueValue"},
         "filters":{"testFilter":{"settings":{"filter":"filterValue"}}}}''')
 
@@ -28,6 +26,7 @@ def test_add(self):
         header.add_to('[email protected]')
         header.add_to(['[email protected]', '[email protected]'])
         header.add_substitution('subKey', 'subValue')
+        header.add_substitution('decimalKey', decimal.Decimal("1.23456789"))
         header.add_section('testSection', 'sectionValue')
         header.add_category('testCategory')
         header.add_unique_arg('testUnique', 'uniqueValue')
@@ -42,7 +41,10 @@ def test_add(self):
     def test_set(self):
         header = SMTPAPIHeader()
         header.set_tos(["[email protected]", "[email protected]", "[email protected]"])
-        header.set_substitutions(json.loads('{"subKey":["subValue"]}'))
+        header.set_substitutions({
+            "subKey": ["subValue"],
+            "decimalKey": [decimal.Decimal("1.23456789")]
+        })
         header.set_sections(json.loads('{"testSection":"sectionValue"}'))
         header.set_categories(["testCategory"])
         header.set_unique_args(json.loads('{"testUnique":"uniqueValue"}'))
@@ -56,7 +58,10 @@ def test_set(self):
     def test_drop_empty(self):
         header = SMTPAPIHeader()
         header.set_tos([])
-        header.set_substitutions(json.loads('{"subKey":["subValue"]}'))
+        header.set_substitutions({
+            "subKey": ["subValue"],
+            "decimalKey": [decimal.Decimal("1.23456789")]
+        })
         header.set_sections(json.loads('{}'))
         header.set_categories([])
         header.set_unique_args(json.loads('{"testUnique":"uniqueValue"}'))