smart_ioc 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9f440eaa9c2c4bfa7c178c6dd2d77ed762cb67ab
-  data.tar.gz: 50a40a15cfda928ebff9d12489e5e1149b44ccf5
+SHA256:
+  metadata.gz: de564b00fb136146fd0f4d4182fe58f7cd9f1bd56c01a23ccc7aca185befc7e8
+  data.tar.gz: d9cb0e43111c988b77d8454fc3b7f45cf4aa2109a76839f2da17135eaef57e52
 SHA512:
-  metadata.gz: 2ff9c4aa242a0e223f252331b317377742b8e848800b8011b15e71cb5f558f6664e36fcad10808500404044004e73f16cf1becca35906001cd1914b82d66ea77
-  data.tar.gz: a0239ffda9a42ac306d0eec4f7ddcb5764ac4207e3ce33e973e7c2e77b51e6fdc89286fb093fd3a3c1c163b4ef208edd51fb7df136e98bfff326e4d10282ce9c
+  metadata.gz: 4a5a9d63019c4a0fabda18691014bbaf510ef703e1592a00a97bae1a582f523cfa8328c826a331764602664346771033ef3bf2d49bb3b27a98d9830e2f465f98
+  data.tar.gz: 9ae3b6e48602c173ca5ef0544c587c156d10e89616bbcdfb53ae293c98a4b6d047a3d2e01712b072ecfdc6bd519391735b20b12425ce513c9ebd6abb8d87d118

data/Gemfile.lock

