smart_ioc 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe545eaedb9fcf8e79eb588a1ae17a8c4c0715b4
-  data.tar.gz: 4a5346a0354dd07c85ab0e8f0acc24d08e986000
+  metadata.gz: 0198db2374679046b00a1332fee4de0aad13c129
+  data.tar.gz: c50b72b48d02dabb4fa56f7b1cfeca2d4a5673a6
 SHA512:
-  metadata.gz: 67408406b25290d15c3b09e04279b1c48ece7ac8c579f3464f91864003c30db073b0ed0941c4531f768e3c3ce31325f0d37276da992cd5acbbcc584d865122e0
-  data.tar.gz: 3e4da384c7d5ab400faf863eb6f7921da529626265f25544a5243303cfcfd5e6a0122162d54a98791d46c75bef37450cce13f1ff40b09770f4e9723bf8844905
+  metadata.gz: f39126254e35139b03f025db25560c059bfa563a1ca9fbf261b3ab96bc7ee38d5db7a92dee3312ba6e2790e1bc380d81c4419fcbb1e43992e44db578d1066bb7
+  data.tar.gz: 73141b108b4f4946f6933a4ce000c8f4e863973ae442520a5ede89a0a1f11b086126ba754a7f7acbbdb1e9c3417f0a39324907b980d5212774a7ff7e0efcdb50

data/Gemfile.lock

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

data/lib/smart_ioc/bean_definition.rb

@@ -1,6 +1,6 @@
 class SmartIoC::BeanDefinition
   include SmartIoC::Args
-  
+
   attr_reader :name, :package, :path, :klass, :scope, :instance, :factory_method,
               :context, :dependencies
 

data/lib/smart_ioc/bean_factory.rb

@@ -34,27 +34,48 @@ class SmartIoC::BeanFactory
     check_arg(package, :package, Symbol) if package
     check_arg(context, :context, Symbol) if context
 
+    get_or_build_bean(bean_name, package, context)
+  end
+
+  private
+
+  def get_or_build_bean(bean_name, package, context, history = Set.new)
     @bean_file_loader.require_bean(bean_name)
 
     context         = autodetect_context(bean_name, package, context)
     bean_definition = @bean_definitions_storage.find(bean_name, package, context)
     scope           = get_scope(bean_definition)
-    bean            = scope.get_bean(bean_definition.klass)
+    scope_bean      = scope.get_bean(bean_definition.klass)
+    is_recursive    = history.include?(bean_name)
 
-    if bean
-      update_dependencies(bean, bean_definition)
-      bean
+    history << bean_name
+
+    if scope_bean
+      update_dependencies(scope_bean.bean, bean_definition)
+      scope_bean.bean
     else
+      if is_recursive
+        raise LoadRecursion.new(bean_definition)
+      end
+
       dependency_cache = {}
-      beans_cache      = {}
+      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)
+      preload_beans(bean_definition, dependency_cache, beans_cache[bean_definition])
       load_bean(bean_definition, dependency_cache, beans_cache)
     end
   end
 
-  private
+  def init_bean_definition_cache(bean_definition)
+    {
+      bean_definition => {
+        scope_bean: nil,
+        dependencies: {
+        }
+      }
+    }
+  end
 
   def update_dependencies(bean, bean_definition, updated_beans = {})
     bean_definition.dependencies.each do |dependency|
@@ -63,15 +84,20 @@ class SmartIoC::BeanFactory
       )
 
       scope    = get_scope(bean_definition)
-      dep_bean = updated_beans[bd] || scope.get_bean(bd.klass)
+      dep_bean = updated_beans[bd]
+
+      if !dep_bean && scope_bean = scope.get_bean(bd.klass)
+        dep_bean = scope_bean.bean
+      end
 
       if !dep_bean
-        dep_bean = get_bean(
-          bd.name, package: bd.package, context: bd.context
-        )
+        dep_bean = get_or_build_bean(bd.name, bd.package, bd.context)
 
         bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
-        updated_beans[bd] = dep_bean
+
+        if !scope.is_a?(SmartIoC::Scopes::Prototype)
+          updated_beans[bd] = dep_bean
+        end
       else
         update_dependencies(dep_bean, bd, updated_beans)
       end
@@ -151,8 +177,8 @@ class SmartIoC::BeanFactory
   def preload_beans(bean_definition, dependency_cache, beans_cache)
     scope = get_scope(bean_definition)
 
-    if bean = scope.get_bean(bean_definition.klass)
-      beans_cache[bean_definition] = bean
+    if scope_bean = scope.get_bean(bean_definition.klass)
+      beans_cache[:scope_bean] = scope_bean
     else
       preload_bean_instance(bean_definition, beans_cache)
     end
@@ -160,20 +186,23 @@ class SmartIoC::BeanFactory
     bean_definition.dependencies.each do |dependency|
       bd = dependency_cache[dependency]
 
-      next if beans_cache.has_key?(bd)
-      preload_beans(bd, dependency_cache, beans_cache)
+      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])
     end
   end
 
   def preload_bean_instance(bean_definition, beans_cache)
-    return beans_cache[bean_definition] if beans_cache.has_key?(bean_definition)
+    return if beans_cache[:scope_bean]
 
     scope = get_scope(bean_definition)
-    bean = scope.get_bean(bean_definition.klass)
+    scope_bean = scope.get_bean(bean_definition.klass)
 
-    if bean
-      beans_cache[bean_definition] = bean
-      return bean
+    if scope_bean
+      beans_cache[:scope_bean] = scope_bean
+      return scope_bean
     end
 
     bean = if bean_definition.is_instance?
@@ -182,54 +211,74 @@ class SmartIoC::BeanFactory
       bean_definition.klass
     end
 
-    scope.save_bean(bean_definition.klass, bean)
-    beans_cache[bean_definition] = bean
+    scope_bean = SmartIoC::Scopes::Bean.new(bean, !bean_definition.has_factory_method?)
 
-    bean
+    scope.save_bean(bean_definition.klass, scope_bean)
+    beans_cache[:scope_bean] = scope_bean
+
+    scope_bean
   end
 
-  def load_bean(bean_definition, dependency_cache, beans_cache)
-    # first let's setup beans with factory_methods
-    zero_dep_bd_with_factory_methods = []
-    bd_with_factory_methods = []
-
-    beans_cache.each do |bean_definition, bean|
-      if bean_definition.has_factory_method?
-        if bean_definition.dependencies.size == 0
-          zero_dep_bd_with_factory_methods << bean_definition
-        else
-          bd_with_factory_methods << bean_definition
-        end
+  def init_factory_bean(bean_definition, bd_opts)
+    scope_bean = bd_opts[:scope_bean]
+
+    if !scope_bean.loaded
+      scope_bean.set_bean(scope_bean.bean.send(bean_definition.factory_method), true)
+    end
+  end
+
+  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)
       end
+      init_zero_dep_factory_beans(bd_opts[:dependencies]) if !bd_opts[:dependencies].empty?
     end
+  end
 
-    bd_with_factory_methods.each do |bean_definition|
-      if cross_refference_bd = get_cross_refference(bd_with_factory_methods, 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}."
+  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
 
-    (zero_dep_bd_with_factory_methods + bd_with_factory_methods).each do |bean_definition|
-      inject_beans(bean_definition, dependency_cache, beans_cache)
-      bean = beans_cache[bean_definition]
-      bean = bean.send(bean_definition.factory_method) if bean.is_a?(bean_definition.klass)
-      beans_cache[bean_definition] = bean
-      scope = get_scope(bean_definition)
-      scope.save_bean(bean_definition.klass, bean)
+    collection
+  end
+
+  def init_dependent_factory_beans(beans_cache, dependency_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}."
+      end
     end
 
-    inject_beans(bean_definition, dependency_cache, beans_cache)
+    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)
+        init_factory_bean(bean_definition, bd_opts)
+      end
+      init_dependent_factory_beans(bd_opts[:dependencies], dependency_cache)
+    end
+  end
 
-    beans_cache[bean_definition]
+  def load_bean(bean_definition, dependency_cache, 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])
+    beans_cache[bean_definition][:scope_bean].bean
   end
 
   def inject_beans(bean_definition, dependency_cache, beans_cache)
-    bean = beans_cache[bean_definition]
+    bean = beans_cache[:scope_bean].bean
     bean_definition.dependencies.each do |dependency|
       bd = dependency_cache[dependency]
-      dep_bean = beans_cache[bd]
+      dep_bean = beans_cache[:dependencies][bd][:scope_bean].bean
       bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
-      inject_beans(bd, dependency_cache, beans_cache)
+      inject_beans(bd, dependency_cache, beans_cache[:dependencies][bd])
     end
   end
 

data/lib/smart_ioc/errors.rb

@@ -5,6 +5,16 @@ module SmartIoC::Errors
     end
   end
 
+  class LoadRecursion < StandardError
+    def initialize(bean_definition)
+      super(%Q(
+        Unable to create bean :#{bean_definitions.name}.
+        Recursion found during bean load.
+        #{bean_definition.inspect}
+      ))
+    end
+  end
+
   class AmbiguousBeanDefinition < StandardError
     def initialize(bean_name, bean_definitions)
       super(%Q(
@@ -14,4 +24,4 @@ module SmartIoC::Errors
       ))
     end
   end
-end
+end

data/lib/smart_ioc/scopes/bean.rb

@@ -0,0 +1,13 @@
+class SmartIoC::Scopes::Bean
+  attr_reader :bean, :loaded
+
+  def initialize(bean, loaded)
+    @bean   = bean
+    @loaded = loaded
+  end
+
+  def set_bean(bean, loaded)
+    @bean   = bean
+    @loaded = loaded
+  end
+end

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/lib/smart_ioc.rb

@@ -17,6 +17,7 @@ module SmartIoC
   autoload :Scopes,                 'smart_ioc/scopes'
 
   module Scopes
+    autoload :Bean,      'smart_ioc/scopes/bean'
     autoload :Prototype, 'smart_ioc/scopes/prototype'
     autoload :Singleton, 'smart_ioc/scopes/singleton'
     autoload :Request,   'smart_ioc/scopes/request'

data/spec/smart_ioc/bean_factory_spec.rb

@@ -98,4 +98,64 @@ describe SmartIoC::BeanFactory do
     expect(prototype_bean1_object_id).not_to eq(prototype_bean2_object_id)
     expect(second_singleton_bean1_object_id).to eq(second_singleton_bean2_object_id)
   end
+
+  describe 'prototype scope' do
+    before :all do
+      class PrototypeBean
+        include SmartIoC::Iocify
+        bean :prototype_bean, scope: :prototype, package: :prototype
+
+        inject :prototype_service1
+        inject :prototype_service2
+
+        attr_reader :prototype_service1, :prototype_service2
+      end
+
+      class PrototypeService1
+        include SmartIoC::Iocify
+        bean :prototype_service1, scope: :prototype, package: :prototype
+
+        inject :prototype_repo
+        inject :singleton_repo
+
+        attr_reader :prototype_repo, :singleton_repo
+      end
+
+      class PrototypeService2
+        include SmartIoC::Iocify
+        bean :prototype_service2, scope: :prototype, package: :prototype
+
+        inject :prototype_repo
+        inject :singleton_repo
+
+        attr_reader :prototype_repo, :singleton_repo
+      end
+
+      class PrototypeRepo
+        include SmartIoC::Iocify
+        bean :prototype_repo, scope: :prototype, package: :prototype
+      end
+
+      class SingletonRepo
+        include SmartIoC::Iocify
+        bean :singleton_repo, scope: :singleton, package: :prototype
+      end
+    end
+
+    it 'injects prototype beans with different object id' do
+      prototype_bean = SmartIoC.get_bean(:prototype_bean)
+      repo1_object_id = prototype_bean.prototype_service1.prototype_repo.object_id
+      repo2_object_id = prototype_bean.prototype_service2.prototype_repo.object_id
+
+      expect(repo1_object_id).not_to eq(repo2_object_id)
+    end
+
+    it 'injects singleton beans with same object id' do
+      prototype_bean = SmartIoC.get_bean(:prototype_bean)
+      repo1_object_id = prototype_bean.prototype_service1.singleton_repo.object_id
+      repo2_object_id = prototype_bean.prototype_service2.singleton_repo.object_id
+
+      expect(repo1_object_id).to eq(repo2_object_id)
+    end
+  end
 end

data/spec/smart_ioc/factory_method_spec.rb

@@ -46,4 +46,4 @@ describe 'Factory Method' do
   it 'assigns bean with factory method' do
     expect(@other_service.test_config).to be_a(TestConfig::Config)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/smart_ioc/inject_metadata.rb
 - lib/smart_ioc/iocify.rb
 - lib/smart_ioc/scopes.rb
+- lib/smart_ioc/scopes/bean.rb
 - lib/smart_ioc/scopes/prototype.rb
 - lib/smart_ioc/scopes/request.rb
 - lib/smart_ioc/scopes/singleton.rb