aux 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 862a78e8879ec01edc04a4c59c1a7468366f6b9ca8c10791b974553090e4f6c3
-  data.tar.gz: f247febfd9e323d3ed778dcf20cd3b73504a33feecbbeae06129465426143fda
+  metadata.gz: 1cf122c1dc9b99cf9e0b875586c740617087f7d59c06b50e31a9b9f632874dcc
+  data.tar.gz: 185dd787c6d3ee866e9c67c8ffc4135a28565eb63167bd19f85c1e63e9bb397f
 SHA512:
-  metadata.gz: 4fb78b1df17d234f1a1738143ca873f1c470f2aafc194dbcdeed2d730240ba3cfc07aeabf19fb33f0d7e9426fcb4523e53394d93e048cc836a856a2a750b2101
-  data.tar.gz: 100e911b442a7e422a5afd122f42e908ee39fe05a66f60db5ee8294ab4efb697a94234d5d8676f6e39d9ae8a849aa60c56112bdc7985700b5b50e42acc68a425
+  metadata.gz: a393a2f312dfc8dc83bfe74ac4e8b77d0525158d6d7a34e2a9889aae8d269478fa2c16c0e44ecfefc236408696e5ceaa007944d4f486e7c2d39595b23f63e67a
+  data.tar.gz: '00679c6c77e2a668f7ee39accb292e19495ffaae3118232f1dd122bc3c31f3250d8517b66cbd863603cbd490b9a35cf292b66181a95de6069e071a0bf6503b28'

data/aux.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |specification|
   specification.email = ['eboyko@eboyko.ru']
   specification.homepage = 'https://github.com/eboyko/aux'
 
+  specification.add_dependency 'concurrent-ruby', '~> 1.2', '>= 1.2.3'
   specification.add_dependency 'activemodel', '>= 6.1', '< 8'
-  specification.add_dependency 'dry-container', '>= 0.9.0', '<= 0.11'
 
-  specification.add_development_dependency 'zeitwerk', '~> 2.5'
-  specification.add_development_dependency 'rubocop', '~> 1.36.0'
+  specification.add_development_dependency 'zeitwerk', '~> 2.6', '>= 2.6.13'
+  specification.add_development_dependency 'rubocop', '~> 1.62', '>= 1.62.1'
 
   specification.required_ruby_version = '>= 2.7.1'
   specification.metadata['rubygems_mfa_required'] = 'true'

data/lib/aux/pluggable/class_methods.rb

@@ -52,24 +52,19 @@ module Aux
 
       # @param initialize [TrueClass, FalseClass]
       # @param memoize [TrueClass, FalseClass]
-      # @param scope [TrueClass, Symbol, String, nil]
+      # @param scope [Symbol, String, TrueClass, nil]
       # @param as [Symbol, String, nil]
       def register(initialize: false, memoize: false, scope: true, as: nil)
-        @_pluggable.register(
-          initialization_required: initialize,
-          memoization_required: memoize,
-          namespace: scope,
-          code: as
-        )
+        @_pluggable.register(initialize, memoize, scope, as)
       end
 
       # @param code [Symbol, String]
-      # @param initialization_block [Block]
+      # @param initialization_block [Proc, nil]
       # @param scope [TrueClass, Symbol, String, nil]
       # @param private [TrueClass, FalseClass]
       # @param as [Symbol, String, nil]
       def resolve(code, initialization_block = nil, scope: true, private: true, as: nil)
-        @_pluggable.resolve(code, initialization_block, namespace: scope, private: private, as: as)
+        @_pluggable.resolve(code, scope, private, as, initialization_block)
       end
     end
   end

data/lib/aux/pluggable/connector.rb

@@ -3,32 +3,26 @@
 module Aux
   module Pluggable
     # Describes the bridge between a pluggable class and the registry
+    # @!visibility private
     class Connector
       # @!attribute [r] dependencies
       #   @return [Array<Dependency>]
       attr_reader :dependencies
 
       # @param subject [Class]
-      # @param registry [Dry::Container]
+      # @param registry [Aux::Registry]
       def initialize(subject, registry)
         @subject = subject
         @registry = registry
         @dependencies = []
-
-        configure
       end
 
-      # @param initialization_required [Boolean] whether the subject requires initialization before use
-      # @param memoization_required [Boolean] whether the subject should be memoized
-      # @param namespace [Symbol] the namespace to register the subject
-      # @param code [Symbol] an alternate name
-      def register(initialization_required: nil, memoization_required: nil, namespace: nil, code: nil)
-        configure(
-          initialization_required: initialization_required,
-          memoization_required: memoization_required,
-          namespace: namespace,
-          code: code
-        )
+      # @param initialization_required [TrueClass, FalseClass] whether the subject requires initialization before use
+      # @param memoization_required [TrueClass, FalseClass] whether the subject should be memoized
+      # @param namespace [Symbol, String, TrueClass, nil] the namespace to register the subject
+      # @param code [Symbol, String, nil] an alternate name
+      def register(initialization_required, memoization_required, namespace, code)
+        configure(initialization_required, memoization_required, namespace, code)
 
         # Register the subject in the registry using the provided options
         @registry.register(@cipher, memoize: @memoization_required) do
@@ -37,16 +31,16 @@ module Aux
       end
 
       # @param code [Symbol, String] the name of the dependency
-      # @param initialization_block [Proc] an optional block used to initialize the dependency
-      # @param namespace [TrueClass, Symbol, String, nil] whether to resolve the dependency in the same namespace
+      # @param namespace [Symbol, String, TrueClass, nil] whether to resolve the dependency in the same namespace
       # @param private [TrueClass, FalseClass] whether to make the dependency private
-      # @param as [Symbol] an internal alias name for the dependency
-      # rubocop:disable Layout/LineLength, Metrics/AbcSize, Metrics/MethodLength
-      def resolve(code, initialization_block = nil, namespace: true, private: true, as: nil)
-        cipher = Utilities.dependency_cipher(@subject.name, scope: namespace, code: code)
-        load_class(cipher) unless @registry.key?(cipher)
+      # @param as [Symbol, String, nil] an internal alias name for the dependency
+      # @param initialization_block [Proc, nil] an optional block used to initialize the dependency
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def resolve(code, namespace, private, as, initialization_block = nil)
+        cipher = Utilities.dependency_cipher(@subject.name, namespace, code)
+        load_class(cipher)
 
-        dependency = Dependency.new(@registry.resolve(cipher), initialization_block, pointer: as || code, private: private)
+        dependency = Dependency.new(@registry.resolve(cipher), as || code, private, initialization_block)
         @dependencies.push(dependency)
 
         if @initialization_required
@@ -62,16 +56,16 @@ module Aux
           end
         end
       end
-      # rubocop:enable Layout/LineLength, Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       private
 
-      # @param initialization_required [TrueClass, FalseClass, nil]
-      # @param memoization_required [TrueClass, FalseClass, nil]
-      # @param namespace [Symbol, String, nil]
+      # @param initialization_required [TrueClass, FalseClass]
+      # @param memoization_required [TrueClass, FalseClass]
+      # @param namespace [TrueClass, Symbol, String, nil]
       # @param code [Symbol, String, nil]
-      def configure(initialization_required: nil, memoization_required: nil, namespace: nil, code: nil)
-        @cipher = Utilities.dependency_cipher(@subject.name, scope: namespace, code: code)
+      def configure(initialization_required, memoization_required, namespace, code)
+        @cipher = Utilities.dependency_cipher(@subject.name, namespace, code)
         @initialization_required = initialization_required
         @memoization_required = memoization_required
         @namespace = namespace

data/lib/aux/pluggable/dependency.rb

@@ -3,6 +3,7 @@
 module Aux
   module Pluggable
     # Describes the dependency and its preferences
+    # @!visibility private
     class Dependency
       # @!attribute [r] target
       #   @return [Object]
@@ -10,14 +11,14 @@ module Aux
       #   @return [Symbol, String]
       # @!attribute [r] private
       #   @return [Boolean]
-      attr_reader :pointer, :target, :private
+      attr_reader :target, :pointer, :private
 
       # @param target [Object]
-      # @param initialization_block [Proc, nil]
       # @param pointer [Symbol, String]
       # @param private [Boolean]
-      def initialize(target, initialization_block = nil, pointer:, private:)
-        @target = initialization_block ? initialization_block.call(target) : target
+      # @param initialization_block [Proc, nil]
+      def initialize(target, pointer, private, initialization_block = nil)
+        @target = initialization_block&.call(target) || target
         @pointer = pointer
         @private = private
       end

data/lib/aux/pluggable/utilities.rb

@@ -3,28 +3,29 @@
 module Aux
   module Pluggable
     # Random methods for internal usage
+    # @!visibility private
     module Utilities
       # First, we need to determine the appropriate namespace (also called the scope) in which to resolve something.
       # By default, we assume that the developers want to resolve a dependency from the same namespace as the
       # referencing class. Another approach is to allow developers to set the correct scope themselves.
       #
