smart_ioc 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aee826a000111362583c955705c9b149d8592a9
-  data.tar.gz: 082aa8f2db41f9597853157f7a868d8080efc210
+  metadata.gz: 241dbe4a31d95181db8b2604a570f5e0f244894e
+  data.tar.gz: 08434ffb62dd2727da1d82fa6919f69263593117
 SHA512:
-  metadata.gz: 7af22bc69babb1cff296409a176949ed74ab07186c6e1878882246bc0722d621b4d4ec962d1ee54cd2de7e409f681cafb1483b80ea56d0f7033958534d86d1be
-  data.tar.gz: e671933874cae7b256fcac77c4ebbe91f85136cf1f772dab51518f2e6e907eed64c9085aa29ebec93746d33504cf499fd304adb8c609c81fbf2a71615d1631db
+  metadata.gz: 164dde71578f2399b63af9af1fc173bc261c0ac19d4c2eccfb44a300e5cacbd1ce9e7f76ae3843a79734cae1333ba0a03fb0cbb599c08302af1c7122ea0443ff
+  data.tar.gz: a4d77468cfed50a70dbeecd23366ac05e4f7ac93a76ba8453336a298ea9e2ef9d8885a00b059500464a1c691133f87d54d9f685cbc88ec0768c6272dfafb4bad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.1.27)
+    smart_ioc (0.1.28)
 
 GEM
   remote: https://rubygems.org/

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -5,6 +5,14 @@ class SmartIoC::BeanDefinitionsStorage
     @collection = []
   end
 
+  def clear_dependencies
+    @collection.each do |bd|
+      bd.dependencies.each do |dependency|
+        dependency.bean_definition = nil
+      end
+    end
+  end
+
   # @param bean_definition [BeanDefinition]
   def push(bean_definition)
     existing_bd = @collection.detect do |bd|

data/lib/smart_ioc/bean_factory.rb

@@ -58,12 +58,11 @@ class SmartIoC::BeanFactory
         raise LoadRecursion.new(bean_definition)
       end
 
-      dependency_cache = {}
-      beans_cache      = init_bean_definition_cache(bean_definition)
+      beans_cache = init_bean_definition_cache(bean_definition)
 
-      autodetect_bean_definitions_for_dependencies(bean_definition, dependency_cache)
-      preload_beans(bean_definition, dependency_cache, beans_cache[bean_definition])
-      load_bean(bean_definition, dependency_cache, beans_cache)
+      autodetect_bean_definitions_for_dependencies(bean_definition)
+      preload_beans(bean_definition, beans_cache[bean_definition])
+      load_bean(bean_definition, beans_cache)
     end
   end
 
@@ -115,19 +114,17 @@ class SmartIoC::BeanFactory
     end
   end
 
-  def autodetect_bean_definitions_for_dependencies(bean_definition, dependency_cache)
+  def autodetect_bean_definitions_for_dependencies(bean_definition)
     bean_definition.dependencies.each do |dependency|
-      next if dependency_cache.has_key?(dependency)
+      next if dependency.bean_definition
 
       @bean_file_loader.require_bean(dependency.ref)
 
