smart_ioc 0.2.5 → 0.3.6

data/lib/smart_ioc/container.rb

@@ -13,10 +13,6 @@ module SmartIoC
       def clear
         @container = nil
       end
-
-      def get_bean(bean_name, package: nil, context: nil)
-        get_instance.get_bean(bean_name, package: package, context: context)
-      end
     end
 
     def initialize
@@ -36,8 +32,9 @@ module SmartIoC
     # @param path [String] bean file absolute path
     # @param scope [Symbol] scope value
     # @param context [Symbol] bean context
+    # @param after_init [Symbol] name of bean method that will be called after bean initialization
     # @return [SmartIoC::BeanDefinition] bean definition
-    def register_bean(bean_name:, klass:, context:, scope:, path:,
+    def register_bean(bean_name:, klass:, context:, scope:, path:, after_init:,
                       factory_method: nil, package_name: nil, instance: true)
       context ||= DEFAULT_CONTEXT
 
@@ -60,8 +57,6 @@ module SmartIoC
         raise ArgumentError, "bean scope should be one of #{allowed_scopes.inspect}"
       end
 
-      package_name ||= SmartIoC::BeanLocations.get_bean_package(path)
-
       if !package_name
         raise ArgumentError, %Q(
           Package name should be given for bean :#{bean_name}.
@@ -81,7 +76,8 @@ module SmartIoC
         instance:       instance,
         factory_method: factory_method,
         context:        context,
-        scope:          scope
+        scope:          scope,
+        after_init:     after_init,
       )
 
       bean_definitions_storage.push(bean_definition)
@@ -90,10 +86,12 @@ module SmartIoC
     end
 
     # Returns bean definition for specific class
-    # @param klass [Class] class name
+    # @param bean_name [Symbol]
+    # @param package [Symbol]
+    # @param context [Symbol]
     # return [BeanDefinition]
-    def get_bean_definition_by_class(klass)
-      bean_definitions_storage.find_by_class(klass)
+    def get_bean_definition(bean_name, package, context)
+      bean_definitions_storage.find_bean(bean_name, package, context)
     end
 
     # Sets new load proc
@@ -116,10 +114,17 @@ module SmartIoC
 
     # @param bean_name [Symbol] bean name
     # @param optional package [Symbol] package name
+    # @param optional parent_bean_definition [SmartIoc::BeanDefinition] bean definition of parent bean
     # @param optional context [Symbol] package context
     # @return bean instance from container
-    def get_bean(bean_name, package: nil, context: nil)
-      bean_factory.get_bean(bean_name, package: package, context: context)
+    def get_bean(bean_name, package: nil, context: nil, parent_bean_definition: nil, parent_bean_name: nil)
+      bean_factory.get_bean(
+        bean_name,
+        package: package,
+        parent_bean_definition: parent_bean_definition,
+        context: context,
+        parent_bean_name: parent_bean_name,
+      )
     end
 
     def clear_scopes
@@ -136,9 +141,9 @@ module SmartIoC
     def require_bean(bean_name)
       bean_factory.bean_file_loader.require_bean(bean_name)
     end
-    
+
     private
-    
+
     def bean_factory
       @bean_factory ||= SmartIoC::BeanFactory.new(bean_definitions_storage, extra_package_contexts)
     end

data/lib/smart_ioc/errors.rb

@@ -5,23 +5,21 @@ 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
+    attr_accessor :parent_bean_definition
+
     def initialize(bean_name, bean_definitions)
-      super(%Q(
-        Unable to create bean :#{bean_name}.
-        Several definitions were found.
-        #{bean_definitions.map(&:inspect).join("\n\n")}
-      ))
+      @bean_name = bean_name
+      @bean_definitions = bean_definitions
+    end
+
+    def message
+      <<~EOS
+        Unable to inject bean :#{@bean_name}#{@parent_bean_definition ? " into :#{@parent_bean_definition.name} (package: #{@parent_bean_definition.package})" : ""}.
+        Several bean definitions with name :#{@bean_name} were found:
+
+        #{@bean_definitions.map(&:inspect).join("\n\n")}
+      EOS
     end
   end
 end

data/lib/smart_ioc/extra_package_contexts.rb

@@ -14,6 +14,10 @@ class SmartIoC::ExtraPackageContexts
     @data[package_name] = context
   end
 
+  def package_context(package_name)
+    @data[package_name]
+  end
+
   def get_context(package_name)
     @data[package_name] || SmartIoC::Container::DEFAULT_CONTEXT
   end

data/lib/smart_ioc/iocify.rb

@@ -2,6 +2,9 @@
 # Example of usage:
 # class Bar
 #   bean :bar
+#
+#   def call
+#   end
 # end
 #
 # class Foo
@@ -12,6 +15,7 @@
 #   inject :some_bar, ref: bar, from: :repository
 #
 #   def hello_world
+#     some_bar.call
 #     puts 'Hello world'
 #   end
 # end
@@ -23,17 +27,48 @@ module SmartIoC::Iocify
   end
 
   module ClassMethods
+    def package(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @package = name
+    end
+
+    def context(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @context = name
+    end
+
+    def factory_method(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @factory_method = name
+    end
+
+    def scope(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @scope = name
+    end
+
+    def instance
+      @instance = true
+    end
+
+    def after_init(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @after_init = name
+    end
+
     # @param bean_name [Symbol] bean name
     # @param scope [Symbol] bean scope (defaults to :singleton)
     # @param package [nil or Symbol]
     # @param factory_method [nil or Symbol] factory method to get bean
     # @param instance [Boolean] instance based bean or class-based
     # @param context [Symbol] set bean context (ex: :test)
+    # @param after_init [Symbol] name of bean method that will be called after bean initialization (ex: :test)
     # @return nil
-    def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil)
-      file_path = caller[0].split(':').first
-
-      bean_definition = SmartIoC.get_bean_definition_by_class(self)
+    def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil, after_init: nil, file_path: nil)
+      file_path ||= caller[0].split(':').first
+      package ||= SmartIoC::BeanLocations.get_bean_package(file_path)
+      context ||= SmartIoC::Container::DEFAULT_CONTEXT
+      bean_definition = SmartIoC.get_bean_definition(bean_name, package, context)
 
       if bean_definition
         if bean_definition.path == file_path
@@ -55,7 +90,8 @@ module SmartIoC::Iocify
         package_name:   package,
         instance:       instance,
         factory_method: factory_method,
-        context:        context
+        context:        context,
+        after_init:     after_init,
       )
 
       if bean_definition.is_instance?
@@ -66,9 +102,20 @@ module SmartIoC::Iocify
         )
       end
 
+      self.instance_variable_set(:@bean_definition, bean_definition)
+
       nil
     end
 
+    def inject(bean_name, ref: nil, from: nil)
+      if @anonymous_bean
+        @injects ||= []
+        @injects.push({bean_name: bean_name, ref: ref, from: from})
+      else
+        register_inject(bean_name, ref: ref, from: from)
+      end
+    end
+
     # @param bean_name [Symbol] injected bean name
     # @param ref [Symbol] refferece bean to be sef as bean_name
     # @param from [Symbol] package name
@@ -77,29 +124,44 @@ module SmartIoC::Iocify
     # @raise [ArgumentError] if ref provided and ref is not a Symbol
     # @raise [ArgumentError] if from provided and from is not a Symbol
     # @raise [ArgumentError] if bean with same name was injected before
-    def inject(bean_name, ref: nil, from: nil)
-      bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(self)
-
-      if bean_definition.nil?
+    def register_inject(bean_name, ref: nil, from: nil)
+      if !@bean_definition
         raise ArgumentError, "#{self.to_s} is not registered as bean. Add `bean :bean_name` declaration"
       end
 
-      bean_definition.add_dependency(
+      bd = @bean_definition
+
+      bd.add_dependency(
         bean_name: bean_name,
         ref:       ref,
         package:   from
       )
 
-      if bean_definition.is_instance?
-        class_eval %Q(
-          private
-            attr_reader :#{bean_name}
+      bean_method = Proc.new do
+        bean = instance_variable_get(:"@#{bean_name}")
+        return bean if bean
+
+        klass = self.is_a?(Class) ? self : self.class
+
+        bean = SmartIoC::Container.get_instance.get_bean(
+          ref || bean_name,
+          package: from,
+          parent_bean_definition: bd,
+          parent_bean_name: bd.name,
         )
+
+        instance_variable_set(:"@#{bean_name}", bean)
+      end
+
+      if bd.is_instance?
+        define_method bean_name, &bean_method
+        private bean_name
       else
+        define_singleton_method bean_name, &bean_method
+
         class_eval %Q(
           class << self
-            private
-              attr_reader :#{bean_name}
+            private :#{bean_name}
           end
         )
       end

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.2.5"
+  VERSION = "0.3.6"
 end

data/smart_ioc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency "codecov"
 end

data/spec/smart_ioc/bean_definition_spec.rb

@@ -4,19 +4,19 @@ describe SmartIoC::BeanDefinition do
   describe "::inspect" do
     it {
       bd = SmartIoC::BeanDefinition.new(
-        name: :test_bean,
-        package: :test_package,
-        path: 'current_dir',
-        klass: Object,
-        scope: :singleton,
-        context: :default,
-        instance: false,
-        factory_method: nil
+        name:           :test_bean,
+        package:        :test_package,
+        path:           'current_dir',
+        klass:          Object,
+        scope:          :singleton,
+        context:        :default,
+        instance:       false,
+        factory_method: nil,
+        after_init:     nil,
       )
 
       str =
-"class:          Object
-name:           :test_bean
+"name:           :test_bean
 package:        :test_package
 context:        :default
 path:           current_dir

data/spec/smart_ioc/bean_factory_spec.rb

@@ -4,27 +4,42 @@ describe SmartIoC::BeanFactory do
   before :all do
     SmartIoC.clear
 
-    class Repo
-      include SmartIoC::Iocify
-      bean :repo, context: :default, package: :bean_factory
+    bean :repo do
+      context :default
+      package :bean_factory
+
+      def call
+        'default'
+      end
     end
 
-    class TestRepo
-      include SmartIoC::Iocify
-      bean :repo, context: :test, package: :bean_factory
+    bean :repo do
+      context :test
+      package :bean_factory
+
+      inject :dao
+
+      def call
+        dao.call
+        'test'
+      end
     end
 
-    class DAO
-      include SmartIoC::Iocify
-      bean :dao, context: :default, package: :bean_factory
+    bean :dao do
+      context :default
+      package :bean_factory
+      
+      def call
+        'dao'
+      end
     end
 
     class TestObject
     end
 
-    class Factory
-      include SmartIoC::Iocify
-      bean :factory, factory_method: :build_bean, package: :bean_factory
+    bean :factory do
+      factory_method :build_bean
+      package        :bean_factory
 
       def build_bean
         TestObject.new
@@ -32,6 +47,15 @@ describe SmartIoC::BeanFactory do
     end
   end
 
+  it 'returns benchmark time to load bean' do
+    SmartIoC.benchmark_mode(true)
+
+    SmartIoC.set_extra_context_for_package(:bean_factory, :test)
+    SmartIoC.get_bean(:repo)
+
+    SmartIoC.benchmark_mode(false)
+  end
+
   it 'returns same instance for singleton scope' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :test)
     instance1 = SmartIoC.get_bean(:repo)
@@ -47,17 +71,17 @@ describe SmartIoC::BeanFactory do
 
   it 'returns proper bean for test context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC.get_bean(:repo)).to be_a(TestRepo)
+    expect(SmartIoC.get_bean(:repo).call).to eq('test')
   end
 
   it 'returns proper bean for default context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :default)
-    expect(SmartIoC.get_bean(:repo)).to be_a(Repo)
+    expect(SmartIoC.get_bean(:repo).call).to eq('default')
   end
 
   it 'returns proper bean for test context with fallback to default context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC.get_bean(:dao)).to be_a(DAO)
+    expect(SmartIoC.get_bean(:dao).call).to eq('dao')
   end
 
   it 'updates dependencies' do
@@ -67,7 +91,7 @@ describe SmartIoC::BeanFactory do
 
       inject :prototype_bean
 
-      attr_reader :prototype_bean
+      public :prototype_bean
     end
 
     class SecondSingletonBean
@@ -81,7 +105,7 @@ describe SmartIoC::BeanFactory do
 
       inject :second_singleton_bean
 
-      attr_reader :second_singleton_bean
+      public :second_singleton_bean
     end
 
     bean1 = SmartIoC.get_bean(:singleton_bean, package: :test)
@@ -95,7 +119,7 @@ describe SmartIoC::BeanFactory do
     second_singleton_bean2_object_id = bean2.prototype_bean.second_singleton_bean.object_id
 
     expect(bean1_object_id).to eq(bean2_object_id)
-    expect(prototype_bean1_object_id).not_to eq(prototype_bean2_object_id)
+    expect(prototype_bean1_object_id).to eq(prototype_bean2_object_id)
     expect(second_singleton_bean1_object_id).to eq(second_singleton_bean2_object_id)
   end
 
@@ -108,7 +132,7 @@ describe SmartIoC::BeanFactory do
         inject :prototype_service1
         inject :prototype_service2
 
-        attr_reader :prototype_service1, :prototype_service2
+        public :prototype_service1, :prototype_service2
       end
 
       class PrototypeService1
@@ -118,7 +142,7 @@ describe SmartIoC::BeanFactory do
         inject :prototype_repo
         inject :singleton_repo
 
-        attr_reader :prototype_repo, :singleton_repo
+        public :prototype_repo, :singleton_repo
       end
 
       class PrototypeService2
@@ -128,22 +152,24 @@ describe SmartIoC::BeanFactory do
         inject :prototype_repo
         inject :singleton_repo
 
-        attr_reader :prototype_repo, :singleton_repo
+        public :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)
+      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
       repo1_object_id = prototype_bean.prototype_service1.prototype_repo.object_id
       repo2_object_id = prototype_bean.prototype_service2.prototype_repo.object_id
 
@@ -151,7 +177,7 @@ describe SmartIoC::BeanFactory do
     end
 
     it 'injects singleton beans with same object id' do
-      prototype_bean = SmartIoC.get_bean(:prototype_bean)
+      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
       repo1_object_id = prototype_bean.prototype_service1.singleton_repo.object_id
       repo2_object_id = prototype_bean.prototype_service2.singleton_repo.object_id