ioc_rb 0.0.2 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@ vendor/
 tags
 .bundle
 .DS_Store
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ioc_rb (0.0.2)
+    ioc_rb (0.1.0)
       activesupport
       request_store
 

data/lib/ioc_rb/bean_factory.rb

@@ -60,9 +60,22 @@ class IocRb::BeanFactory
     end
     bean = bean_metadata.instance ? bean_class.new : bean_class
 
-    # put to container first to prevent circular dependencies
-    beans_storage[bean_metadata.name] = bean
+    if bean_metadata.has_factory_method?
+      set_bean_dependencies(bean, bean_metadata)
+      bean = bean.send(bean_metadata.factory_method)
+      beans_storage[bean_metadata.name] = bean
+    else
+      # put to container first to prevent circular dependencies
+      beans_storage[bean_metadata.name] = bean
+      set_bean_dependencies(bean, bean_metadata)
+    end
 
+    bean
+  end
+
+  private
+
+  def set_bean_dependencies(bean, bean_metadata)
     bean_metadata.attrs.each do |attr|
       bean_metadata = @beans_metadata_storage.by_name(attr.ref)
       unless bean_metadata
@@ -83,7 +96,6 @@ class IocRb::BeanFactory
         end
       end
     end
-    bean
   end
 
 end

data/lib/ioc_rb/bean_metadata.rb

@@ -1,7 +1,7 @@
 # Stores bean specific data: bean class, name,
 # scope and bean dependencies
 class IocRb::BeanMetadata
-  attr_reader :name, :bean_class, :scope, :instance, :attrs
+  attr_reader :name, :bean_class, :scope, :instance, :factory_method, :attrs
 
   # Constructor
   # @param name [Symbol] bean name
@@ -17,11 +17,12 @@ class IocRb::BeanMetadata
   def initialize(name, options, &block)
     IocRb::ArgsValidator.has_key!(options, :class)
 
-    @name       = name
-    @bean_class = options[:class]
-    @scope      = options[:scope] || :singleton
-    @instance   = options[:instance].nil? ? true : options[:instance]
-    @attrs      = []
+    @name           = name
+    @bean_class     = options[:class]
+    @scope          = options[:scope] || :singleton
+    @instance       = options[:instance].nil? ? true : options[:instance]
+    @factory_method = options[:factory_method]
+    @attrs          = []
 
     if @bean_class.respond_to?(:_iocrb_injectable_attrs)
       @bean_class._iocrb_injectable_attrs.each do |attr, options|
@@ -35,6 +36,10 @@ class IocRb::BeanMetadata
     end
   end
 
+  def has_factory_method?
+    !!@factory_method
+  end
+
   class Attribute
     attr_reader :name, :ref
 

data/lib/ioc_rb/version.rb

@@ -1,3 +1,3 @@
 module IocRb
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/ioc_rb/container_spec.rb

@@ -119,4 +119,28 @@ describe IocRb::Container do
       first_validator.should_not == second_validator
     end
   end
+
+  describe "factory method" do
+    module Test
+      class Config
+      end
+      class ConfigsFactory
+        def load_config
+          Config.new
+        end
+      end
+    end
+
+    let(:container) do
+      IocRb::Container.new do |c|
+        c.bean :config, class: Test::ConfigsFactory, factory_method: :load_config
+      end
+    end
+
+    it "should instantiate bean using factory method" do
+      container[:config].should be_instance_of(Test::Config)
+    end
+
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: ioc_rb
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Albert Gazizov
@@ -10,18 +10,18 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: request_store
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: request_store
-  type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -29,15 +29,15 @@ dependencies:
         version: '0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: activesupport
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: activesupport
-  type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -45,15 +45,15 @@ dependencies:
         version: '0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: bundler
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
     none: false
-  name: bundler
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -61,15 +61,15 @@ dependencies:
         version: '1.3'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rake
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  name: rake
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -120,12 +120,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -861473019195277398
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -861473019195277398
       version: '0'
   none: false
 requirements: []
@@ -138,4 +144,3 @@ test_files:
 - spec/ioc_rb/container_spec.rb
 - spec/ioc_rb/inject_spec.rb
 - spec/spec_helper.rb
-has_rdoc: