smart_ioc 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e5c21e82ade291e0f2349e6d75807764104472899d1369275b8e43be1184f82
-  data.tar.gz: 233217c7f8049bfaf40359cc599fc6f944f4a8e773da8a2b2c6059224dd283e4
+  metadata.gz: 4122153af2d77cfb9355497cf34a415aeb02bb9eb6cef8af6a4f467fa793df08
+  data.tar.gz: b31a912ab5cdb90c000fd1ab96d5ee62a3b60b8a839af5fc437aa93b855a79b8
 SHA512:
-  metadata.gz: 49f4a74095dc772d17f3e5f2b9f749465c6b58f9fbb60309f1a4a772ecdcd4211200879f4ca7bc169e3b40c5695519273b7b729bfab4683f1f96d920fe41e505
-  data.tar.gz: 3aafd25fb01683303a404692d92cf8becc533c1840ba1672eaac6329e0360a59bf44d1820eaab0517ef8c1f1326160f0e2ec000efb1b9933f48de8945ccf8eed
+  metadata.gz: cb497f0de22e9823795b179db0c003b029a1f4425dedb7d4983f6a6fb891c56f0d44cf2fed41c1098596cd07636fcd35ca376e564dc6813da00f0cf2c8a2b581
+  data.tar.gz: '08a61bbb285fb6c777caae491d56475d27761c102c41df5bf7c9b83c31619b227bd0dc6a0668fb3c1f1deb7af06472de6e91b015620bb56057a95b9c7306dcc7'

data/Gemfile.lock

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

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -2,11 +2,11 @@ class SmartIoC::BeanDefinitionsStorage
   include SmartIoC::Errors
 
   def initialize
-    @collection = []
+    @collection = Hash.new { |h, k| h[k] = [] }
   end
 
   def clear_dependencies
-    @collection.each do |bd|
+    @collection.values.flatten.each do |bd|
       bd.dependencies.each do |dependency|
         dependency.bean_definition = nil
       end
@@ -15,12 +15,12 @@ class SmartIoC::BeanDefinitionsStorage
 
   # @param bean_definition [BeanDefinition]
   def push(bean_definition)
-    existing_bd = @collection.detect do |bd|
-      bd == bean_definition
-    end
+    bd_scope = @collection[bean_definition.name]
+
+    existing_bd = bd_scope.detect { |bd| bd == bean_definition }
 
     if existing_bd
-      @collection.reject! { |bd| bd == existing_bd }
+      bd_scope.reject! { |bd| bd == bean_definition }
 
       message = <<~EOF
         \nReplacing bean definition...
@@ -34,16 +34,15 @@ class SmartIoC::BeanDefinitionsStorage
       puts message
     end
 
-    @collection.push(bean_definition)
+    bd_scope.push(bean_definition)
   end
 
-  def delete_by_class(klass)
-    klass_str = klass.to_s
-    bean = @collection.detect {|bd| bd.klass.to_s == klass_str}
+  def delete(bean_definition)
+    bd_scope = @collection[bean_definition.name]
 
-    if bean
-      @collection.delete(bean)
-    end
+    bd_scope.delete_if { |bd| bd.klass.to_s == bean_definition.klass.to_s }
+
+    nil
   end
 
   # Returns bean definition for specific class
@@ -52,27 +51,23 @@ class SmartIoC::BeanDefinitionsStorage
   # @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}
+    @collection[bean_name].detect do |bd|
+      bd.name == bean_name && bd.package == package && bd.context == context
+    end
   end
 
   def filter_by(bean_name, package = nil, context = nil)
-    bean_definitions = @collection.select do |bd|
-      bd.name == bean_name
-    end
+    bd_scope = @collection[bean_name]
 
     if package
-      bean_definitions = bean_definitions.select do |bd|
-        bd.package == package
-      end
+      bd_scope = bd_scope.select { |bd| bd.package == package }
     end
 
     if context
-      bean_definitions = bean_definitions.select do |bd|
-        bd.context == context
-      end
+      bd_scope = bean_definitions.select { |bd| bd.context == context }
     end
 
-    bean_definitions
+    bd_scope
   end
 
   # @bean_name [Symbol] bean name
@@ -106,26 +101,18 @@ class SmartIoC::BeanDefinitionsStorage
   # @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
-    end
+    bd_scope = @collection[bean_name]
 
     if package
-      bean_definitions = bean_definitions.select do |bd|
-        bd.package == package
-      end
+      bd_scope = bd_scope.select { |bd| bd.package == package }
     end
 
     if context
-      context_bean_definitions = bean_definitions.select do |bd|
-        bd.context == context
-      end
+      context_bean_definitions = bd_scope.select { |bd| bd.context == context }
 
-      if !context_bean_definitions.empty?
-        bean_definitions = context_bean_definitions
-      end
+      bd_scope = context_bean_definitions if context_bean_definitions.any?
     end
 
-    bean_definitions
+    bd_scope
   end
 end

data/lib/smart_ioc/bean_factory.rb

@@ -12,7 +12,6 @@ class SmartIoC::BeanFactory
     @singleton_scope          = SmartIoC::Scopes::Singleton.new
     @prototype_scope          = SmartIoC::Scopes::Prototype.new
     @thread_scope             = SmartIoC::Scopes::Request.new
-    @semaphore                = Mutex.new
   end
 
   def clear_scopes

data/lib/smart_ioc/bean_file_loader.rb

@@ -2,6 +2,7 @@ class SmartIoC::BeanFileLoader
   def initialize
     @loaded_locations = {}
     @load_proc        = Proc.new { |location| load(location) }
+    @semaphore        = Mutex.new
   end
 
   def set_load_proc(&block)
@@ -17,7 +18,10 @@ class SmartIoC::BeanFileLoader
     locations.each do |location|
       next if @loaded_locations.has_key?(location)
       @loaded_locations[location] = true
-      @load_proc.call(location)
+
+      @semaphore.synchronize do
+        @load_proc.call(location)
+      end
     end
 
     nil

data/lib/smart_ioc/container.rb

@@ -19,10 +19,10 @@ module SmartIoC
       raise ArgumentError, "SmartIoC::Container should not be allocated. Use SmartIoC::Container.get_instance instead"
     end
 
-    # @param klass [Class] bean class name
+    # @param klass [BeanDefinition] bean class name
     # @return nil
-    def unregister_bean(klass)
-      bean_definitions_storage.delete_by_class(klass)
+    def unregister_bean(bean_definition)
+      bean_definitions_storage.delete(bean_definition)
       clear_scopes
       nil
     end

data/lib/smart_ioc/iocify.rb

@@ -74,9 +74,8 @@ module SmartIoC::Iocify
         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
+          SmartIoC::Container.get_instance.unregister_bean(bean_definition)
+          SmartIoC::Container.get_instance.force_clear_scopes
         else
           raise ArgumentError, "bean with for class #{self.to_s} was already defined in #{bean_definition.path}"
         end

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Ruslan Gatiyatov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +119,6 @@ homepage: http://github.com/droidlabs/smart_ioc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Inversion of Control Container
 test_files: