fix bug where we are trying to parse the meta field for uris

Author: Marshall Jones

balanced/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.11.3'
+__version__ = '0.11.4'
 from collections import defaultdict
 import contextlib
 

balanced/resources.py

@@ -385,6 +385,10 @@ def make_constructors():
 
     """
 
+    # these keys have key/value data but it should not be expanded into a
+    # resource.
+    NON_EXPANDABLE_KEYS = ['meta']
+
     def the_new(cls, **kwargs):
         for key in kwargs.iterkeys():
 
@@ -405,7 +409,7 @@ def the_init(self, **kwargs):
 
         # iterate through the schema that comes back
         for key, value in kwargs.iteritems():
-            if is_subresource(value):
+            if key not in NON_EXPANDABLE_KEYS and is_subresource(value):
                 # sub resources have a uri in them
                 uri = value['uri']
                 try:

balanced/utils.py

@@ -15,7 +15,8 @@
 
 
 _JSON_ERROR_MSG = (
-    'Object of type {0} with value of {1} is not JSON serializable')
+    'Object of type {0} with value of {1} is not JSON serializable'
+)
 
 
 def iter_multi_items(mapping):

tests/test_client.py

@@ -139,7 +139,7 @@ def test_wrap_raise_for_status(self):
 
 
 class TestConfigThread(threading.Thread):
-    def __init__( self ):
+    def __init__(self):
         threading.Thread.__init__(self)
         self.key = False
 

tests/test_resource.py

@@ -41,7 +41,17 @@ def test_redirects(self):
             self.assertEqual(
                 exception.response.headers['location'],
                 '/v1/your-mom'
-                )
+            )
+
+    def test_does_not_parse_meta(self):
+        payload = {
+            'uri': '/v1/yo-momma',
+            'meta': {
+                'uri': 'None',
+            }
+        }
+
+        balanced.Account(**payload)
 
 
 class TestPage(unittest.TestCase):
@@ -67,20 +77,22 @@ def test_filter2(self):
 
         self.assertDictEqual(
             dict(parsed_qs),
-            {'a': 'b',
-             'a[!=]': '101',
-             'b[<=]': '5',
-             'b[<]': '4',
-             'c[>=]': '44',
-             'c[>]': '123',
-             'd[!in]': '6,33,55',
-             'd[in]': '1,2,3',
-             'e[!contains]': 'soda',
-             'e[contains]': 'it',
-             'f[endswith]': 'lo',
-             'f[startswith]': 'la',
-             'g': '12',
-         })
+            {
+                'a': 'b',
+                'a[!=]': '101',
+                'b[<=]': '5',
+                'b[<]': '4',
+                'c[>=]': '44',
+                'c[>]': '123',
+                'd[!in]': '6,33,55',
+                'd[in]': '1,2,3',
+                'e[!contains]': 'soda',
+                'e[contains]': 'it',
+                'f[endswith]': 'lo',
+                'f[startswith]': 'la',
+                'g': '12',
+            }
+        )
 
     def test_sort(self):
         q = balanced.Marketplace.query