Abstract away SWF *Type models logic into a GenericType class

moto/swf/models.py

@@ -68,7 +68,7 @@ class Domain(object):
         return _all
 
 
-class ActivityType(object):
+class GenericType(object):
     def __init__(self, name, version, **kwargs):
         self.name = name
         self.version = version
@@ -78,17 +78,13 @@ class ActivityType(object):
         for key, value in kwargs.iteritems():
             self.__setattr__(key, value)
 
-    def __repr__(self):
+    @property
-        return "ActivityType(name: %(name)s, version: %(version)s)" % self.__dict__
+    def kind(self):
+        raise NotImplementedError()
 
     @property
     def _configuration_keys(self):
-        return [
+        raise NotImplementedError()
-            "defaultTaskHeartbeatTimeout",
-            "defaultTaskScheduleToCloseTimeout",
-            "defaultTaskScheduleToStartTimeout",
-            "defaultTaskStartToCloseTimeout",
-        ]
 
     def to_short_dict(self):
         return {
@@ -98,7 +94,7 @@ class ActivityType(object):
 
     def to_medium_dict(self):
         hsh = {
-            "activityType": self.to_short_dict(),
+            "{}Type".format(self.kind): self.to_short_dict(),
             "creationDate": 1420066800,
             "status": self.status,
         }
@@ -124,15 +120,25 @@ class ActivityType(object):
             hsh["configuration"][key] = getattr(self, attr)
         return hsh
 
+class ActivityType(GenericType):
+    def __repr__(self):
+        return "ActivityType(name: %(name)s, version: %(version)s)" % self.__dict__
 
-class WorkflowType(object):
+    @property
-    def __init__(self, name, version, **kwargs):
+    def _configuration_keys(self):
-        self.name = name
+        return [
-        self.version = version
+            "defaultTaskHeartbeatTimeout",
-        self.status = "REGISTERED"
+            "defaultTaskScheduleToCloseTimeout",
-        for key, value in kwargs.iteritems():
+            "defaultTaskScheduleToStartTimeout",
-            self.__setattr__(key, value)
+            "defaultTaskStartToCloseTimeout",
+        ]
 
+    @property
+    def kind(self):
+        return "activity"
+
+
+class WorkflowType(GenericType):
     def __repr__(self):
         return "WorkflowType(name: %(name)s, version: %(version)s)" % self.__dict__
 
@@ -144,39 +150,9 @@ class WorkflowType(object):
             "defaultTaskStartToCloseTimeout",
         ]
 
-    def to_short_dict(self):
+    @property
-        return {
+    def kind(self):
-            "name": self.name,
+        return "workflow"
-            "version": self.version,
-        }
-
-    def to_medium_dict(self):
-        hsh = {
-            "workflowType": self.to_short_dict(),
-            "creationDate": 1420066800,
-            "status": self.status,
-        }
-        if self.status == "DEPRECATED":
-            hsh["deprecationDate"] = 1422745200
-        if hasattr(self, "description"):
-            hsh["description"] = self.description
-        return hsh
-
-    def to_full_dict(self):
-        hsh = {
-            "typeInfo": self.to_medium_dict(),
-            "configuration": {}
-        }
-        if hasattr(self, "task_list"):
-            hsh["configuration"]["defaultTaskList"] = {"name": self.task_list}
-        for key in self._configuration_keys:
-            attr = camelcase_to_underscores(key)
-            if not hasattr(self, attr):
-                continue
-            if getattr(self, attr) is None:
-                continue
-            hsh["configuration"][key] = getattr(self, attr)
-        return hsh
 
 
 class SWFBackend(BaseBackend):

tests/test_swf/test_activity_types.py

@@ -12,37 +12,6 @@ from moto.swf.exceptions import (
 )
 
 
-# Models
-def test_short_dict_representation():
-    _type = ActivityType("test-activity", "v1.0")
-    _type.to_short_dict().should.equal({"name": "test-activity", "version": "v1.0"})
-
-def test_medium_dict_representation():
-    _type = ActivityType("test-activity", "v1.0")
-    _type.to_medium_dict()["activityType"].should.equal(_type.to_short_dict())
-    _type.to_medium_dict()["status"].should.equal("REGISTERED")
-    _type.to_medium_dict().should.contain("creationDate")
-    _type.to_medium_dict().should_not.contain("deprecationDate")
-    _type.to_medium_dict().should_not.contain("description")
-
-    _type.description = "foo bar"
-    _type.to_medium_dict()["description"].should.equal("foo bar")
-
-    _type.status = "DEPRECATED"
-    _type.to_medium_dict().should.contain("deprecationDate")
-
-def test_full_dict_representation():
-    _type = ActivityType("test-activity", "v1.0")
-    _type.to_full_dict()["typeInfo"].should.equal(_type.to_medium_dict())
-    _type.to_full_dict()["configuration"].should.equal({})
-
-    _type.task_list = "foo"
-    _type.to_full_dict()["configuration"]["defaultTaskList"].should.equal({"name":"foo"})
-
-    _type.default_task_heartbeat_timeout = "60"
-    _type.to_full_dict()["configuration"]["defaultTaskHeartbeatTimeout"].should.equal("60")
-
-
 # RegisterActivityType endpoint
 @mock_swf
 def test_register_activity_type():

tests/test_swf/test_models.py

@@ -0,0 +1,46 @@
+from sure import expect
+
+from moto.swf.models import GenericType
+
+
+class FooType(GenericType):
+    @property
+    def kind(self):
+        return "foo"
+
+    @property
+    def _configuration_keys(self):
+        return ["justAnExampleTimeout"]
+
+
+def test_short_dict_representation():
+    _type = FooType("test-foo", "v1.0")
+    _type.to_short_dict().should.equal({"name": "test-foo", "version": "v1.0"})
+
+def test_medium_dict_representation():
+    _type = FooType("test-foo", "v1.0")
+    _type.to_medium_dict()["fooType"].should.equal(_type.to_short_dict())
+    _type.to_medium_dict()["status"].should.equal("REGISTERED")
+    _type.to_medium_dict().should.contain("creationDate")
+    _type.to_medium_dict().should_not.contain("deprecationDate")
+    _type.to_medium_dict().should_not.contain("description")
+
+    _type.description = "foo bar"
+    _type.to_medium_dict()["description"].should.equal("foo bar")
+
+    _type.status = "DEPRECATED"
+    _type.to_medium_dict().should.contain("deprecationDate")
+
+def test_full_dict_representation():
+    _type = FooType("test-foo", "v1.0")
+    _type.to_full_dict()["typeInfo"].should.equal(_type.to_medium_dict())
+    _type.to_full_dict()["configuration"].should.equal({})
+
+    _type.task_list = "foo"
+    _type.to_full_dict()["configuration"]["defaultTaskList"].should.equal({"name":"foo"})
+
+    _type.just_an_example_timeout = "60"
+    _type.to_full_dict()["configuration"]["justAnExampleTimeout"].should.equal("60")
+
+    _type.non_whitelisted_property = "34"
+    _type.to_full_dict()["configuration"].keys().should.equal(["defaultTaskList", "justAnExampleTimeout"])