@@ -1,45 +1,44 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.3.2)
+    smart_ioc (0.3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (10.0.2)
-    codecov (0.1.10)
+    byebug (11.1.3)
+    codecov (0.2.5)
+      colorize
       json
       simplecov
-      url
-    diff-lcs (1.3)
-    docile (1.1.5)
-    json (2.0.3)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    colorize (0.8.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    json (2.3.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    url (0.3.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   byebug
   codecov
   rake
@@ -48,4 +47,4 @@ DEPENDENCIES
   smart_ioc!
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/lib/smart_ioc.rb

@@ -73,7 +73,7 @@ module SmartIoC
       Container.get_instance
     end
 
-    [:register_bean, :get_bean_definition_by_class,
+    [:register_bean, :get_bean_definition,
      :set_extra_context_for_package, :get_bean, :clear_scopes,
      :force_clear_scopes, :set_load_proc].each do |name|
       define_method name do |*args, &block|
@@ -82,3 +82,5 @@ module SmartIoC
    end
   end
 end
+
+require 'smart_ioc/bean'

data/lib/smart_ioc/bean.rb

@@ -0,0 +1,29 @@
+def bean(bean_name, &proc)
+  raise ArgumentError, "name should be a Symbol" if !bean_name.is_a?(Symbol)
+  raise ArgumentError, "proc should be provided" if !block_given?
+
+  klass = Class.new do
+    include SmartIoC::Iocify
+  end
+
+  klass.instance_variable_set(:@anonymous_bean, true)
+  klass.instance_exec(&proc)
+
+  klass.instance_exec do
+    bean(
+      bean_name,
+      scope:          instance_variable_get(:@scope) || nil,
+      package:        instance_variable_get(:@package) || nil,
+      instance:       instance_variable_get(:@instance) || false,
+      factory_method: instance_variable_get(:@factory_method) || nil,
+      context:        instance_variable_get(:@context) || nil,
+      after_init:     instance_variable_get(:@after_init) || nil
+    )
+  end
+
+  (klass.instance_variable_get(:@injects) || []).each do |inject|
+    klass.register_inject(inject[:bean_name], ref: inject[:ref], from: inject[:from])
+  end
+
+  klass
+end

data/lib/smart_ioc/bean_definition.rb

@@ -47,7 +47,7 @@ class SmartIoC::BeanDefinition
   end
 
   def ==(bean_definition)
-    bean_definition.klass == @klass
+    bean_definition.name == @name && bean_definition.package == @package && bean_definition.context == @context
   end
 
   def singleton?
@@ -56,7 +56,6 @@ class SmartIoC::BeanDefinition
 
   def inspect
     str = []
-    str << "class:          #{@klass}"
     str << "name:           :#{@name}"
     str << "package:        :#{@package}"
     str << "context:        :#{@context}"

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -46,8 +46,16 @@ Existing bean details:
   # @param klass [Class] bean class
   # @return bean definition [BeanDefinition] or nil
   def find_by_class(klass)
-    klass_str = klass.to_s
-    @collection.detect {|bd| bd.klass.to_s == klass_str}
+    @collection.detect {|bd| bd.klass == klass}
+  end
+
+  # Returns bean definition for specific class
+  # @param bean_name [Symbol]
+  # @param package [Symbol]
+  # @param context [Symbol]
+  # @return bean definition [BeanDefinition] or nil
+  def find_bean(bean_name, package, context)
+    @collection.detect {|bd| bd.name == bean_name && bd.package == package && bd.context == context}
   end
 
   def filter_by(bean_name, package = nil, context = nil)

data/lib/smart_ioc/bean_factory.rb

@@ -31,7 +31,7 @@ class SmartIoC::BeanFactory
   # @return bean instance
   # @raise [ArgumentError] if bean is not found
   # @raise [ArgumentError] if ambiguous bean definition was found
-  def get_bean(bean_name, package: nil, parent_bean_definition: nil, context: nil)
+  def get_bean(bean_name, package: nil, parent_bean_definition: nil, context: nil, parent_bean_name: nil)
     check_arg(bean_name, :bean_name, Symbol)
     check_arg(package, :package, Symbol) if package
     check_arg(parent_bean_definition, :parent_bean_definition, SmartIoC::BeanDefinition) if parent_bean_definition
@@ -40,7 +40,7 @@ class SmartIoC::BeanFactory
     @bean_file_loader.require_bean(bean_name)
 
     parent_package_name = parent_bean_definition ? parent_bean_definition.package : nil
-    context = autodetect_context(bean_name, package, parent_package_name, context)
+    context = autodetect_context(bean_name, package, parent_package_name, context, parent_bean_name)
     bean_definition = @bean_definitions_storage.find(bean_name, package, context, parent_package_name)
     scope = get_scope(bean_definition)
     bean = scope.get_bean(bean_definition.klass)
@@ -76,18 +76,18 @@ class SmartIoC::BeanFactory
     bean
   end
 
-  def autodetect_context(bean_name, package, parent_bean_package, context)
+  def autodetect_context(bean_name, package, parent_bean_package, context, parent_bean_name)
     return context if context
 
     if package
       @extra_package_contexts.get_context(package)
     else
-      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package)
+      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package, parent_bean_name)
       @extra_package_contexts.get_context(bean_definition.package)
     end
   end
 
-  def autodetect_bean_definition(bean, package, parent_bean_package)
+  def autodetect_bean_definition(bean, package, parent_bean_package, parent_bean_name)
     if package
       bean_context = @extra_package_contexts.get_context(package)
       bds = @bean_definitions_storage.filter_by_with_drop_to_default_context(bean, package, bean_context)
@@ -120,8 +120,10 @@ class SmartIoC::BeanFactory
     end
 
     if smart_bds.size > 1
+      require 'byebug'
+      debugger
       raise ArgumentError.new(
-%Q(Unable to autodetect bean :#{bean}.
+%Q(Unable to autodetect bean :#{bean}#{parent_bean_name ? " for bean :#{parent_bean_name}" : ''}.
 Several definitions were found:\n
 #{smart_bds.map(&:inspect).join("\n\n")}.
 Set package directly for injected dependency

data/lib/smart_ioc/container.rb

@@ -57,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}.
@@ -88,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
@@ -117,12 +117,13 @@ module SmartIoC
     # @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, parent_bean_definition: nil)
+    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
 

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,6 +27,35 @@ 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]
@@ -33,8 +66,9 @@ module SmartIoC::Iocify
     # @return nil
     def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil, after_init: nil)
       file_path = caller[0].split(':').first
-
-      bean_definition = SmartIoC.get_bean_definition_by_class(self)
+      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
@@ -68,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
@@ -79,14 +124,14 @@ 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
@@ -97,18 +142,18 @@ module SmartIoC::Iocify
         return bean if bean
 
         klass = self.is_a?(Class) ? self : self.class
-        bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(klass)
 
         bean = SmartIoC::Container.get_instance.get_bean(
           ref || bean_name,
           package: from,
-          parent_bean_definition: bean_definition
+          parent_bean_definition: bd,
+          parent_bean_name: bd.name,
         )
 
         instance_variable_set(:"@#{bean_name}", bean)
       end
 
-      if bean_definition.is_instance?
+      if bd.is_instance?
         define_method bean_name, &bean_method
         private bean_name
       else

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.3.2"
+  VERSION = "0.3.5"
 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

@@ -16,8 +16,7 @@ describe SmartIoC::BeanDefinition do
       )
 
       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
@@ -56,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
@@ -154,7 +169,7 @@ describe SmartIoC::BeanFactory do
     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
 
@@ -162,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
 

data/spec/smart_ioc/object_spec.rb

@@ -32,7 +32,7 @@ describe Object do
                        factory_method: :my_method, context: :test
       end
 
-      @bean_definition = SmartIoC.get_bean_definition_by_class(BeanClass)
+      @bean_definition = SmartIoC.get_bean_definition(:my_bean, :my_package, :test)
     end
 
     it { expect(@bean_definition.name).to eq(:my_bean) }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2020-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ files:
 - docs/index.md
 - lib/smart_ioc.rb
 - lib/smart_ioc/args.rb
+- lib/smart_ioc/bean.rb
 - lib/smart_ioc/bean_definition.rb
 - lib/smart_ioc/bean_definitions_storage.rb
 - lib/smart_ioc/bean_dependency.rb
@@ -133,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Inversion of Control Container