Merge pull request #1 from janrain/topic/schemarecord-fixes

Topic/schemarecord fixes

Author: ebeesonjanrain

janrain_datalib/_version.py

@@ -1,2 +1,2 @@
 """Package version"""
-__version__ = '0.1.1'
+__version__ = '0.1.2'

janrain_datalib/schemarecord.py

@@ -51,7 +51,8 @@ def as_dict(self, attributes=None):
         kwargs = {
             'type_name': self.schema_name,
             'key_attribute': self.id_attribute,
-            'key_value': self.id_value,
+            # must be a "JSON" string
+            'key_value': '"{}"'.format(self.id_value),
         }
         if attributes is not None:
             kwargs['attributes'] = attributes
@@ -71,7 +72,8 @@ def validate_password(self, password, password_attribute='password'):
         kwargs = {
             'type_name': self.schema_name,
             'key_attribute': self.id_attribute,
-            'key_value': self.id_value,
+            # must be a "JSON" string
+            'key_value': '"{}"'.format(self.id_value),
             'password_attribute': password_attribute,
             'password_value': password,
             'attributes': [self.id_attribute],
@@ -98,6 +100,8 @@ def create(self, attributes):
             'attributes': attributes,
         }
         r = self.app.apicall('entity.create', **kwargs)
+        self._id_attribute = 'uuid'
+        self._id_value = r['uuid']
 
         return {
             'id': r['id'],
@@ -109,7 +113,8 @@ def delete(self):
         kwargs = {
             'type_name': self.schema_name,
             'key_attribute': self.id_attribute,
-            'key_value': self.id_value,
+            # must be a "JSON" string
+            'key_value': '"{}"'.format(self.id_value),
         }
         self.app.apicall('entity.delete', **kwargs)
 
@@ -125,7 +130,8 @@ def replace(self, attributes, attribute_path=None):
         kwargs = {
             'type_name': self.schema_name,
             'key_attribute': self.id_attribute,
-            'key_value': self.id_value,
+            # must be a "JSON" string
+            'key_value': '"{}"'.format(self.id_value),
             'attributes': attributes,
         }
         if attribute_path is not None:
@@ -142,7 +148,8 @@ def update(self, attributes, attribute_path=None):
         kwargs = {
             'type_name': self.schema_name,
             'key_attribute': self.id_attribute,
-            'key_value': self.id_value,
+            # must be a "JSON" string
+            'key_value': '"{}"'.format(self.id_value),
             'attributes': attributes,
         }
         if attribute_path is not None:

tests/test_schemarecord.py

@@ -27,7 +27,7 @@ def test_as_dict(self):
         self.assertEqual(record, self.mockapi.entities[0])
 
         calls = [
-            mock.call('entity', type_name=self.schema_name, key_attribute='uuid', key_value=self.uuid)
+            mock.call('entity', type_name=self.schema_name, key_attribute='uuid', key_value='"{}"'.format(self.uuid))
         ]
         self.assertEqual(calls, self.mockapi.call.mock_calls)
 
@@ -47,7 +47,7 @@ def test_delete(self):
         self.record.delete()
 
         calls = [
-            mock.call('entity.delete', type_name=self.schema_name, key_attribute='uuid', key_value=self.uuid)
+            mock.call('entity.delete', type_name=self.schema_name, key_attribute='uuid', key_value='"{}"'.format(self.uuid))
         ]
         self.assertEqual(calls, self.mockapi.call.mock_calls)
 
@@ -58,7 +58,7 @@ def test_replace(self):
         self.record.replace(attr)
 
         calls = [
-            mock.call('entity.replace', type_name=self.schema_name, key_attribute='uuid', key_value=self.uuid, attributes=attr)
+            mock.call('entity.replace', type_name=self.schema_name, key_attribute='uuid', key_value='"{}"'.format(self.uuid), attributes=attr)
         ]
         self.assertEqual(calls, self.mockapi.call.mock_calls)
 
@@ -69,7 +69,7 @@ def test_update(self):
         self.record.update(attr)
 
         calls = [
-            mock.call('entity.update', type_name=self.schema_name, key_attribute='uuid', key_value=self.uuid, attributes=attr)
+            mock.call('entity.update', type_name=self.schema_name, key_attribute='uuid', key_value='"{}"'.format(self.uuid), attributes=attr)
         ]
         self.assertEqual(calls, self.mockapi.call.mock_calls)