aux 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4131935771dd658e83d739479ccd2cac86caf8ef96162328807d73cad1cc741
-  data.tar.gz: 388c65d71c5902f843a4537cc6f75cce9af412403920632a03e9a27397561b2f
+  metadata.gz: acf9da895d77d8ab39cc92765e586e69e0300e15cedc201fdd18a30a02221d4c
+  data.tar.gz: c6aa3892d3a1691f2e0192a3094c33838a5e5b40121538b06862e1c7491c7190
 SHA512:
-  metadata.gz: 3812e0f949dfd058abdc242d086e0b87487d275b0fd2443f871022e11b5ccef21decabf361fef3efd39db9303896694e17a8519e2d0857155919585a2ab92e77
-  data.tar.gz: cdbc3645ac99b5e5a42f26a2a0cf268fa03c4f6a108cc4f33c1652354d58a27a8f06ba28a3f327fe557a732dce0fc14a8613127794260182459fe0a3283d8cd8
+  metadata.gz: c10a70b5b35a62161e4f6c48362fda7bc51e08a046c638ac3d8a8311fac53648fc1bdcd526e0c4d7302e1c9ce36c80d97f845dc0fa5d32f9e8ebc1332aad408d
+  data.tar.gz: ae97078e7e7cc0d627711a1c147befecadcfa70e057376378402d59a8dda844ad63f4596a10fd1ee26c594f0db8f8189d0bfdb6e9a3962b557899747503b3c35

data/lib/aux/pluggable/class_methods.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'aux/utilities'
-
 module Aux
   module Pluggable
     # Describes methods that would be inherited by pluggable classes
     module ClassMethods
       # @param dependencies [Hash{Symbol => Object}]
-      # @return [self]
       def new(**dependencies)
         instance = allocate
 
@@ -18,9 +15,12 @@ module Aux
 
         # Configure dependencies that come from the customized initialization procedure
         dependencies.each do |name, dependency|
-          instance.instance_variable_set("@#{name}", dependency)
+          instance.instance_variable_set("@#{name}", dependency) if @_dependencies.include?(name)
         end
 
+        # Run the rest of customized initialization procedure
+        instance.send(:initialize, **dependencies)
+
         instance
       end
 
@@ -28,38 +28,27 @@ module Aux
 
       # @param initialize [TrueClass, FalseClass]
       # @param memoize [TrueClass, FalseClass]
+      # @param scope [TrueClass, Symbol, String, nil]
       # @param as [Symbol, String, nil]
-      def register(initialize: false, memoize: false, as: nil)
-        @_registration = Registration.new(as || Aux::Utilities.underscore(name), initialize, memoize)
-
-        @_registry.register(@_registration.name, memoize: @_registration.memoization_required) do
-          @_registration.initialization_required ? new : self
-        end
+      def register(initialize: false, memoize: false, scope: true, as: nil)
+        dependency_cipher = Utilities.dependency_cipher(name, scope: scope, code: as)
+        @_registry.register(dependency_cipher, memoize: memoize) { initialize ? new : self }
       end
 
       # @param code [Symbol, String]
       # @param initialization_block [Proc, nil]
-      # @param scope [TrueClass, Symbol, String]
+      # @param scope [TrueClass, Symbol, String, nil]
       # @param as [Symbol, String]
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def resolve(code, initialization_block = nil, scope: true, as: nil)
-        # 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.
-        scope =
-          case scope
-          when TrueClass
-            Aux::Utilities.underscore(name).rpartition('.').first
-          when Symbol, String
-            scope
-          end
+        dependency_cipher = Utilities.dependency_cipher(name, scope: scope, code: code)
+        dependency_alias = as || code
 
         # The process of preloading classes is a bit messy. Therefore, why we wrap the dependency in a Proc.
         # This allows us not to worry about the absence of the referenced class in the registry during assembly.
         # Using an initialization block can be convenient in some cases, for example, to resolve some
         # of the global settings without accessing the whole thing.
-        dependency_cipher = [scope, code].reject { |part| part.nil? || part.empty? }.join('.')
-        dependency =
+        @_dependencies[dependency_alias] =
           if initialization_block
             -> { initialization_block.call(@_registry.resolve(dependency_cipher)) }
           else
@@ -67,16 +56,10 @@ module Aux
           end
 
         # The final step is to declare instance variables and methods to access them.
-        dependency_alias = as || code
-
-        if defined?(@_registration) && @_registration&.initialization_required
-          @_dependencies[dependency_alias] = dependency
-        end
-
         instance_eval do
           define_method(dependency_alias) do
             if instance_variable_get("@#{dependency_alias}").is_a?(Proc)
-              instance_variable_set("@#{dependency_alias}", instance_variable_get("@#{dependency_alias}").call)
+              instance_variable_get("@#{dependency_alias}").call
             else
               instance_variable_get("@#{dependency_alias}")
             end
@@ -86,11 +69,11 @@ module Aux
         end
 
         singleton_class.class_eval do
-          define_method(dependency_alias) { dependency.call }
+          define_method(dependency_alias) { @_dependencies[dependency_alias].call }
           private dependency_alias
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
   end
 end

data/lib/aux/pluggable/utilities.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Aux
+  module Pluggable
+    # Random methods for internal usage
+    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 class_name [Class]
+      # @param scope [TrueClass, Symbol, String, nil]
+      # @param code [TrueClass, Symbol, String, nil]
+      # @return [String]
+      def self.dependency_cipher(class_name, scope: nil, code: nil)
+        native_cipher = dependency_native_cipher(class_name)
+        native_cipher_partitions = native_cipher.rpartition('.')
+        scope = scope.is_a?(TrueClass) ? native_cipher_partitions.first : scope
+        code = code.nil? ? native_cipher_partitions.last : code
+
+        [scope, code].reject { |part| part.nil? || part.empty? }.join('.')
+      end
+
+      # @param class_name [Class]
+      # @return [String]
+      def self.dependency_native_cipher(class_name)
+        class_name.dup.gsub(/::/, '.').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+      end
+    end
+  end
+end

data/lib/aux/pluggable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'aux/pluggable/class_methods'
-require 'aux/pluggable/registration'
+require 'aux/pluggable/utilities'
 
 module Aux
   # Describes interface that makes any class able to register itself as well as resolve dependencies

data/lib/aux/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aux
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Evgeny Boyko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -65,7 +65,7 @@ files:
 - lib/aux/pluggable.rb
 - lib/aux/pluggable/class_methods.rb
 - lib/aux/pluggable/registration.rb
-- lib/aux/utilities.rb
+- lib/aux/pluggable/utilities.rb
 - lib/aux/validations.rb
 - lib/aux/validations/error.rb
 - lib/aux/validations/errors.rb

data/lib/aux/utilities.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Aux
-  # Random methods for internal usage
-  module Utilities
-    # @param class_name [String]
-    # @return [String]
-    def self.underscore(class_name)
-      class_name.dup.gsub(/::/, '.').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
-    end
-  end
-end