-      # @param subject [ClassName]
-      # @param scope [TrueClass, Symbol, String, nil]
-      # @param code [TrueClass, Symbol, String, nil]
+      # @param subject [String]
+      # @param scope [Symbol, String, TrueClass, nil]
+      # @param code [Symbol, String, nil]
       # @return [String]
-      def self.dependency_cipher(subject, scope: nil, code: nil)
+      def self.dependency_cipher(subject, scope, code)
         native_cipher = dependency_native_cipher(subject)
         native_cipher_partitions = native_cipher.rpartition('.')
-        scope = scope == true ? native_cipher_partitions.first : scope
-        code = code.nil? ? native_cipher_partitions.last : code
+        scope = native_cipher_partitions.first if scope == true
+        code = native_cipher_partitions.last if code.nil?
 
         [scope, code].reject { |part| part.nil? || part.empty? }.join('.')
       end
 
-      # @param subject [ClassName]
+      # @param subject [String]
       # @return [String]
       def self.dependency_native_cipher(subject)
-        subject.dup.gsub(/::/, '.').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+        subject.dup.gsub('::', '.').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
       end
     end
   end

data/lib/aux/pluggable.rb

@@ -4,11 +4,14 @@ require 'aux/pluggable/class_methods'
 require 'aux/pluggable/connector'
 require 'aux/pluggable/dependency'
 require 'aux/pluggable/utilities'
+require 'aux/registry'
 
 module Aux
   # Describes interface that makes any class able to register itself as well as resolve dependencies
   # rubocop:disable Style/ClassVars
   module Pluggable
+    @@registry = Aux::Registry.new
+
     # Extends the including class with ClassMethods and initializes a new Connector instance
     # @param base [Class] the class that includes this module
     def self.included(base)
@@ -19,12 +22,19 @@ module Aux
       end
     end
 
-    # @param registry [Dry::Container]
+    # @yield configure the module
+    # @yieldparam pluggable [Module<Aux::Pluggable>]
+    # @yieldparam registry [Aux::Registry]
+    def self.configure
+      yield(self, @@registry) if block_given?
+    end
+
+    # @param registry [Aux::Registry]
     def self.registry=(registry)
       @@registry = registry
     end
 
-    # @return [Dry::Container]
+    # @return [Aux::Registry]
     def self.registry
       @@registry
     end

data/lib/aux/registry/entry.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Aux
+  class Registry
+    # Describes a registered dependency
+    # @!visibility private
+    class Entry
+      # @param constructor [Proc]
+      # @param memoization_required [TrueClass, FalseClass]
+      def initialize(constructor, memoization_required)
+        @constructor = constructor
+        @memoization_required = memoization_required
+
+        @mutex = Thread::Mutex.new
+      end
+
+      # @return [Object]
+      def call
+        return @constructor.call unless @memoization_required
+
+        @call ||= @mutex.synchronize do
+          @constructor.call
+        end
+      end
+    end
+  end
+end

data/lib/aux/registry.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'aux/registry/entry'
+require 'concurrent/map'
+
+module Aux
+  # Registry for dependency injection
+  class Registry
+    def initialize
+      @prototypes = ::Concurrent::Map.new
+    end
+
+    # @param key [Symbol, String]
+    # @param memoize [TrueClass, FalseClass]
+    # @param constructor [Proc]
+    def register(key, memoize: false, &constructor)
+      @prototypes.put(key.to_s, Entry.new(constructor, memoize))
+    end
+
+    # @param key [Symbol, String]
+    # @return [Object]
+    def resolve(key)
+      @prototypes.fetch(key.to_s).call
+    end
+
+    # @param key [Symbol, String]
+    # @return [TrueClass, FalseClass]
+    def key?(key)
+      @prototypes.key?(key.to_s)
+    end
+  end
+end

data/lib/aux/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aux
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,83 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: aux
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Evgeny Boyko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8'
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8'
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-    - - "<="
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-    - - "<="
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.13
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: '1.62'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.62.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: '1.62'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.62.1
 description: 
 email:
 - eboyko@eboyko.ru
@@ -93,6 +105,8 @@ files:
 - lib/aux/pluggable/connector.rb
 - lib/aux/pluggable/dependency.rb
 - lib/aux/pluggable/utilities.rb
+- lib/aux/registry.rb
+- lib/aux/registry/entry.rb
 - lib/aux/validations.rb
 - lib/aux/validations/error.rb
 - lib/aux/validations/errors.rb