smart_ioc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf89316b5fdc41e85e9cadcf0d5d4c0793aba48e
-  data.tar.gz: 52767b97eecaf1fba1141e3741139ba8871ecde5
+  metadata.gz: 8afa36b74a66cb6082823684679f4fd9d5f974f0
+  data.tar.gz: 715809ca8d2dcbb7020acad09ba3a6f39e4883f1
 SHA512:
-  metadata.gz: 81d0b186ff1b8922d06add551b86376def059037bb49e890d1153986826125ff49ca2991103a63074a63daf96e85b31b680dc677c1943791ade889e7ad940909
-  data.tar.gz: ed5f32ac7c938c24100e7ab4c6560fd493117fc8798285aa7142004ec4afb07b03c9bac6c7a4dba168235c5d8d054866f67188d644fd88843e4114191850c4e4
+  metadata.gz: 4badf8cf4a9da4a48909e7d827f1881d50c003415f50cb1d763976f4e2d8ece131c4b2b4f4860dd3338d0cf1d5bf8d41d2e5bce343f3612b0b9f4c46ba1d30f0
+  data.tar.gz: cb8e5693a785030019776cbabf90f9d5abeeed5cb0726efb96292cb20f078ed5d9cd51bbe7edf1fd9af707890387db0328eef7efc05add950e3a279cd8f22f52

data/Gemfile.lock

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

data/lib/smart_ioc/args.rb

@@ -1,7 +1,7 @@
 module SmartIoC::Args
   def check_arg(value, name, klass)
     if !value.is_a?(klass)
-      raise ArgumentError, ":#{name} should be a #{klass}"
+      raise ArgumentError, ":#{name} should be a #{klass}. Got #{value.class}: #{value.inspect}"
     end
   end
 

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -73,10 +73,21 @@ Existing bean details:
   # @bean_name [Symbol] bean name
   # @package [Symbol, nil] package name
   # @context [Symbol, nil] context
+  # @package [Symbol, nil] parent_package name of parent package
   # @raises AmbiguousBeanDefinition if multiple bean definitions are found
-  def find(bean_name, package = nil, context = nil)
+  def find(bean_name, package = nil, context = nil, parent_package = nil)
     bds = filter_by_with_drop_to_default_context(bean_name, package, context)
 
+    if bds.size > 1 && parent_package
+      bean_definition = bds.detect do |bd|
+        bd.package == parent_package
+      end
+
+      if bean_definition
+        bds = [bean_definition]
+      end
+    end
+
     if bds.size > 1
       raise AmbiguousBeanDefinition.new(bean_name, bds)
     elsif bds.size == 0

data/lib/smart_ioc/bean_factory.rb

@@ -26,19 +26,22 @@ class SmartIoC::BeanFactory
   # Get bean from the container by it's name, package, context
   # @param bean_name [Symbol] bean name
   # @param package [Symbol] package name
+  # @param parent_bean_definition [SmartIoC::BeanDefinition] parent bean definition
   # @param context [Symbol] context
   # @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, context: 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
     check_arg(context, :context, Symbol) if context
 
     @bean_file_loader.require_bean(bean_name)
 
-    context = autodetect_context(bean_name, package, context)
-    bean_definition = @bean_definitions_storage.find(bean_name, package, context)
+    parent_package_name = parent_bean_definition ? parent_bean_definition.package : nil
+    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)
 
@@ -48,6 +51,9 @@ class SmartIoC::BeanFactory
 
     scope.save_bean(bean_definition.klass, bean)
     bean
+  rescue SmartIoC::Errors::AmbiguousBeanDefinition => e
+    e.parent_bean_definition = parent_bean_definition
+    raise e
   end
 
   private
@@ -70,13 +76,13 @@ class SmartIoC::BeanFactory
     bean
   end
 
-  def autodetect_context(bean_name, package, context)
+  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, nil)
+      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package)
       bean_definition.context
     end
   end

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
@@ -118,10 +114,16 @@ 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)
+      bean_factory.get_bean(
+        bean_name,
+        package: package,
+        parent_bean_definition: parent_bean_definition,
+        context: context,
+      )
     end
 
     def clear_scopes

data/lib/smart_ioc/errors.rb

@@ -6,12 +6,20 @@ module SmartIoC::Errors
   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/iocify.rb

@@ -95,7 +95,17 @@ module SmartIoC::Iocify
       bean_method = Proc.new do
         bean = instance_variable_get(:"@#{bean_name}")
         return bean if bean
-        instance_variable_set(:"@#{bean_name}", SmartIoC::Container.get_bean(ref || bean_name, from))
+
+        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
+        )
+
+        instance_variable_set(:"@#{bean_name}", bean)
       end
 
       if bean_definition.is_instance?

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

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

@@ -3,7 +3,7 @@ class AdminsRepository
 
   bean :repository
 
-  inject :dao, from: :admins
+  inject :dao
   inject :users_creator
 
   public :users_creator

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler