smart_ioc 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e3fac1f32289e170915d3251e88d937f970f6396ef7d6a8c7b2163696001f2
-  data.tar.gz: 15f36e9c706c0cfdb59c86e8f40cf1106361346b0f0def709f9618b3821cc865
+  metadata.gz: ec0b7417468b3bf40350a297a885266b3067809f6ca074326614b8663ca762bb
+  data.tar.gz: 6508ed9fdee9191479459541718c63172bd7a9d47fa1de63bdd9ab883737927b
 SHA512:
-  metadata.gz: 11fae8af77f705ecdbd3a6039dd5c148abd28fc5ef8e584644179f76f23f1c061f4dc4c049a593f308037ef0e1f033c0cd6641e3d761447e51a97c6ea3699efd
-  data.tar.gz: 82ea8d86866fe7eace9a1db47da5fd87457cd499425387aa977d086ac514525463902e8f4f8261ae91c4ba9e35ddc0b4f25761303552e35c63c05edd34d2ba7a
+  metadata.gz: 2daa5061878b44419bbb0d3e4e2c5c7edcc526259b27e04f1600a3b2c994e06a03722c160e6b6c01a67a587cb99efa2dd385bbc215f275989ec0e622d78eb9a7
+  data.tar.gz: fb7fbdc1dc05f2462f5aaf399564423798129e9e6ed324dceaa8e47747707083c40857f6528047c0d703b2cad45889900cf60924e33d339e775ef31215c97f66

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+3.1.1

data/Gemfile.lock

@@ -1,38 +1,36 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.3.6)
+    smart_ioc (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    codecov (0.2.5)
-      colorize
-      json
-      simplecov
-    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)
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    simplecov (0.18.5)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
 
 PLATFORMS
   ruby
@@ -47,4 +45,4 @@ DEPENDENCIES
   smart_ioc!
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/lib/smart_ioc/bean_definition.rb

@@ -47,7 +47,7 @@ class SmartIoC::BeanDefinition
   end
 
   def ==(bean_definition)
-    bean_definition.name == @name && bean_definition.package == @package && bean_definition.context == @context
+    bean_definition.klass == @klass
   end
 
   def singleton?
@@ -56,6 +56,7 @@ 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

@@ -21,14 +21,12 @@ class SmartIoC::BeanDefinitionsStorage
 
     if existing_bd
       error_msg =
-%Q(Unable to add bean to definitions storage.
+%Q(Not able to add bean to definitions storage.
 Bean definition already exists.
-
 New bean details:
-#{bean_definition.inspect}
-
+  #{bean_definition.inspect}
 Existing bean details:
-#{existing_bd.inspect})
+  #{existing_bd.inspect})
 
       raise ArgumentError, error_msg
     end
@@ -48,16 +46,8 @@ Existing bean details:
   # @param klass [Class] bean class
   # @return bean definition [BeanDefinition] or nil
   def find_by_class(klass)
-    @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}
+    klass_str = klass.to_s
+    @collection.detect {|bd| bd.klass.to_s == klass_str}
   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, parent_bean_name: nil)
+  def get_bean(bean_name, package: nil, parent_bean_definition: nil, context: 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, parent_bean_name)
+    context = autodetect_context(bean_name, package, parent_package_name, context)
     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, parent_bean_name)
+  def autodetect_context(bean_name, package, parent_bean_package, context)
     return context if context
 
     if package
       @extra_package_contexts.get_context(package)
     else
-      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package, parent_bean_name)
+      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package)
       @extra_package_contexts.get_context(bean_definition.package)
     end
   end
 
-  def autodetect_bean_definition(bean, package, parent_bean_package, parent_bean_name)
+  def autodetect_bean_definition(bean, package, parent_bean_package)
     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)