-      bd = autodetect_bean_definition(
+      dependency.bean_definition = autodetect_bean_definition(
         dependency.ref, dependency.package, bean_definition.package
       )
 
-      dependency_cache[dependency] = bd
-
-      autodetect_bean_definitions_for_dependencies(bd, dependency_cache)
+      autodetect_bean_definitions_for_dependencies(dependency.bean_definition)
     end
   end
 
@@ -174,7 +171,7 @@ class SmartIoC::BeanFactory
     return smart_bds.first
   end
 
-  def preload_beans(bean_definition, dependency_cache, beans_cache)
+  def preload_beans(bean_definition, beans_cache)
     scope = get_scope(bean_definition)
 
     if scope_bean = scope.get_bean(bean_definition.klass)
@@ -184,13 +181,13 @@ class SmartIoC::BeanFactory
     end
 
     bean_definition.dependencies.each do |dependency|
-      bd = dependency_cache[dependency]
+      bd = dependency.bean_definition
 
       next if beans_cache[:dependencies].has_key?(bd)
 
       dep_bean_cache = init_bean_definition_cache(bd)
       beans_cache[:dependencies].merge!(dep_bean_cache)
-      preload_beans(bd, dependency_cache, dep_bean_cache[bd])
+      preload_beans(bd, dep_bean_cache[bd])
     end
   end
 
@@ -229,8 +226,12 @@ class SmartIoC::BeanFactory
 
   def init_zero_dep_factory_beans(beans_cache)
     beans_cache.each do |bean_definition, bd_opts|
-      if bean_definition.has_factory_method? && bean_definition.dependencies.size == 0
-        init_factory_bean(bean_definition, bd_opts)
+      if bean_definition.has_factory_method?
+        has_factory_dependencies = !!bean_definition.dependencies.detect {|dep| dep.bean_definition.has_factory_method?}
+
+        if bean_definition.dependencies.size == 0 || !has_factory_dependencies
+          init_factory_bean(bean_definition, bd_opts)
+        end
       end
       init_zero_dep_factory_beans(bd_opts[:dependencies]) if !bd_opts[:dependencies].empty?
     end
@@ -247,44 +248,50 @@ class SmartIoC::BeanFactory
     collection
   end
 
-  def init_dependent_factory_beans(beans_cache, dependency_cache)
+  def init_dependent_factory_beans(beans_cache)
     dependent_factory_beans = collect_dependent_factory_beans(beans_cache, [])
 
     dependent_factory_beans.each do |bean_definition|
-      if cross_refference_bd = get_cross_refference(dependent_factory_beans, bean_definition, dependency_cache)
-        raise ArgumentError, "Factory method beans should not cross refference each other. Bean :#{bean_definition.name} cross refferences bean :#{cross_refference_bd.name}."
+      cross_refference_bd = get_cross_refference(dependent_factory_beans, bean_definition)
+
+      if cross_refference_bd
+        has_factory_dependencies = !!cross_refference_bd.dependencies.detect {|dep| dep.bean_definition.has_factory_method?}
+        
+        if has_factory_dependencies
+          raise ArgumentError, "Factory method beans should not cross refference each other. Bean :#{bean_definition.name} cross refferences bean :#{cross_refference_bd.name}."
+        end
       end
     end
 
     beans_cache.each do |bean_definition, bd_opts|
       if bean_definition.has_factory_method? && bean_definition.dependencies.size > 0
-        inject_beans(bean_definition, dependency_cache, bd_opts)
+        inject_beans(bean_definition, bd_opts)
         init_factory_bean(bean_definition, bd_opts)
       end
-      init_dependent_factory_beans(bd_opts[:dependencies], dependency_cache)
+      init_dependent_factory_beans(bd_opts[:dependencies])
     end
   end
 
-  def load_bean(bean_definition, dependency_cache, beans_cache)
+  def load_bean(bean_definition, beans_cache)
     init_zero_dep_factory_beans(beans_cache)
-    init_dependent_factory_beans(beans_cache, dependency_cache)
-    inject_beans(bean_definition, dependency_cache, beans_cache[bean_definition])
+    init_dependent_factory_beans(beans_cache)
+    inject_beans(bean_definition, beans_cache[bean_definition])
     beans_cache[bean_definition][:scope_bean].bean
   end
 
-  def inject_beans(bean_definition, dependency_cache, beans_cache)
+  def inject_beans(bean_definition, beans_cache)
     bean = beans_cache[:scope_bean].bean
     bean_definition.dependencies.each do |dependency|
-      bd = dependency_cache[dependency]
+      bd = dependency.bean_definition
       dep_bean = beans_cache[:dependencies][bd][:scope_bean].bean
       bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
-      inject_beans(bd, dependency_cache, beans_cache[:dependencies][bd])
+      inject_beans(bd, beans_cache[:dependencies][bd])
     end
   end
 
-  def get_cross_refference(refer_bean_definitions, current_bean_definition, dependency_cache, seen_bean_definitions = [])
+  def get_cross_refference(refer_bean_definitions, current_bean_definition, seen_bean_definitions = [])
     current_bean_definition.dependencies.each do |dependency|
-      bd = dependency_cache[dependency]
+      bd = dependency.bean_definition
 
       next if seen_bean_definitions.include?(bd)
 
@@ -292,7 +299,7 @@ class SmartIoC::BeanFactory
         return bd
       end
 
-      if crbd = get_cross_refference(refer_bean_definitions, bd, dependency_cache, seen_bean_definitions + [bd])
+      if crbd = get_cross_refference(refer_bean_definitions, bd, seen_bean_definitions + [bd])
         return crbd
       end
     end

data/lib/smart_ioc/container.rb

@@ -111,6 +111,7 @@ module SmartIoC
     # @param context [Symbol] context (ex: :test)
     def set_extra_context_for_package(package_name, context)
       extra_package_contexts.set_context(package_name, context)
+      bean_definitions_storage.clear_dependencies
     end
 
     # @param bean_name [Symbol] bean name

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.27"
+  VERSION = "0.1.28"
 end

data/spec/smart_ioc/factory_method_spec.rb

@@ -46,4 +46,46 @@ describe 'Factory Method' do
   it 'assigns bean with factory method' do
     expect(@other_service.test_config).to be_a(TestConfig::Config)
   end
+
+  context 'cross refference factory method beans' do
+    before :all do
+      class SingletonBean
+        include SmartIoC::Iocify
+        
+        bean :singleton_bean, package: :cross_refference
+      end
+      
+      class FactoryConfig
+        include SmartIoC::Iocify
+        
+        bean :factory_config, factory_method: :build, package: :cross_refference
+
+        inject :singleton_bean
+
+        def build
+          Object.new
+        end
+      end
+
+      class FactoryLogger
+        include SmartIoC::Iocify
+        
+        bean :factory_logger, factory_method: :build, package: :cross_refference
+
+        inject :factory_config
+
+        def build
+          Object.new
+        end
+      end
+    end
+
+    it 'creates factory_logger bean' do
+      expect(SmartIoC.get_bean(:factory_logger, package: :cross_refference)).to be_a(Object)
+    end
+
+    it 'creates factory_config bean' do
+      expect(SmartIoC.get_bean(:factory_config, package: :cross_refference)).to be_a(Object)
+    end
+  end
 end

data/spec/smart_ioc/smart_ioc_spec.rb

@@ -34,7 +34,7 @@ describe SmartIoC do
   it 'sets beans with extra package context' do
     SmartIoC.set_extra_context_for_package(:admins, :test)
     SmartIoC.force_clear_scopes
-
+    
     users_creator = @container.get_bean(:users_creator)
     users_creator.create(1, 'test@test.com')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler