smart_ioc 0.2.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81383d74ab85a917a839bd753f21154948881011
-  data.tar.gz: 7d0e016b96264f7e48e42f94ec592109f9309fb4
+SHA256:
+  metadata.gz: de564b00fb136146fd0f4d4182fe58f7cd9f1bd56c01a23ccc7aca185befc7e8
+  data.tar.gz: d9cb0e43111c988b77d8454fc3b7f45cf4aa2109a76839f2da17135eaef57e52
 SHA512:
-  metadata.gz: 0fb8b1b59d3a435c7e675c49365f52edcd7eaf845aeb222c210a92236369c6ec7f5f31e911c5d87532e246337cf205ac45b94f62bac24bfcea87e6006ee54f23
-  data.tar.gz: b74b9a016020a0e0d0ca23adb4055b117827f1b59ca3ac8af7b0604307fa8679116c769f0a2a72398902c65c988111ce97397ac0142da4778fc2513589b2e5d4
+  metadata.gz: 4a5a9d63019c4a0fabda18691014bbaf510ef703e1592a00a97bae1a582f523cfa8328c826a331764602664346771033ef3bf2d49bb3b27a98d9830e2f465f98
+  data.tar.gz: 9ae3b6e48602c173ca5ef0544c587c156d10e89616bbcdfb53ae293c98a4b6d047a3d2e01712b072ecfdc6bd519391735b20b12425ce513c9ebd6abb8d87d118

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 group :test do
   gem 'rspec'
   gem 'simplecov'
+  gem 'byebug'
 end

data/Gemfile.lock

@@ -1,44 +1,45 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.2.4)
+    smart_ioc (0.3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    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
   rspec
@@ -46,4 +47,4 @@ DEPENDENCIES
   smart_ioc!
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/lib/smart_ioc.rb

@@ -1,4 +1,5 @@
 require 'smart_ioc/version'
+require 'benchmark'
 
 module SmartIoC
   autoload :Args,                   'smart_ioc/args'
@@ -29,15 +30,32 @@ module SmartIoC
   require 'smart_ioc/railtie' if defined?(Rails)
 
   class << self
+    def is_benchmark_mode
+      @benchmark_mode
+    end
+
     # @param package_name [String or Symbol] package name for bean definitions
     # @param dir [String] absolute path with bean definitions
     # @return nil
     def find_package_beans(package_name, dir)
-      bean_locator = SmartIoC::BeanLocator.new
-      bean_locator.locate_beans(package_name.to_sym, dir)
+      time = Benchmark.realtime do
+        bean_locator = SmartIoC::BeanLocator.new
+        bean_locator.locate_beans(package_name.to_sym, dir)
+      end
+
+      time *= 1000
+
+      if is_benchmark_mode
+        puts "Search finished for '#{package_name}'. Time taken: #{"%.2f ms" % time}"
+      end
+
       nil
     end
 
+    def benchmark_mode(flag)
+      @benchmark_mode = !!flag
+    end
+
     # Load all beans (usually required for production env)
     def load_all_beans
       BeanLocations.all_bean_names.each do |bean|
@@ -55,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|
@@ -64,3 +82,5 @@ module SmartIoC
    end
   end
 end
+
+require 'smart_ioc/bean'

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.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

@@ -2,9 +2,9 @@ class SmartIoC::BeanDefinition
   include SmartIoC::Args
 
   attr_reader :name, :package, :path, :klass, :scope, :instance, :factory_method,
-              :context, :dependencies
+              :context, :dependencies, :after_init
 
-  def initialize(name:, package:, path:, klass:, scope:, context:, instance:, factory_method:)
+  def initialize(name:, package:, path:, klass:, scope:, context:, instance:, factory_method:, after_init:)
     not_nil(name, :name)
     not_nil(package, :package)
     not_nil(path, :path)
@@ -20,6 +20,7 @@ class SmartIoC::BeanDefinition
     @scope          = scope
     @instance       = instance
     @factory_method = factory_method
+    @after_init     = after_init
     @context        = context
 
     @dependencies = []
@@ -46,12 +47,15 @@ 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?
+    SmartIoC::Scopes::Singleton::VALUE == @scope
   end
 
   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)
@@ -73,10 +81,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

@@ -1,5 +1,3 @@
-require 'thread'
-
 # Instantiates beans according to their scopes
 class SmartIoC::BeanFactory
   include SmartIoC::Errors
@@ -28,142 +26,68 @@ 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, 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
     check_arg(context, :context, Symbol) if context
 
-    @semaphore.synchronize do
-      result = get_or_build_bean(bean_name, package, context)
-    end
-  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)
-    scope_bean      = scope.get_bean(bean_definition.klass)
-    is_recursive    = history.include?(bean_name)
-
-    history << bean_name
-
-    if scope_bean && scope_bean.loaded
-      update_dependencies(scope_bean.bean, bean_definition)
-      scope_bean.bean
-    else
-      if is_recursive
-        raise LoadRecursion.new(bean_definition)
-      end
-
-      beans_cache = init_bean_definition_cache(bean_definition)
+    parent_package_name = parent_bean_definition ? parent_bean_definition.package : nil
+    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)
 
-      autodetect_bean_definitions_for_dependencies(bean_definition)
-      preload_beans(bean_definition, beans_cache[bean_definition])
-      load_bean(bean_definition, beans_cache)
+    if !bean
+      bean = init_bean(bean_definition)
     end
