Add support for class name defined by parameters

Author: rande

ioc/component.py

@@ -31,17 +31,7 @@ class WeakReference(Reference):
 
 class Definition(object):
     def __init__(self, clazz=None, arguments=None, kwargs=None):
-        self.module = None
-        self.function = None
-
-        if clazz:
-            if isinstance(clazz, list):
-                self.module = clazz[0]
-                self.function = clazz[1]
-            else:
-                self.module = ".".join(clazz.split(".")[0:-1])
-                self.function = clazz.split(".")[-1]
-
+        self.clazz = clazz
         self.arguments = {} if arguments is None else arguments 
         self.kwargs = {} if kwargs is None else kwargs 
         self.method_calls = []
@@ -188,13 +178,23 @@ def build_container(self, container):
         # @todo: start a threaded pool
 
     def get_class(self, definition):
-        m = importlib.import_module(definition.module)
 
-        f = definition.function.split(".")
-        clazz = getattr(m, f[0])
+        clazz = self.parameter_resolver.resolve(definition.clazz, self.parameters)
+
+        if isinstance(clazz, list):
+            module = clazz[0]
+            function = clazz[1]
+        else:
+            module = ".".join(clazz.split(".")[0:-1])
+            function = clazz.split(".")[-1]
+
+        module = importlib.import_module(module)
+
+        function = function.split(".")
+        clazz = getattr(module, function[0])
 
-        if len(f) == 2:
-            return getattr(clazz, f[1])
+        if len(function) == 2:
+            return getattr(clazz, function[1])
 
         return clazz
 
@@ -228,7 +228,7 @@ def get_instance(self, klass, definition, container):
     def get_service(self, id, definition, container):
 
         if self.logger:
-            self.logger.debug("Get service: id=%s, module=%s, function=%s" % (id, definition.module, definition.function))
+            self.logger.debug("Get service: id=%s, class=%s" % (id, definition.clazz))
 
         if container.has(id):
             return container.get(id)

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="ioc",
-    version="0.0.4",
+    version="0.0.5",
     description="A small dependency injection container based on Symfony2 Dependency Component",
     author="Thomas Rabaix",
     author_email="[email protected]",

tests/fixtures/services.yml

@@ -1,6 +1,7 @@
 parameters:
     foo.bar: argument 1
     foo.foo: "the %foo.bar%"
+    foo.class: "tests.ioc.service.Foo"
 
 services:
     fake:
@@ -14,7 +15,7 @@ services:
              - [ set_ok, [ true ], {arg2: "arg"} ]
 
     foo:
-        class: tests.ioc.service.Foo
+        class: '%foo.class%'
         arguments: ["@fake", "#@weak_reference"]
         kargs: {}
 

tests/ioc/component.py

@@ -7,8 +7,7 @@
 class TestDefinition(unittest.TestCase):
     def test_init(self):
         definition = ioc.component.Definition()
-        self.assertIsNone(definition.module)
-        self.assertIsNone(definition.function)
+        self.assertIsNone(definition.clazz)
         self.assertEquals(0, len(definition.arguments))
 
 class TestParameterHolder(unittest.TestCase):