smart_ioc 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c643b23f10b8d4ab31f241f8705fac4cb4abb7d
-  data.tar.gz: d77b6c7528997f199c2dbdc144a95ca76c59e6a5
+  metadata.gz: 0146809a105a5135977a543956a5929d6dca9951
+  data.tar.gz: 51c86019fa338d8008bdf120dd17acc5be8e9f95
 SHA512:
-  metadata.gz: 1b118126120252e9dc398c40063f8dfbea966fc70b450318677366a8d4111456d96f18bfd452fa39ded0df02cfdc90863dc3658b6f6725f3d69d7ccbd7d2fc4e
-  data.tar.gz: b9be1f2e720ca0cb179b1ab64aeeeab706774def06716abc025f20febc6b808b15f56d678f250061ef267a804aa01ecc1e51f94abd5a03eb8d425ef977e1d19c
+  metadata.gz: fb68c1a7b8e4b7844ea8fb39f1cf7cb5711251d64e7b73516066b9aae85b3de013577ccfb2f742f136fb86d38318d6b72546862df4d2ae5e3c9a941110eddee6
+  data.tar.gz: 13b01014967f0c0677aca18cc06556e6a7a1bbc7265cb7e5f6aeb6e9165f6602112594b0f6876b3d10d94a08346abfb089df4c6ceaffc6a1c5ef5727609d0eb9

data/Gemfile.lock

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

data/lib/smart_ioc/bean_factory.rb

@@ -66,6 +66,36 @@ class SmartIoC::BeanFactory
     end
   end
 
+  def load_bean(bean_definition, beans_cache)
+    bd_opts    = beans_cache[bean_definition]
+    scope_bean = bd_opts[:scope_bean]
+
+    bean_definition.dependencies.each do |dependency|
+      bd             = dependency.bean_definition
+      dep_db_opts    = bd_opts[:dependencies][dependency.bean_definition]
+      dep_scope_bean = dep_db_opts[:scope_bean]
+      dep_bean       = load_bean(bd, bd_opts[:dependencies])
+
+      scope_bean.bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
+    end
+
+    if !scope_bean.loaded
+      scope_bean.set_bean(scope_bean.bean.send(bean_definition.factory_method), true)
+    end
+
+    scope_bean.bean
+  end
+
+  def inject_beans(bean_definition, beans_cache)
+    bean = beans_cache[:scope_bean].bean
+    bean_definition.dependencies.each do |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, beans_cache[:dependencies][bd])
+    end
+  end
+
   def init_bean_definition_cache(bean_definition)
     {
       bean_definition => {
@@ -224,71 +254,6 @@ class SmartIoC::BeanFactory
     end
   end
 
-  def init_zero_dep_factory_beans(beans_cache)
-    beans_cache.each do |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
-  end
-
-  def collect_dependent_factory_beans(beans_cache, collection)
-    beans_cache.each do |bean_definition, bd_opts|
-      if bean_definition.has_factory_method? && bean_definition.dependencies.size > 0
-        collection << bean_definition
-      end
-      collect_dependent_factory_beans(bd_opts[:dependencies], collection)
-    end
-
-    collection
-  end
-
-  def init_dependent_factory_beans(beans_cache)
-    dependent_factory_beans = collect_dependent_factory_beans(beans_cache, [])
-
-    dependent_factory_beans.each do |bean_definition|
-      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, bd_opts)
-        init_factory_bean(bean_definition, bd_opts)
-      end
-      init_dependent_factory_beans(bd_opts[:dependencies])
-    end
-  end
-
-  def load_bean(bean_definition, beans_cache)
-    init_zero_dep_factory_beans(beans_cache)
-    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, beans_cache)
-    bean = beans_cache[:scope_bean].bean
-    bean_definition.dependencies.each do |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, beans_cache[:dependencies][bd])
-    end
-  end
-
   def get_cross_refference(refer_bean_definitions, current_bean_definition, seen_bean_definitions = [])
     current_bean_definition.dependencies.each do |dependency|
       bd = dependency.bean_definition

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.29"
+  VERSION = "0.1.30"
 end

data/spec/smart_ioc/factory_method_spec.rb

@@ -54,6 +54,12 @@ describe 'Factory Method' do
         
         bean :singleton_bean, package: :cross_refference
       end
+
+      class OtherSingletonBean
+        include SmartIoC::Iocify
+
+        bean :other_singleton_bean, package: :cross_refference
+      end
       
       class FactoryConfig
         include SmartIoC::Iocify
@@ -61,6 +67,7 @@ describe 'Factory Method' do
         bean :factory_config, factory_method: :build, package: :cross_refference
 
         inject :singleton_bean
+        inject :other_singleton_bean
 
         class Config
           attr_reader :singleton_bean
@@ -81,23 +88,28 @@ describe 'Factory Method' do
         bean :factory_logger, factory_method: :build, package: :cross_refference
 
         inject :factory_config
+        inject :singleton_bean
 
         class Logger
-          attr_reader :factory_config
+          attr_reader :factory_config, :singleton_bean
 
-          def initialize(factory_config)
+          def initialize(factory_config, singleton_bean)
             @factory_config = factory_config
+            @singleton_bean = singleton_bean
           end
         end
         
         def build
-          Logger.new(factory_config)
+          Logger.new(factory_config, singleton_bean)
         end
       end
     end
 
     it 'creates factory_logger bean' do
-      expect(SmartIoC.get_bean(:factory_logger, package: :cross_refference)).to be_a(FactoryLogger::Logger)
+      logger = SmartIoC.get_bean(:factory_logger, package: :cross_refference)
+      expect(logger).to be_a(FactoryLogger::Logger)
+      expect(logger.factory_config).to be_a(FactoryConfig::Config)
+      expect(logger.factory_config.singleton_bean).to be_a(SingletonBean)
     end
 
     it 'creates factory_config bean' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Ruslan Gatiyatov