-  end
 
-  def load_bean(bean_definition, beans_cache)
-    bd_opts    = beans_cache[bean_definition]
-    scope_bean = bd_opts[:scope_bean]
+    scope.save_bean(bean_definition.klass, bean)
+    bean
+  rescue SmartIoC::Errors::AmbiguousBeanDefinition => e
+    e.parent_bean_definition = parent_bean_definition
+    raise e
+  end
 
-    bean_definition.dependencies.each do |dependency|
-      bd             = dependency.bean_definition
-      dep_db_opts    = bd_opts[:dependencies][dependency.bean_definition]
-      dep_scope_bean = dep_db_opts[:scope_bean]
-      dep_bean       = load_bean(bd, bd_opts[:dependencies])
+  private
 
-      scope_bean.bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
+  def init_bean(bean_definition)
+    bean = if bean_definition.is_instance?
+      bean_definition.klass.allocate
+    else
+      bean_definition.klass
     end
 
-    if !scope_bean.loaded
-      scope_bean.set_bean(scope_bean.bean.send(bean_definition.factory_method), true)
+    if bean_definition.has_factory_method?
+      bean = bean.send(bean_definition.factory_method)
     end
 
-    scope_bean.bean
-  end
-
-  def inject_beans(bean_definition, beans_cache)
-    bean = beans_cache[:scope_bean].bean
-    bean_definition.dependencies.each do |dependency|
-      bd = dependency.bean_definition
-      dep_bean = beans_cache[:dependencies][bd][:scope_bean].bean
-      bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
-      inject_beans(bd, beans_cache[:dependencies][bd])
+    if bean_definition.after_init
+      bean.send(bean_definition.after_init)
     end
-  end
-
-  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|
-      bd = autodetect_bean_definition(
-        dependency.ref, dependency.package, bean_definition.package
-      )
-
-      scope    = get_scope(bean_definition)
-      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_or_build_bean(bd.name, bd.package, bd.context)
 
-        bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
-
-        if !scope.is_a?(SmartIoC::Scopes::Prototype)
-          updated_beans[bd] = dep_bean
-        end
-      else
-        update_dependencies(dep_bean, bd, updated_beans)
-      end
-    end
+    bean
   end
 
-  def autodetect_context(bean_name, 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, nil)
-      bean_definition.context
-    end
-  end
-
-  def autodetect_bean_definitions_for_dependencies(bean_definition)
-    bean_definition.dependencies.each do |dependency|
-      next if dependency.bean_definition
-
-      @bean_file_loader.require_bean(dependency.ref)
-
-      dependency.bean_definition = autodetect_bean_definition(
-        dependency.ref, dependency.package, bean_definition.package
-      )
-
-      autodetect_bean_definitions_for_dependencies(dependency.bean_definition)
+      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)
@@ -196,7 +120,15 @@ class SmartIoC::BeanFactory
     end
 
     if smart_bds.size > 1
-      raise ArgumentError, "Unable to autodetect bean :#{bean}.\nSeveral definitions were found.\n#{smart_bds.map(&:inspect).join("\n\n")}. Set package directly for injected dependency"
+      require 'byebug'
+      debugger
+      raise ArgumentError.new(
+%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
+)
+      )
     end
 
     if smart_bds.size == 0
@@ -206,77 +138,6 @@ class SmartIoC::BeanFactory
     return smart_bds.first
   end
 
-  def preload_beans(bean_definition, beans_cache)
-    scope = get_scope(bean_definition)
-
-    if scope_bean = scope.get_bean(bean_definition.klass)
-      beans_cache[:scope_bean] = scope_bean
-    else
-      preload_bean_instance(bean_definition, beans_cache)
-    end
-
-    bean_definition.dependencies.each do |dependency|
-      bd = dependency.bean_definition
-
-      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, dep_bean_cache[bd])
-    end
-  end
-
-  def preload_bean_instance(bean_definition, beans_cache)
-    return if beans_cache[:scope_bean]
-
-    scope = get_scope(bean_definition)
-    scope_bean = scope.get_bean(bean_definition.klass)
-
-    if scope_bean
-      beans_cache[:scope_bean] = scope_bean
-      return scope_bean
-    end
-
-    bean = if bean_definition.is_instance?
-      bean_definition.klass.allocate
-    else
-      bean_definition.klass
-    end
-
-    scope_bean = SmartIoC::Scopes::Bean.new(bean, !bean_definition.has_factory_method?)
-
-    scope.save_bean(bean_definition.klass, scope_bean)
-    beans_cache[:scope_bean] = scope_bean
-
-    scope_bean
-  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 get_cross_refference(refer_bean_definitions, current_bean_definition, seen_bean_definitions = [])
-    current_bean_definition.dependencies.each do |dependency|
-      bd = dependency.bean_definition
-
-      next if seen_bean_definitions.include?(bd)
-
-      if refer_bean_definitions.include?(bd)
-        return bd
-      end
-
-      if crbd = get_cross_refference(refer_bean_definitions, bd, seen_bean_definitions + [bd])
-        return crbd
-      end
-    end
-
-    nil
-  end
-
   def all_scopes
     [@singleton_scope, @prototype_scope, @thread_scope]
   end