smart_ioc 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2067f3974f1412037425a8615dd9143091f06ef
-  data.tar.gz: 9ab33bd6d8a554bf1e77ad0a85bc04e7e8a6fb45
+  metadata.gz: 2cada3041d79cc078eda3cf08e8e54d0e5cf9c5b
+  data.tar.gz: f5ddaef04a1bdc97286501c4e66892e90a56a325
 SHA512:
-  metadata.gz: c3415af0ff931fd21404f6e91ade5367c025395ce739cd05bfc2f98db175f5c60df36690e6e8f1b419ee10e2355e0f90ac0a7b113e4e4735c20f2de7d43f7999
-  data.tar.gz: 82dc65927d8e00b79ae790e4f65b55f13f6adf3a19103024a0b810ec41ada75e662413d6705be8b72527541b950dccf03a33deca453cbe0d5ea419d05ee8c14f
+  metadata.gz: e07e1777d3866634ab0d2f4d847d9b73279ffa918ccf1d0bd7293d5cd4bcf7010b29b570ece63f36aff4fc364721a7595d53a1a33732554c9a9c88adab6c94a9
+  data.tar.gz: 98219fd6eab79278f393457320a131180618d358cf33230e05670344cad8957ec4849490ec370752069186d42c0f066d22b858aaa9c9e8f48a6fa29ec92128f8

data/Gemfile.lock

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

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -26,10 +26,20 @@ Existing bean details:
     @collection.push(bean_definition)
   end
 
+  def delete_by_class(klass)
+    klass_str = klass.to_s
+    bean = @collection.detect {|bd| bd.klass.to_s == klass_str}
+
+    if bean
+      @collection.delete(bean)
+    end
+  end
+
   # @param klass [Class] bean class
   # @return bean definition [BeanDefinition] or nil
   def find_by_class(klass)
-    @collection.detect {|bd| bd.klass == klass}
+    klass_str = klass.to_s
+    @collection.detect {|bd| bd.klass.to_s == klass_str}
   end
 
   def filter_by(bean_name, package = nil, context = nil)
@@ -55,7 +65,7 @@ Existing bean details:
   # @bean_name [Symbol] bean name
   # @package [Symbol, nil] package name
   # @context [Symbol, nil] context
-  # @raises Errors::AmbiguousBeanDefinition if multiple bean definitions are found 
+  # @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)
 

data/lib/smart_ioc/bean_factory.rb

@@ -63,7 +63,7 @@ class SmartIoC::BeanFactory
       )
 
       scope    = get_scope(bean_definition)
-      dep_bean = updated_beans[bd] || scope.get_bean(bd.class)
+      dep_bean = updated_beans[bd] || scope.get_bean(bd.klass)
 
       if !dep_bean
         dep_bean = get_bean(

data/lib/smart_ioc/container.rb

@@ -23,6 +23,14 @@ module SmartIoC
       raise ArgumentError, "SmartIoC::Container should not be allocated. Use SmartIoC::Container.get_instance instead"
     end
 
+    # @param klass [Class] bean class name
+    # @return nil
+    def unregister_bean(klass)
+      bean_definitions_storage.delete_by_class(klass)
+      clear_scopes
+      nil
+    end
+
     # @param bean_name [Symbol] bean name
     # @param klass [Class] bean class name
     # @param path [String] bean file absolute path

data/lib/smart_ioc/iocify.rb

@@ -35,8 +35,17 @@ module SmartIoC::Iocify
 
       bean_definition = SmartIoC.get_bean_definition_by_class(self)
 
-      # skip if bean was registered
-      return if bean_definition
+      if bean_definition
+        if bean_definition.path == file_path
+          # seems that file with bean definition was reloaded
+          # lets clear all scopes so we do not have
+          container = SmartIoC::Container.get_instance
+          container.unregister_bean(self)
+          container.force_clear_scopes
+        else
+          raise ArgumentError, "bean with for class #{self.to_s} was already defined in #{bean_definition.path}"
+        end
+      end
 
       bean_definition = SmartIoC.register_bean(
         bean_name:      bean_name,

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/spec/smart_ioc/iocify_spec.rb

@@ -10,4 +10,19 @@ describe SmartIoC::Iocify do
       end
     }.to raise_error(ArgumentError, "MyTestClass is not registered as bean. Add `bean :bean_name` declaration")
   end
-end
+
+  it 'reloads bean when file is reloaded' do
+    dir_path = File.join(File.expand_path(File.dirname(__FILE__)), 'example/utils')
+    SmartIoC.find_package_beans(:users, dir_path)
+    logger = SmartIoC.get_bean(:logger)
+    initial_object_id = logger.object_id
+
+    # reload file
+    load(File.join(dir_path, 'logger.rb'))
+
+    logger = SmartIoC.get_bean(:logger)
+    final_object_id = logger.object_id
+
+    expect(initial_object_id).not_to eq(final_object_id)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler