Moving Resource to it's own module.

jkeyes · jkeyes · commit d544ac2aace2 · 2014-07-23T23:49:09.000+01:00
diff --git a/intercom/traits/api_resource.py b/intercom/traits/api_resource.py
@@ -0,0 +1,85 @@
+import datetime
+import time
+
+from intercom.lib.flat_store import FlatStore
+from intercom.lib.typed_json_deserializer import JsonDeserializer
+
+
+def type_field(attribute):
+    return attribute == "type"
+
+
+def timestamp_field(attribute):
+    return attribute.endswith('_at')
+
+
+def custom_attribute_field(attribute):
+    return attribute == 'custom_attributes'
+
+
+def typed_value(value):
+    return hasattr(value, 'keys') and 'type' in value
+
+
+def datetime_value(value):
+    return hasattr(value, "timetuple")
+
+
+def to_datetime_value(value):
+    if value:
+        return datetime.datetime.fromtimestamp(int(value))
+
+
+class Resource(object):
+
+    def __init__(self, **params):
+        self.from_dict(params)
+
+        if hasattr(self, 'flat_store_attributes'):
+            for attr in self.flat_store_attributes:
+                if not hasattr(self, attr):
+                    setattr(self, attr, FlatStore())
+
+    def _flat_store_attribute(self, attribute):
+        if hasattr(self, 'flat_store_attributes'):
+            return attribute in self.flat_store_attributes
+        return False
+
+
+    @classmethod
+    def from_api(cls, response):
+        obj = cls()
+        obj.from_response(response)
+        return obj
+
+    def from_response(self, response):
+        self.from_dict(response)
+
+    def from_dict(self, dict):
+        for attribute, value in dict.items():
+            if type_field(attribute):
+                continue
+            setattr(self, attribute, value)
+
+    @property
+    def attributes(self):
+        return self.__dict__
+
+    def __getattribute__(self, attribute):
+        value = super(Resource, self).__getattribute__(attribute)
+        if timestamp_field(attribute):
+            return to_datetime_value(value)
+        else:
+            return value
+
+    def __setattr__(self, attribute, value):
+        if typed_value(value) and not custom_attribute_field(attribute):
+            value_to_set = JsonDeserializer(value).deserialize()
+        elif self._flat_store_attribute(attribute):
+            value_to_set = FlatStore(value)
+        elif timestamp_field(attribute) and datetime_value(value):
+            value_to_set = time.mktime(value.timetuple())
+        else:
+            value_to_set = value
+        super(Resource, self).__setattr__(attribute, value_to_set)
+
diff --git a/intercom/user.py b/intercom/user.py
@@ -5,98 +5,16 @@
 # License: http://jkeyes.mit-license.org/
 #
 
-import datetime
-import time
 from intercom.api_operations.all import All
 from intercom.api_operations.count import Count
 from intercom.api_operations.delete import Delete
 from intercom.api_operations.find import Find
 from intercom.api_operations.find_all import FindAll
 from intercom.api_operations.save import Save
-from intercom.lib.flat_store import FlatStore
-from intercom.lib.typed_json_deserializer import JsonDeserializer
+from intercom.traits.api_resource import Resource
 from intercom.traits.incrementable_attributes import IncrementableAttributes
 
 
-def timestamp_field(attribute):
-    return attribute.endswith('_at')
-
-
-def type_field(attribute):
-    return attribute == "type"
-
-
-def custom_attribute_field(attribute):
-    return attribute == 'custom_attributes'
-
-
-def typed_value(value):
-    return hasattr(value, 'keys') and 'type' in value
-
-
-def datetime_value(value):
-    return hasattr(value, "timetuple")
-
-
-def to_datetime_value(value):
-    if value:
-        return datetime.datetime.fromtimestamp(int(value))
-
-
-class Resource(object):
-
-    def __init__(self, **params):
-        self.from_dict(params)
-
-        if hasattr(self, 'flat_store_attributes'):
-            for attr in self.flat_store_attributes:
-                if not hasattr(self, attr):
-                    setattr(self, attr, FlatStore())
-
-    def _flat_store_attribute(self, attribute):
-        if hasattr(self, 'flat_store_attributes'):
-            return attribute in self.flat_store_attributes
-        return False
-
-
-    @classmethod
-    def from_api(cls, response):
-        obj = cls()
-        obj.from_response(response)
-        return obj
-
-    def from_response(self, response):
-        self.from_dict(response)
-
-    def from_dict(self, dict):
-        for attribute, value in dict.items():
-            if type_field(attribute):
-                continue
-            setattr(self, attribute, value)
-
-    @property
-    def attributes(self):
-        return self.__dict__
-
-    def __getattribute__(self, attribute):
-        value = super(Resource, self).__getattribute__(attribute)
-        if timestamp_field(attribute):
-            return to_datetime_value(value)
-        else:
-            return value
-
-    def __setattr__(self, attribute, value):
-        if typed_value(value) and not custom_attribute_field(attribute):
-            value_to_set = JsonDeserializer(value).deserialize()
-        elif self._flat_store_attribute(attribute):
-            value_to_set = FlatStore(value)
-        elif timestamp_field(attribute) and datetime_value(value):
-            value_to_set = time.mktime(value.timetuple())
-        else:
-            value_to_set = value
-        super(Resource, self).__setattr__(attribute, value_to_set)
-
-
 CLASS_REGISTRY = {}
 
 def create_class_instance(class_name):