@@ -121,7 +121,7 @@ class SmartIoC::BeanFactory
 
     if smart_bds.size > 1
       raise ArgumentError.new(
-%Q(Unable to autodetect bean :#{bean}#{parent_bean_name ? " for bean :#{parent_bean_name}" : ''}.
+%Q(Unable to autodetect bean :#{bean}.
 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,6 +57,8 @@ 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}.
@@ -86,12 +88,10 @@ module SmartIoC
     end
 
     # Returns bean definition for specific class
-    # @param bean_name [Symbol]
-    # @param package [Symbol]
-    # @param context [Symbol]
+    # @param klass [Class] class name
     # return [BeanDefinition]
-    def get_bean_definition(bean_name, package, context)
-      bean_definitions_storage.find_bean(bean_name, package, context)
+    def get_bean_definition_by_class(klass)
+      bean_definitions_storage.find_by_class(klass)
     end
 
     # Sets new load proc
@@ -117,13 +117,12 @@ 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, parent_bean_name: nil)
+    def get_bean(bean_name, package: nil, context: nil, parent_bean_definition: 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,9 +2,6 @@
 # Example of usage:
 # class Bar
 #   bean :bar
-#
-#   def call
-#   end
 # end
 #
 # class Foo
@@ -15,7 +12,6 @@
 #   inject :some_bar, ref: bar, from: :repository
 #
 #   def hello_world
-#     some_bar.call
 #     puts 'Hello world'
 #   end
 # end
@@ -27,35 +23,6 @@ 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]
@@ -64,11 +31,10 @@ module SmartIoC::Iocify
     # @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, 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)
+    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)
 
       if bean_definition
         if bean_definition.path == file_path
@@ -102,20 +68,9 @@ 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
@@ -124,14 +79,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 register_inject(bean_name, ref: nil, from: nil)
-      if !@bean_definition
+    def inject(bean_name, ref: nil, from: nil)
+      bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(self)
+
+      if bean_definition.nil?
         raise ArgumentError, "#{self.to_s} is not registered as bean. Add `bean :bean_name` declaration"
       end
 
-      bd = @bean_definition
-
-      bd.add_dependency(
+      bean_definition.add_dependency(
         bean_name: bean_name,
         ref:       ref,
         package:   from
@@ -142,18 +97,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: bd,
-          parent_bean_name: bd.name,
+          parent_bean_definition: bean_definition
         )
 
         instance_variable_set(:"@#{bean_name}", bean)
       end
 
-      if bd.is_instance?
+      if bean_definition.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.6"
+  VERSION = "0.4.0"
 end

data/lib/smart_ioc.rb

@@ -1,5 +1,6 @@
 require 'smart_ioc/version'
 require 'benchmark'
+require 'forwardable'
 
 module SmartIoC
   autoload :Args,                   'smart_ioc/args'
@@ -73,14 +74,18 @@ module SmartIoC
       Container.get_instance
     end
 
-    [: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|
-        container.send(name, *args, &block)
-      end
-   end
+    extend Forwardable
+
+    container_methods = [
+      :register_bean,
+      :get_bean_definition_by_class,
+      :set_extra_context_for_package,
+      :get_bean,
+      :clear_scopes,
+      :force_clear_scopes,
+      :set_load_proc
+    ]
+
+    def_delegators :container, *container_methods
   end
 end
-
-require 'smart_ioc/bean'

data/spec/smart_ioc/bean_definition_spec.rb

@@ -16,7 +16,8 @@ describe SmartIoC::BeanDefinition do
       )
 
       str =
-"name:           :test_bean
+"class:          Object
+name:           :test_bean
 package:        :test_package
 context:        :default
 path:           current_dir

data/spec/smart_ioc/bean_factory_spec.rb

@@ -4,42 +4,27 @@ describe SmartIoC::BeanFactory do
   before :all do
     SmartIoC.clear
 
-    bean :repo do
-      context :default
-      package :bean_factory
-
-      def call
-        'default'
-      end
+    class Repo
+      include SmartIoC::Iocify
+      bean :repo, context: :default, package: :bean_factory
     end
 
-    bean :repo do
-      context :test
-      package :bean_factory
-
-      inject :dao
-
-      def call
-        dao.call
-        'test'
-      end
+    class TestRepo
+      include SmartIoC::Iocify
+      bean :repo, context: :test, package: :bean_factory
     end
 
-    bean :dao do
-      context :default
-      package :bean_factory
-      
-      def call
-        'dao'
-      end
+    class DAO
+      include SmartIoC::Iocify
+      bean :dao, context: :default, package: :bean_factory
     end
 
     class TestObject
     end
 
-    bean :factory do
-      factory_method :build_bean
-      package        :bean_factory
+    class Factory
+      include SmartIoC::Iocify
+      bean :factory, factory_method: :build_bean, package: :bean_factory
 
       def build_bean
         TestObject.new
@@ -71,17 +56,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).call).to eq('test')
+    expect(SmartIoC.get_bean(:repo)).to be_a(TestRepo)
   end
 
   it 'returns proper bean for default context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :default)
-    expect(SmartIoC.get_bean(:repo).call).to eq('default')
+    expect(SmartIoC.get_bean(:repo)).to be_a(Repo)
   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).call).to eq('dao')
+    expect(SmartIoC.get_bean(:dao)).to be_a(DAO)
   end
 
   it 'updates dependencies' do
@@ -169,7 +154,7 @@ describe SmartIoC::BeanFactory do
     end
 
     it 'injects prototype beans with different object id' do
-      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
+      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
 
@@ -177,7 +162,7 @@ describe SmartIoC::BeanFactory do
     end
 
     it 'injects singleton beans with same object id' do
-      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
+      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
 

data/spec/smart_ioc/bean_locator_spec.rb

@@ -13,8 +13,8 @@ describe SmartIoC::BeanLocator do
     locations = SmartIoC::BeanLocations.get_bean_locations(:repository)
 
     expect(locations[:test].size).to eq(3)
-    expect(locations[:test][0]).to match(/example\/admins\/repository\/test\/admins_repository.rb/)
-    expect(locations[:test][1]).to match(/example\/admins\/repository\/admins_repository.rb/)
+    expect(locations[:test][0]).to match(/example\/admins\/repository\/admins_repository.rb/)
+    expect(locations[:test][1]).to match(/example\/admins\/repository\/test\/admins_repository.rb/)
     expect(locations[:test][2]).to match(/example\/users\/repository\/users_repository.rb/)
   }
 

data/spec/smart_ioc/example/admins/repository/admins_dao.rb

@@ -1,5 +1,7 @@
-bean :dao do
-  after_init :setup
+class AdminsDAO
+  include SmartIoC::Iocify
+
+  bean :dao, instance: false, after_init: :setup
 
   inject :config
 

data/spec/smart_ioc/example/admins/repository/admins_repository.rb

@@ -1,7 +1,13 @@
-bean :repository do
+class AdminsRepository
+  include SmartIoC::Iocify
+
+  bean :repository
+
   inject :dao
   inject :users_creator
 
+  public :users_creator
+
   def put(user)
     dao.insert(user)
   end

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(:my_bean, :my_package, :test)
+      @bean_definition = SmartIoC.get_bean_definition_by_class(BeanClass)
     end
 
     it { expect(@bean_definition.name).to eq(:my_bean) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,6 @@ 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
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Inversion of Control Container

data/lib/smart_ioc/bean.rb

@@ -1,33 +0,0 @@
-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)
-
-  file_path = caller[0].split(':').first
-  package   = SmartIoC::BeanLocations.get_bean_package(file_path)
-
-  klass.instance_exec do
-    bean(
-      bean_name,
-      file_path:      file_path,
-      scope:          instance_variable_get(:@scope) || nil,
-      package:        instance_variable_get(:@package) || package,
-      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