Merge pull request #2 from bpedman/master

gregturn · gregturn · commit a491646b2dac · 2011-12-20T08:51:42.000-08:00
Allow spring python YamlConfig to use values as defined in config file rather than forcing coersion to str.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@ target/
 .DS_Store
 .coverage
 pip-log.txt
+temp/
+*.zip
+
diff --git a/src/springpython/config/_yaml_config.py b/src/springpython/config/_yaml_config.py
@@ -17,6 +17,7 @@
 import types
 import inspect
 import logging
+import collections
 
 from _config_base import *
 from springpython.context import scope
@@ -65,23 +66,12 @@ def read_object_defs(self):
             # A dictionary of abstract objects, keyed by their IDs, used in
             # traversing the hierarchies of parents; built upfront here for
             # convenience.
-            abstract_objects = {}
+            self.abstract_objects = {}
             for object in doc["objects"]:
                 if "abstract" in object:
-                    abstract_objects[object["object"]] = object
+                    self.abstract_objects[object["object"]] = object
 
             for object in doc["objects"]:
-                if not "class" in object and not "parent" in object:
-                    self._map_custom_class(object, yaml_mappings)
-
-                elif "parent" in object:
-                    # Children are added to self.objects during the children->abstract parents traversal.
-                    pos_constr = self._get_pos_constr(object)
-                    named_constr = self._get_named_constr(object)
-                    props = self._get_props(object)
-                    self._traverse_parents(object, object, pos_constr, named_constr, props, abstract_objects)
-                    continue
-
                 self._print_obj(object)
                 self.objects.append(self._convert_object(object))
 
@@ -104,10 +94,10 @@ def _map_custom_class(self, obj, mappings):
         else:
             self.logger.warning("No matching type found for object %s" % obj)
 
-    def _traverse_parents(self, leaf, child, pos_constr,
-                            named_constr, props, abstract_objects):
+    def _convert_child_object(self, leaf, child, pos_constr,
+                              named_constr, props):
 
-        parent = abstract_objects[child["parent"]]
+        parent = self.abstract_objects[child["parent"]]
 
         # At this point we only build up the lists of parameters but we don't create
         # the object yet because the current parent object may still have its
@@ -147,20 +137,19 @@ def _traverse_parents(self, leaf, child, pos_constr,
                 props.append(parent_prop)
 
         if "parent" in parent:
-            self._traverse_parents(leaf, parent, pos_constr, named_constr, props, abstract_objects)
+            # Continue traversing up the parent objects
+            return self._convert_child_object(leaf, parent, pos_constr, named_constr, props)
         else:
             # Now we know we can create an object out of all the accumulated values.
-
+            
             # The object's class is its topmost parent's class.
             class_ = parent["class"]
             id, factory, lazy_init, abstract, parent, scope_ = self._get_basic_object_data(leaf, class_)
 
             c = self._create_object(id, factory, lazy_init, abstract, parent,
                            scope_, pos_constr, named_constr, props)
 
-            self.objects.append(c)
-
-        return parent
+            return c
 
     def _get_pos_constr(self, object):
         """ Returns a list of all positional constructor arguments of an object.
@@ -224,20 +213,25 @@ def _convert_object(self, object, prefix=""):
                 object["object"] = prefix + "." + object["object"]
             else:
                 object["object"] = prefix + ".<anonymous>"
-
-        id, factory, lazy_init, abstract, parent, scope_ = self._get_basic_object_data(object, object.get("class"))
-
+        
+        if not "class" in object and "parent" not in object:
+            self._map_custom_class(object, yaml_mappings)
+        
         pos_constr = self._get_pos_constr(object)
         named_constr = self._get_named_constr(object)
         props = self._get_props(object)
+        
+        if "parent" in object:
+            return self._convert_child_object(object, object, pos_constr, named_constr, props)
+        else:
+            id, factory, lazy_init, abstract, parent, scope_ = self._get_basic_object_data(object, object.get("class"))
 
-        return self._create_object(id, factory, lazy_init, abstract, parent,
-            scope_, pos_constr, named_constr, props)
+            return self._create_object(id, factory, lazy_init, abstract, parent,
+                                       scope_, pos_constr, named_constr, props)
 
     def _print_obj(self, obj, level=0):
         self.logger.debug("%sobject = %s" % ("\t"*level, obj["object"]))
-        self.logger.debug("%sobject id = %s" % ("\t"*level, obj["object"]))
-        self.logger.debug("%sclass = %s" % ("\t"*(level+1), obj["class"]))
+        self.logger.debug("%sclass = %s" % ("\t"*(level+1), obj.get("class")))
 
         if "scope" in obj:
             self.logger.debug("%sscope = %s" % ("\t"*(level+1), obj["scope"]))
@@ -247,7 +241,7 @@ def _print_obj(self, obj, level=0):
         if "properties" in obj:
             self.logger.debug("%sproperties:" % ("\t"*(level+1)))
             for prop in obj["properties"].keys():
-                if "object" in obj["properties"][prop]:
+                if isinstance(obj["properties"][prop], collections.Iterable) and "object" in obj["properties"][prop]:
                     self.logger.debug("%s%s = ..." % ("\t"*(level+2), prop))
                     self._print_obj(obj["properties"][prop], level+3)
                 else:
@@ -398,10 +392,8 @@ def _convert_prop_def(self, comp, p, name):
                 return self._convert_dict(p, comp["object"], name)
         elif isinstance(p, list):
             return self._convert_list(p, comp["object"], name)
-        elif isinstance(p, unicode):
-            return ValueDef(name, unicode(p))
         else:
-            return ValueDef(name, str(p))
+            return ValueDef(name, p)
         return None
 
         if hasattr(p, "ref"):
