Simpler format for creation

Author: pgleeson

examples/document.py

@@ -10,42 +10,23 @@ class Document(BaseWithId):
 
     def __init__(self, **kwargs):
 
-        self.allowed_children = collections.OrderedDict(
-            [
-                ("sections", ("The Sections", Section)),
-            ]
-        )
-
-        #self.add_allowed_child("sections", "The sections of the document", Section)
-
-
-        self.allowed_fields = collections.OrderedDict(
-            [
-                ("title", ("Document title", str)),
-                (
-                    "ISBN",
-                    (
-                        "International Standard Book Number",
-                        int,
-                    ),
-                ),
-            ]
-        )
+        self.add_allowed_child("sections", "The sections of the document", Section)
+
+        self.add_allowed_field("title", "Document title", str)
+        self.add_allowed_field("ISBN", "International Standard Book Number", int)
 
         super(Document, self).__init__(**kwargs)
 
+        print('Created:: %s'%(self))
+
 
 class Section(BaseWithId):
 
     _definition = "A model of a section of the document"
 
     def __init__(self, **kwargs):
 
-        self.allowed_children = collections.OrderedDict(
-            [
-                ("paragraphs", ("The paragraphs", Paragraph)),
-            ]
-        )
+        self.add_allowed_child("paragraphs", "The paragraphs", Paragraph)
 
         super(Section, self).__init__(**kwargs)
 
@@ -56,14 +37,11 @@ class Paragraph(Base):
 
     def __init__(self, **kwargs):
 
-        self.allowed_fields = collections.OrderedDict(
-            [
-                ("contents", ("Paragraph contents", str)),
-            ]
-        )
+        self.add_allowed_field("contents", "Paragraph contents", str)
 
         super(Paragraph, self).__init__(**kwargs)
 
+
 doc = Document(id="MyBook")
 doc.title = "My life in Python"
 

modelspec/BaseTypes.py

@@ -69,13 +69,29 @@ def get_id(self):
     def get_type(self):
         return self.__class__.__name__
 
+
+    def add_allowed_child(self, name, description, type_):
+
+        if self.allowed_children is None:
+            self.allowed_children = collections.OrderedDict([])
+
+        self.allowed_children[name] = (description, type_)
+
+
+    def add_allowed_field(self, name, description, type_):
+        if self.allowed_fields is None:
+            self.allowed_fields = collections.OrderedDict([])
+
+        self.allowed_fields[name] = (description, type_)
+
     def __getattr__(self, name):
 
-        # if verbose: print_v(" > Checking the value of attribute %s in: %s..."%(name,self.get_id()))
 
         if name == "id" and not "id" in self.allowed_fields:
             return None
 
+        if verbose: print_v(" > Checking the value of attribute %s in: %s..."%(name,'?'))
+
         if name in self.__dict__:
             return self.__dict__[name]
 
@@ -87,6 +103,12 @@ def __getattr__(self, name):
             self.__dict__["allowed_children"] = collections.OrderedDict()
             return self.__dict__["allowed_children"]
 
+        if name == "add_allowed_child":
+            return self.add_allowed_child
+
+        if name == "add_allowed_field":
+            return self.add_allowed_field
+
         if name in self.allowed_fields:
             if not name in self.fields:
                 return None
@@ -101,6 +123,7 @@ def __getattr__(self, name):
 
         return None
 
+
     @classmethod
     def _is_evaluable_expression(cls, value):
         if not hasattr(value, "__name__"):
@@ -486,6 +509,7 @@ def __init__(self, **kwargs):
 
         super(BaseWithId, self).__init__(**kwargs)
 
+
     def get_id(self):
         if len(self.fields) == 0:
             return "???"