smart_ioc 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5397abe56282d5f41ac3b7cef502fa15e7fd457e
-  data.tar.gz: 6eb3ea3abaaa91cf5fd1a93689d6109ba81862ac
+  metadata.gz: 352b07a40889da6bddbe42aac89e88b75f6d2d4a
+  data.tar.gz: b07c856f9db346aadffdb96ad3387abe3316213c
 SHA512:
-  metadata.gz: 90d799e2feb6a443305967f86e9201ee41ca3a10a68514d8b0817dc646fe333dc03ed062c55ee58221e8f67400d99c17df7cb61d1ad027874eda137272cf34ad
-  data.tar.gz: f447b52709d6f414fc596c9f6f55b9f93f5a1ee2671c4b658a094fad0bd5b2a66e4582dfe26df19d2f4f4b9c9dd559630ad21b6c51ae6ec69e90c1f424e58db3
+  metadata.gz: b762d682eedb6b5750ac3ded2b560f36589dc0438d243362e251cf587c622083f8b40e6722021121bdab5555dd1712c55f97271beb8cce55a9275cdb1c59762e
+  data.tar.gz: e58089f9a8548784fcd34746ad9e18ee78d29a2d6bd17c6207b843513a8acf8be69214314a06add0b3c9da90722a0810e3fe18b5a06aa49b5c7ea29539a09894

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

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

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.1.19)
+    smart_ioc (0.1.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (9.0.6)
-    codecov (0.1.9)
+    codecov (0.1.10)
       json
       simplecov
       url
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (2.0.2)
+    json (2.0.3)
     rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -28,7 +28,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -44,7 +44,8 @@ DEPENDENCIES
   codecov
   rake
   rspec
+  simplecov
   smart_ioc!
 
 BUNDLED WITH
-   1.13.6
+   1.14.5

data/lib/smart_ioc/args.rb

@@ -0,0 +1,19 @@
+module SmartIoC::Args
+  def check_arg(value, name, klass)
+    if !value.is_a?(klass)
+      raise ArgumentError, ":#{name} should be a #{klass}"
+    end
+  end
+
+  def check_arg_any(value, name, klasses)
+    if !klasses.detect {|klass| value.is_a?(klass)}
+      raise ArgumentError, ":#{name} should be any of #{klasses.inspect}"
+    end
+  end
+
+  def not_nil(value, name)
+    if value.nil?
+      raise ArgumentError, ":#{name} should not be blank"
+    end
+  end
+end

data/lib/smart_ioc/bean_definition.rb

@@ -1,4 +1,6 @@
 class SmartIoC::BeanDefinition
+  include SmartIoC::Args
+  
   attr_reader :name, :package, :path, :klass, :scope, :instance, :factory_method,
               :context, :dependencies
 
@@ -24,17 +26,9 @@ class SmartIoC::BeanDefinition
   end
 
   def add_dependency(bean_name:, ref: nil, package: nil)
-    if !bean_name.is_a?(Symbol)
-      raise ArgumentError, 'bean name should be a Symbol'
-    end
-
-    if ref && !ref.is_a?(Symbol)
-      raise ArgumentError, 'ref name should be a Symbol'
-    end
-
-    if package && !package.is_a?(Symbol)
-      raise ArgumentError, 'package/from should be a Symbol'
-    end
+    check_arg(bean_name, :bean_name, Symbol)
+    check_arg(ref, :ref, Symbol) if ref
+    check_arg(package, :package, Symbol) if package
 
     @dependencies << SmartIoC::BeanDependency.new(
       bean:    bean_name,
@@ -66,12 +60,4 @@ class SmartIoC::BeanDefinition
     str << "factory_method: #{@factory_method}"
     str.join("\n")
   end
-
-  private
-
-  def not_nil(value, name)
-    if value.nil?
-      raise ArgumentError, ":#{name} should not be blank"
-    end
-  end
 end

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -1,4 +1,6 @@
 class SmartIoC::BeanDefinitionsStorage
+  include SmartIoC::Errors
+
   def initialize
     @collection = []
   end
@@ -51,8 +53,24 @@ Existing bean details:
   end
 
   # @bean_name [Symbol] bean name
-  # @package [Symbol] package name
-  # @context [Array[Symbol]] context
+  # @package [Symbol, nil] package name
+  # @context [Symbol, nil] context
+  # @raises Errors::AmbiguousBeanDefinition if multiple bean definitions are found 
+  def find(bean_name, package = nil, context = nil)
+    bds = filter_by_with_drop_to_default_context(bean_name, package, context)
+
+    if bds.size > 1
+      raise Errors::AmbiguousBeanDefinition.new(bean_name, bds)
+    elsif bds.size == 0
+      raise Errors::BeanNotFound.new(bean_name)
+    end
+
+    bds.first
+  end
+
+  # @bean_name [Symbol] bean name
+  # @package [Symbol, nil] package name
+  # @context [Symbol, nil] context
   def filter_by_with_drop_to_default_context(bean_name, package = nil, context = nil)
     bean_definitions = @collection.select do |bd|
       bd.name == bean_name

data/lib/smart_ioc/bean_factory.rb

@@ -1,5 +1,8 @@
 # Instantiates beans according to their scopes
 class SmartIoC::BeanFactory
+  include SmartIoC::Errors
+  include SmartIoC::Args
+
   def initialize(bean_definitions_storage, extra_package_contexts)
     @bean_definitions_storage = bean_definitions_storage
     @extra_package_contexts   = extra_package_contexts
@@ -25,37 +28,64 @@ class SmartIoC::BeanFactory
   # @raise [ArgumentError] if bean is not found
   # @raise [ArgumentError] if ambiguous bean definition was found
   def get_bean(bean_name, package: nil, context: nil)
-    context ||= if package
-      @extra_package_contexts.get_context(package)
+    check_arg(bean_name, :bean_name, Symbol)
+    check_arg(package, :package, Symbol) if package
+    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)
+    scope           = get_scope(bean_definition)
+    bean            = scope.get_bean(bean_definition.klass)
+
+    if bean
+      update_dependencies(bean, bean_definition)
+      bean
     else
-      @bean_file_loader.require_bean(bean_name)
-      bean_definition = autodetect_bean_definition(bean_name, package, nil)
-      bean_definition.context
-    end
+      dependency_cache = {}
+      beans_cache      = {}
 
-    if !context.is_a?(Symbol)
-      raise ArgumentError, 'context should be a Symbol'
+      autodetect_bean_definitions_for_dependencies(bean_definition, dependency_cache)
+      preload_beans(bean_definition, dependency_cache, beans_cache)
+      load_bean(bean_definition, dependency_cache, beans_cache)
     end
+  end
 
-    @bean_file_loader.require_bean(bean_name)
+  private
 
-    bds = @bean_definitions_storage.filter_by_with_drop_to_default_context(bean_name, package, context)
-    if bds.size > 1
-      raise ArgumentError, "Unable to create bean :#{bean_name}.\nSeveral definitions were found.\n#{bds.map(&:inspect).join("\n\n")}"
-    elsif bds.size == 0
-      raise ArgumentError, "Unable to find bean :#{bean_name} in any packages"
-    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] || scope.get_bean(bd.class)
 
-    bean_definition = bds.first
-    dependency_cache = {}
-    beans_cache = {}
+      if !dep_bean
+        dep_bean = get_bean(
+          bd.name, package: bd.package, context: bd.context
+        )
 
-    autodetect_bean_definitions_for_dependencies(bean_definition, dependency_cache)
-    preload_beans(bean_definition, dependency_cache, beans_cache)
-    load_bean(bean_definition, dependency_cache, beans_cache)
+        bean.instance_variable_set(:"@#{dependency.bean}", dep_bean)
+        updated_beans[bd] = dep_bean
+      else
+        update_dependencies(dep_bean, bd, updated_beans)
+      end
+    end
   end
 
-  private
+  def autodetect_context(bean_name, 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.context
+    end
+  end
 
   def autodetect_bean_definitions_for_dependencies(bean_definition, dependency_cache)
     bean_definition.dependencies.each do |dependency|
@@ -117,7 +147,13 @@ class SmartIoC::BeanFactory
   end
 
   def preload_beans(bean_definition, dependency_cache, beans_cache)
-    preload_bean_instance(bean_definition, beans_cache)
+    scope = get_scope(bean_definition)
+
+    if bean = scope.get_bean(bean_definition.klass)
+      beans_cache[bean_definition] = bean
+    else
+      preload_bean_instance(bean_definition, beans_cache)
+    end
 
     bean_definition.dependencies.each do |dependency|
       bd = dependency_cache[dependency]
@@ -174,8 +210,10 @@ class SmartIoC::BeanFactory
     (zero_dep_bd_with_factory_methods + bd_with_factory_methods).each do |bean_definition|
       inject_beans(bean_definition, dependency_cache, beans_cache)
       bean = beans_cache[bean_definition]
-      bean = bean.send(bean_definition.factory_method)
+      bean = bean.send(bean_definition.factory_method) if bean.is_a?(bean_definition.klass)
       beans_cache[bean_definition] = bean
+      scope = get_scope(bean_definition)
+      scope.save_bean(bean_definition.klass, bean)
     end
 
     inject_beans(bean_definition, dependency_cache, beans_cache)
@@ -211,18 +249,6 @@ class SmartIoC::BeanFactory
     nil
   end
 
-  def set_bean_dependencies(bean, bean_definition, parent_bean_package)
-    bean_definition.dependencies.each do |dependency|
-      context = if dependency.package
-        @extra_package_contexts.get_context(dependency.package)
-      end
-
-      dependent_bean = get_or_load_bean(dependency.ref, dependency.package, context, bean_definition.package)
-
-      bean.instance_variable_set(:"@#{dependency.bean}", dependent_bean)
-    end
-  end
-
   def all_scopes
     [@singleton_scope, @prototype_scope, @thread_scope]
   end

data/lib/smart_ioc/bean_locations.rb

@@ -46,8 +46,10 @@ class SmartIoC::BeanLocations
 
     def load_all
       @data.each do |package, bean_locations|
-        bean_locations.each do |bean, path|
-          load(path)
+        bean_locations.each do |bean, paths|
+          paths.each do |path|
+            load(path)
+          end
         end
       end
     end

data/lib/smart_ioc/bean_locator.rb

@@ -1,15 +1,13 @@
 class SmartIoC::BeanLocator
+  include SmartIoC::Args
+  
   BEAN_PATTERN = /bean\s+(:[a-zA-z0-9\-\_]+)/
 
   # @param package_name [Symbol] package name for bean (ex: :repository)
   # @param dir [String] absolute path for directory with bean definitions
   # @return nil
   def locate_beans(package_name, dir)
-    if !package_name.is_a?(Symbol)
-      raise ArgumentError, 'package name should be a symbol'
-    end
-
-    package_name = package_name
+    check_arg(package_name, :package_name, Symbol)
 
     Dir.glob(File.join(dir, '**/*.rb')).each do |file_path|
       source_str = File.read(file_path)

data/lib/smart_ioc/container.rb

@@ -1,6 +1,8 @@
 module SmartIoC
   # SmartIoC::Container is a beans store used for dependency injection
   class Container
+    include SmartIoC::Args
+    
     DEFAULT_CONTEXT = :default
 
     class << self
@@ -29,32 +31,15 @@ module SmartIoC
     # @return [SmartIoC::BeanDefinition] bean definition
     def register_bean(bean_name:, klass:, context:, scope:, path:,
                       factory_method: nil, package_name: nil, instance: true)
-      if !bean_name.is_a?(Symbol)
-        raise ArgumentError, 'bean name should be a Symbol'
-      end
-
-      if !klass.is_a?(Class)
-        raise ArgumentError, 'bean class should be a Class'
-      end
-
-      if !path.is_a?(String)
-        raise ArgumentError, 'path should be a String'
-      end
-
-      if !(instance.is_a?(TrueClass) || instance.is_a?(FalseClass))
-        raise ArgumentError, 'instance should be true or false'
-      end
-
-      if (factory_method && !factory_method.is_a?(Symbol))
-        raise ArgumentError, 'factory method should be a Symbol'
-      end
-
       context ||= DEFAULT_CONTEXT
-
-      if !context.is_a?(Symbol)
-        raise ArgumentError, 'context should be a Symbol'
-      end
-
+      
+      check_arg(bean_name, :bean_name, Symbol)
+      check_arg(context, :context, Symbol)
+      check_arg(klass, :klass, Class)
+      check_arg(path, :path, String)
+      check_arg(factory_method, :factory_method, Symbol) if factory_method
+      check_arg_any(instance, :instance, [TrueClass, FalseClass])
+      
       scope ||= SmartIoC::Scopes::Singleton::VALUE
 
       allowed_scopes = [

data/lib/smart_ioc/errors.rb

@@ -0,0 +1,17 @@
+module SmartIoC::Errors
+  class BeanNotFound < StandardError
+    def initialize(bean_name)
+      super("Unable to find bean :#{bean_name} in any packages")
+    end
+  end
+
+  class AmbiguousBeanDefinition < StandardError
+    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")}
+      ))
+    end
+  end
+end

data/lib/smart_ioc/extra_package_contexts.rb

@@ -1,4 +1,6 @@
 class SmartIoC::ExtraPackageContexts
+  include SmartIoC::Args
+
   def initialize
     @data = {}
   end
@@ -6,13 +8,8 @@ class SmartIoC::ExtraPackageContexts
   # @param package_name [Symbol]
   # @param context [Symbol]
   def set_context(package_name, context)
-    if !package_name.is_a?(Symbol)
-      raise ArgumentError, "package name should be a Symbol"
-    end
-
-    if !context.is_a?(Symbol)
-      raise ArgumentError, "context should be a Symbol"
-    end
+    check_arg(package_name, :package_name, Symbol)
+    check_arg(context, :context, Symbol)
 
     @data[package_name] = context
   end

data/lib/smart_ioc/iocify.rb

@@ -33,12 +33,12 @@ module SmartIoC::Iocify
     def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil)
       file_path = caller[0].split(':').first
 
-      bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(self)
+      bean_definition = SmartIoC.get_bean_definition_by_class(self)
 
       # skip if bean was registered
       return if bean_definition
 
-      bean_definition = SmartIoC::Container.get_instance.register_bean(
+      bean_definition = SmartIoC.register_bean(
         bean_name:      bean_name,
         klass:          self,
         scope:          scope,
@@ -72,7 +72,7 @@ module SmartIoC::Iocify
       bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(self)
 
       if bean_definition.nil?
-        raise ArgumentError, "current class is not registered as bean. Add bean :bean_name declaration"
+        raise ArgumentError, "#{self.to_s} is not registered as bean. Add `bean :bean_name` declaration"
       end
 
       bean_definition.add_dependency(

data/lib/smart_ioc/scopes/prototype.rb

@@ -1,4 +1,4 @@
-# Prototype scope instantiates new bean instance on each call
+# Prototype scope instantiates new bean instance on each SmartIoC.get_bean call
 class SmartIoC::Scopes::Prototype
   VALUE = :prototype
 

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/lib/smart_ioc.rb

@@ -1,6 +1,7 @@
 require 'smart_ioc/version'
 
 module SmartIoC
+  autoload :Args,                   'smart_ioc/args'
   autoload :BeanDefinition,         'smart_ioc/bean_definition'
   autoload :BeanDefinitionsStorage, 'smart_ioc/bean_definitions_storage'
   autoload :BeanDependency,         'smart_ioc/bean_dependency'
@@ -20,6 +21,10 @@ module SmartIoC
     autoload :Request,   'smart_ioc/scopes/request'
   end
 
+  module Errors
+    require 'smart_ioc/errors'
+  end
+
   class << self
     # @param package_name [String or Symbol] package name for bean definitions
     # @param dir [String] absolute path with bean definitions
@@ -32,13 +37,22 @@ module SmartIoC
 
     # Load all beans (usually required for production env)
     def load_all_beans
-      SmartIoC::BeanLocations.load_all
+      BeanLocations.load_all
     end
 
     # Full clear of data (mostly for tests)
     def clear
-      SmartIoC::BeanLocations.clear
-      SmartIoC::Container.clear
+      BeanLocations.clear
+      Container.clear
+    end
+
+    def container
+      Container.get_instance
     end
+
+    extend Forwardable
+
+    def_delegators :container, :register_bean, :get_bean_definition_by_class,
+                   :set_extra_context_for_package, :get_bean, :clear_scopes, :force_clear_scopes
   end
 end

data/spec/smart_ioc/bean_factory_spec.rb

@@ -18,20 +18,84 @@ describe SmartIoC::BeanFactory do
       include SmartIoC::Iocify
       bean :dao, context: :default, package: :bean_factory
     end
+
+    class TestObject
+    end
+
+    class Factory
+      include SmartIoC::Iocify
+      bean :factory, factory_method: :build_bean, package: :bean_factory
+
+      def build_bean
+        TestObject.new
+      end
+    end
+  end
+
+  it 'returns same instance for singleton scope' do
+    SmartIoC.set_extra_context_for_package(:bean_factory, :test)
+    instance1 = SmartIoC.get_bean(:repo)
+    instance2 = SmartIoC.get_bean(:repo)
+    expect(instance1.object_id).to eq(instance2.object_id)
+  end
+
+  it 'returns same instance for factory method and singleton scope' do
+    instance1_object_id = SmartIoC.get_bean(:factory).object_id
+    instance2_object_id = SmartIoC.get_bean(:factory).object_id
+    expect(instance1_object_id).to eq(instance2_object_id)
   end
 
   it 'returns proper bean for test context' do
-    SmartIoC::Container.get_instance.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC::Container.get_bean(:repo)).to be_a(TestRepo)
+    SmartIoC.set_extra_context_for_package(:bean_factory, :test)
+    expect(SmartIoC.get_bean(:repo)).to be_a(TestRepo)
   end
 
   it 'returns proper bean for default context' do
-    SmartIoC::Container.get_instance.set_extra_context_for_package(:bean_factory, :default)
-    expect(SmartIoC::Container.get_bean(:repo)).to be_a(Repo)
+    SmartIoC.set_extra_context_for_package(:bean_factory, :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::Container.get_instance.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC::Container.get_bean(:dao)).to be_a(DAO)
+    SmartIoC.set_extra_context_for_package(:bean_factory, :test)
+    expect(SmartIoC.get_bean(:dao)).to be_a(DAO)
+  end
+
+  it 'updates dependencies' do
+    class SingletonBean
+      include SmartIoC::Iocify
+      bean :singleton_bean, scope: :singleton, package: :test
+
+      inject :prototype_bean
+
+      attr_reader :prototype_bean
+    end
+
+    class SecondSingletonBean
+      include SmartIoC::Iocify
+      bean :second_singleton_bean, scope: :singleton, package: :test
+    end
+
+    class PrototypeBean
+      include SmartIoC::Iocify
+      bean :prototype_bean, scope: :prototype, package: :test
+
+      inject :second_singleton_bean
+
+      attr_reader :second_singleton_bean
+    end
+
+    bean1 = SmartIoC.get_bean(:singleton_bean, package: :test)
+    bean1_object_id = bean1.object_id
+    prototype_bean1_object_id = bean1.prototype_bean.object_id
+    second_singleton_bean1_object_id = bean1.prototype_bean.second_singleton_bean.object_id
+
+    bean2 = SmartIoC.get_bean(:singleton_bean, package: :test)
+    bean2_object_id = bean2.object_id
+    prototype_bean2_object_id = bean2.prototype_bean.object_id
+    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(second_singleton_bean1_object_id).to eq(second_singleton_bean2_object_id)
   end
 end

data/spec/smart_ioc/bean_file_loader_spec.rb

@@ -10,7 +10,7 @@ describe SmartIoC::BeanFileLoader do
     dir_path = File.join(File.expand_path(File.dirname(__FILE__)), 'example/utils')
     SmartIoC.find_package_beans(:utils, dir_path)
 
-    @container = SmartIoC::Container.get_instance
+    @container = SmartIoC.container
   end
 
   it 'requires beans only once' do

data/spec/smart_ioc/container_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe SmartIoC::Container do
+  it 'does not have initializer' do
+    expect {
+      SmartIoC::Container.new
+    }.to raise_error(ArgumentError, "SmartIoC::Container should not be allocated. Use SmartIoC::Container.get_instance instead")
+  end
+end

data/spec/smart_ioc/factory_method_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe 'Factory Method' do
+  before :all do
+    class TestService
+      include SmartIoC::Iocify
+
+      bean :test_service, package: :test
+
+      inject :test_config
+
+      attr_reader :test_config
+    end
+
+    class OtherService
+      include SmartIoC::Iocify
+
+      bean :other_service, package: :test
+
+      inject :test_config
+
+      attr_reader :test_config
+    end
+
+    class TestConfig
+      include SmartIoC::Iocify
+
+      bean :test_config, package: :test, factory_method: :build_config
+
+      class Config
+      end
+
+      def build_config
+        Config.new
+      end
+    end
+
+    @test_service = SmartIoC.get_bean(:test_service)
+    @other_service = SmartIoC.get_bean(:other_service)
+  end
+
+  it 'assigns bean with factory method' do
+    expect(@test_service.test_config).to be_a(TestConfig::Config)
+  end
+
+  it 'assigns bean with factory method' do
+    expect(@other_service.test_config).to be_a(TestConfig::Config)
+  end
+end

data/spec/smart_ioc/iocify_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe SmartIoC::Iocify do
+  it 'raises if inject method was used without bean declaration' do
+    expect {
+      class MyTestClass
+        include SmartIoC::Iocify
+
+        inject :some_bean
+      end
+    }.to raise_error(ArgumentError, "MyTestClass is not registered as bean. Add `bean :bean_name` declaration")
+  end
+end

data/spec/smart_ioc/object_spec.rb

@@ -31,19 +31,17 @@ describe Object do
         bean :my_bean, scope: :request, package: :my_package, instance: false,
                        factory_method: :my_method, context: :test
       end
+
+      @bean_definition = SmartIoC.get_bean_definition_by_class(BeanClass)
     end
 
-    it {
-      bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(BeanClass)
-
-      expect(bean_definition.name).to eq(:my_bean)
-      expect(bean_definition.package).to eq(:my_package)
-      expect(bean_definition.path).to match(/object_spec.rb/)
-      expect(bean_definition.klass).to eq(BeanClass)
-      expect(bean_definition.scope).to eq(:request)
-      expect(bean_definition.instance).to eq(false)
-      expect(bean_definition.factory_method).to eq(:my_method)
-      expect(bean_definition.context).to eq(:test)
-    }
+    it { expect(@bean_definition.name).to eq(:my_bean) }
+    it { expect(@bean_definition.package).to eq(:my_package) }
+    it { expect(@bean_definition.path).to match(/object_spec.rb/) }
+    it { expect(@bean_definition.klass).to eq(BeanClass) }
+    it { expect(@bean_definition.scope).to eq(:request) }
+    it { expect(@bean_definition.instance).to eq(false) }
+    it { expect(@bean_definition.factory_method).to eq(:my_method) }
+    it { expect(@bean_definition.context).to eq(:test) }
   end
 end

data/spec/smart_ioc/smart_ioc_spec.rb

@@ -13,7 +13,11 @@ describe SmartIoC do
     dir_path = File.join(File.expand_path(File.dirname(__FILE__)), 'example/utils')
     SmartIoC.find_package_beans(:utils, dir_path)
 
-    @container = SmartIoC::Container.get_instance
+    @container = SmartIoC.container
+  end
+
+  it 'loads all beans' do
+    SmartIoC.load_all_beans
   end
 
   it 'sets beans' do
@@ -28,8 +32,8 @@ describe SmartIoC do
   end
 
   it 'sets beans with extra package context' do
-    SmartIoC::Container.get_instance.set_extra_context_for_package(:admins, :test)
-    SmartIoC::Container.get_instance.force_clear_scopes
+    SmartIoC.set_extra_context_for_package(:admins, :test)
+    SmartIoC.force_clear_scopes
 
     users_creator = @container.get_bean(:users_creator)
     users_creator.create(1, 'test@test.com')

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'simplecov'
+
 SimpleCov.start do
   add_filter "/spec/"
   add_filter "/.direnv/"
 end
+
 if ENV['CI']=='true'
   require 'codecov'
+  
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardops"
 - Gemfile
@@ -70,6 +71,7 @@ files:
 - docs/_config.yml
 - docs/index.md
 - lib/smart_ioc.rb
+- lib/smart_ioc/args.rb
 - lib/smart_ioc/bean_definition.rb
 - lib/smart_ioc/bean_definitions_storage.rb
 - lib/smart_ioc/bean_dependency.rb
@@ -78,6 +80,7 @@ files:
 - lib/smart_ioc/bean_locations.rb
 - lib/smart_ioc/bean_locator.rb
 - lib/smart_ioc/container.rb
+- lib/smart_ioc/errors.rb
 - lib/smart_ioc/extra_package_contexts.rb
 - lib/smart_ioc/inject_metadata.rb
 - lib/smart_ioc/iocify.rb
@@ -91,6 +94,7 @@ files:
 - spec/smart_ioc/bean_factory_spec.rb
 - spec/smart_ioc/bean_file_loader_spec.rb
 - spec/smart_ioc/bean_locator_spec.rb
+- spec/smart_ioc/container_spec.rb
 - spec/smart_ioc/example/admins/repository/admins_dao.rb
 - spec/smart_ioc/example/admins/repository/admins_repository.rb
 - spec/smart_ioc/example/admins/repository/test/admins_repository.rb
@@ -100,6 +104,8 @@ files:
 - spec/smart_ioc/example/users/user.rb
 - spec/smart_ioc/example/utils/config.rb
 - spec/smart_ioc/example/utils/logger.rb
+- spec/smart_ioc/factory_method_spec.rb
+- spec/smart_ioc/iocify_spec.rb
 - spec/smart_ioc/object_spec.rb
 - spec/smart_ioc/smart_ioc_spec.rb
 - spec/spec_helper.rb
@@ -132,6 +138,7 @@ test_files:
 - spec/smart_ioc/bean_factory_spec.rb
 - spec/smart_ioc/bean_file_loader_spec.rb
 - spec/smart_ioc/bean_locator_spec.rb
+- spec/smart_ioc/container_spec.rb
 - spec/smart_ioc/example/admins/repository/admins_dao.rb
 - spec/smart_ioc/example/admins/repository/admins_repository.rb
 - spec/smart_ioc/example/admins/repository/test/admins_repository.rb
@@ -141,6 +148,8 @@ test_files:
 - spec/smart_ioc/example/users/user.rb
 - spec/smart_ioc/example/utils/config.rb
 - spec/smart_ioc/example/utils/logger.rb
+- spec/smart_ioc/factory_method_spec.rb
+- spec/smart_ioc/iocify_spec.rb
 - spec/smart_ioc/object_spec.rb
 - spec/smart_ioc/smart_ioc_spec.rb
 - spec/spec_helper.rb