smart_ioc 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8b979ba9bf2ec07fbd542a155af2fad52bb85fdbffece8cc50f1e3132c8d77
-  data.tar.gz: 47478f2706b6e5a262af7de3974825ca8d01b48839716c14d9996749421b390a
+  metadata.gz: f7dac45d6133624620331b4bbc980e7e19574881e51b4c98b2558d7b5114c584
+  data.tar.gz: a7753416faca728d5f72e2d8d215b3f77ef7de7eeb54f58601bf97d3b2d92f5d
 SHA512:
-  metadata.gz: 530e72ce702c8f328ca21ce183d6f511216cb957511f026b52dbcd110b9fc0b21e418e2005f549cfcea75f1b6e6b7b1de3134e476609a19588755434c058aefb
-  data.tar.gz: 75ac2416d31d4e067d9a4e3fb1966edfa3a929771fad2760f7506bf50a8e8b60c0a7b1d0fa72120856230ceb62212256a402ebebd981b548e17a4e5134da73ed
+  metadata.gz: ca530b375da6e1467d9d6ac60e7c84e3be955a8c1922bd4b4a2a24d53057ba3cb707ffe87a7bbaf0e897749b4825cdf138312df8fc24441a921c41cf60f8824d
+  data.tar.gz: ca838c6018069eead30c652c05f74a2c0f345429b87845e70c9f9d5cfb1d98021cb96f93417605ac2171ac99ee6ecf31dd12341f7fa85becdb201dcf5940e367

data/.ruby-version

@@ -1 +1 @@
-3.3.4
+3.2.2

data/Gemfile.lock

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

data/lib/smart_ioc/bean_definition.rb

@@ -67,12 +67,14 @@ class SmartIoC::BeanDefinition
 
   def preload
     @dependencies.each do |dep|
-      SmartIoC::Container.get_instance.get_bean(
-        dep.ref || dep.bean_name,
+      bd = SmartIoC.get_bean_definition(
+        dep.ref,
         package: dep.package,
         parent_bean_definition: self,
         parent_bean_name: name,
-      ).class._smart_ioc_preload_; nil
+      )
+
+      bd.preload
     end
   end
 end

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,22 +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
-  end
+    bd_scope.delete_if { |bd| bd.klass.to_s == bean_definition.klass.to_s }
 
-  # @param klass [Class] bean class
-  # @return bean definition [BeanDefinition] or nil
-  def find_by_class(klass)
-    @collection.detect {|bd| bd.klass == klass}
+    nil
   end
 
   # Returns bean definition for specific class
@@ -58,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
@@ -112,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

@@ -32,16 +32,7 @@ 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, 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
-
-    @bean_file_loader.require_bean(bean_name)
-
-    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)
+    bean_definition = get_bean_definition(bean_name, package:, parent_bean_definition:, context:, parent_bean_name:)
     scope = get_scope(bean_definition)
     bean = scope.get_bean(bean_definition.klass)
 
@@ -56,6 +47,19 @@ class SmartIoC::BeanFactory
     raise e
   end
 
+  def get_bean_definition(bean_name, package: nil, context: nil, parent_bean_definition: 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
+
+    @bean_file_loader.require_bean(bean_name)
+
+    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)
+  end
+
   private
 
   def init_bean(bean_definition)

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
@@ -90,10 +90,14 @@ module SmartIoC
     # @param package [Symbol]
     # @param context [Symbol]
     # return [BeanDefinition]
-    def get_bean_definition(bean_name, package, context)
+    def find_bean_definition(bean_name, package, context)
       bean_definitions_storage.find_bean(bean_name, package, context)
     end
 
+    def get_bean_definition(...)
+      bean_factory.get_bean_definition(...)
+    end
+
     # Sets new load proc
     # for those who use active support dependency loader
     # one can use

data/lib/smart_ioc/iocify.rb

@@ -68,15 +68,14 @@ module SmartIoC::Iocify
       file_path ||= caller[0].split(':').first
       package ||= SmartIoC::BeanLocations.get_bean_package(file_path)
       context ||= SmartIoC::Container::DEFAULT_CONTEXT
-      bean_definition = SmartIoC.get_bean_definition(bean_name, package, context)
+      bean_definition = SmartIoC.find_bean_definition(bean_name, package, context)
 
       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
+          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
@@ -168,9 +167,5 @@ module SmartIoC::Iocify
 
       nil
     end
-
-    def _smart_ioc_preload_
-      @bean_definition&.preload; nil
-    end
   end
 end

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

data/lib/smart_ioc.rb

@@ -80,6 +80,7 @@ module SmartIoC
     container_methods = [
       :register_bean,
       :get_bean_definition,
+      :find_bean_definition,
       :set_extra_context_for_package,
       :get_bean,
       :clear_scopes,

data/spec/smart_ioc/object_spec.rb

@@ -32,7 +32,7 @@ describe Object do
                        factory_method: :my_method, context: :test
       end
 
-      @bean_definition = SmartIoC.get_bean_definition(:my_bean, :my_package, :test)
+      @bean_definition = SmartIoC.find_bean_definition(:my_bean, :my_package, :test)
     end
 
     it { expect(@bean_definition.name).to eq(:my_bean) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Inversion of Control Container