micon 0.1.23 → 0.1.24

data/lib/micon/core.rb

@@ -277,23 +277,34 @@ class Micon::Core
         dependencies.each{|d| self[d]}
         @metadata.call_before key
 
+        # We need this check to detect and prevent component from been used before its initialization
+        # is finished.
+        @stack[key] = true
+
         # We need to check container first, in complex cases (circullar dependency)
         # the object already may be initialized.
         # See "should allow to use circullar dependency in :after callback".
-        @stack[key] = true
-        o = (container && container[key]) || initializer.call
-
-        if config
-          apply_config o, config
-        elsif config != false
-          # Loading and caching config.
-          config = get_config key
-          config = false unless config # We use false to differentiate from nil.
-          @metadata.initializers[key] = [initializer, dependencies, config]
-
-          apply_config o, config if config
+        o = (container && container[key]) || begin
+          # Loading component configuration, comparing to nil is important,
+          # we use false if there's no config.
+          if config == nil
+            config = get_config key
+            config = false unless config
+            @metadata.initializers[key] = [initializer, dependencies, config]
+          end
+
+          # Use arity to determine should we apply cofig automatically or
+          # component wants to apply it by themself.
+          if initializer.arity == 1
+            initializer.call config
+          else
+            o = initializer.call
+            config.each{|k, v| o.send("#{k}=", v)} if config
+            o
+          end
         end
 
+        # Storing created component in container.
         container[key] = o if container
 
         raise "initializer for component :#{key} returns nill!" unless o
@@ -309,14 +320,14 @@ class Micon::Core
       ::Micon::Config.new(self, key).load
     end
 
-    def apply_config component, config
-      if component.respond_to? :configure!
-        component.configure! config
-      else
-        config.each{|k, v| component.send("#{k}=", v)}
-      end
-    end
-
+    # def apply_config component, config
+    #   if component.respond_to? :configure!
+    #     component.configure! config
+    #   else
+    #     config.each{|k, v| component.send("#{k}=", v)}
+    #   end
+    # end
+    #
     # Module.name doesn't works correctly for Anonymous classes,
     # try to execute this code:
     #

data/spec/config_spec.rb

@@ -10,10 +10,13 @@ describe "Configuration" do
     end
   end
 
-  it "should allow to explicitly configure component if configure! method provided" do
+  it "should use custom configuration if we explicitly require config in initializer" do
     logger = Object.new
-    logger.should_receive(:configure!).with(level: :info)
-    micon.register(:logger){logger}
+    logger.should_receive(:do_custom_initialization).with(level: :info)
+    micon.register :logger do |config|
+      logger.do_custom_initialization config
+      logger
+    end
 
     with_load_path "#{spec_dir}/basic/lib" do
       micon[:logger]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micon
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
   prerelease: 
 platform: ruby
 authors: