dry-core 0.7.1 → 1.0.1

data/lib/dry/core/memoizable.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Core
     module Memoizable
@@ -13,6 +11,13 @@ module Dry
           def memoize(*names)
             prepend(Memoizer.new(self, names))
           end
+
+          def inherited(base)
+            super
+
+            memoizer = base.ancestors.find { _1.is_a?(Memoizer) }
+            base.prepend(memoizer.dup) if memoizer
+          end
         end
 
         module BasicObject
@@ -52,6 +57,12 @@ module Dry
 
       # @api private
       class Memoizer < ::Module
+        KERNEL = {
+          singleton: ::Kernel.instance_method(:singleton_class),
+          ivar_set: ::Kernel.instance_method(:instance_variable_set),
+          frozen: ::Kernel.instance_method(:frozen?)
+        }.freeze
+
         # @api private
         def initialize(klass, names)
           super()
@@ -65,20 +76,50 @@ module Dry
         private
 
         # @api private
-        def define_memoizable(method:) # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/PerceivedComplexity
+        def define_memoizable(method:)
           parameters = method.parameters
+          mod = self
+          kernel = KERNEL
 
           if parameters.empty?
-            key = method.name.hash
-            module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-              def #{method.name}                    # def slow_fetch
-                if @__memoized__.key?(#{key})       #   if @__memoized__.key?(12345678)
-                  @__memoized__[#{key}]             #     @__memoized__[12345678]
-                else                                #   else
-                  @__memoized__[#{key}] = super     #     @__memoized__[12345678] = super
-                end                                 #   end
-              end                                   # end
-            RUBY
+            key = "#{object_id}:#{method.name}".hash.abs
+
+            define_method(method.name) do
+              value = super()
+
+              if kernel[:frozen].bind_call(self)
+                # It's not possible to modify singleton classes
+                # of frozen objects
+                mod.remove_method(method.name)
+                mod.module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+                  def #{method.name}                          # def slow_calc
+                    cached = @__memoized__[#{key}]            #   cached = @__memoized__[12345678]
+                                                              #
+                    if cached || @__memoized__.key?(#{key})   #   if cached || @__memoized__.key?(12345678)
+                      cached                                  #     cached
+                    else                                      #   else
+                      @__memoized__[#{key}] = super           #     @__memoized__[12345678] = super
+                    end                                       #   end
+                  end                                         # end
+                RUBY
+              else
+                # We make an attr_reader for computed value.
+                # Readers are "special-cased" in ruby so such
+                # access will be the fastest way, faster than you'd
+                # expect :)
+                attr_name = :"__memozed_#{key}__"
+                ivar_name = :"@#{attr_name}"
+                kernel[:ivar_set].bind_call(self, ivar_name, value)
+                eigenclass = kernel[:singleton].bind_call(self)
+                eigenclass.attr_reader(attr_name)
+                eigenclass.alias_method(method.name, attr_name)
+                eigenclass.remove_method(attr_name)
+              end
+
+              value
+            end
           else
             mapping = parameters.to_h { |k, v = nil| [k, v] }
             params, binds = declaration(parameters, mapping)
@@ -95,7 +136,7 @@ module Dry
 
             m = module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
               def #{method.name}(#{params.join(", ")})                 # def slow_calc(arg1, arg2, arg3)
-                key = [:"#{method.name}", #{binds.join(", ")}].hash    #   [:slow_calc, arg1, arg2, arg3].hash
+                key = [:"#{method.name}", #{binds.join(", ")}].hash    #   key = [:slow_calc, arg1, arg2, arg3].hash
                                                                        #
                 if @__memoized__.key?(key)                             #   if @__memoized__.key?(key)
                   @__memoized__[key]                                   #     @__memoized__[key]
@@ -112,6 +153,8 @@ module Dry
             m
           end
         end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
 
         # @api private
         def declaration(definition, lookup)

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = "0.7.1"
+    VERSION = "1.0.1"
   end
 end

data/lib/dry/core.rb

@@ -1,10 +1,56 @@
 # frozen_string_literal: true
 
+require "zeitwerk"
+
+require "dry/core/constants"
+require "dry/core/errors"
 require "dry/core/version"
 
 # :nodoc:
 module Dry
   # :nodoc:
   module Core
+    include Constants
+
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-core"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-core.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-core.rb",
+          "#{root}/dry/core/{constants,errors,version}.rb"
+        )
+        loader.inflector.inflect("namespace_dsl" => "NamespaceDSL")
+      end
+    end
+
+    loader.setup
+
+    # Build an equalizer module for the inclusion in other class
+    #
+    # ## Credits
+    #
+    # Equalizer has been originally imported from the equalizer gem created by Dan Kubb
+    #
+    # @api public
+    def self.Equalizer(*keys, **options)
+      Equalizer.new(*keys, **options)
+    end
+  end
+
+  # See dry/core/equalizer.rb
+  unless singleton_class.method_defined?(:Equalizer)
+    # Build an equalizer module for the inclusion in other class
+    #
+    # ## Credits
+    #
+    # Equalizer has been originally imported from the equalizer gem created by Dan Kubb
+    #
+    # @api public
+    def self.Equalizer(*keys, **options)
+      Dry::Core::Equalizer.new(*keys, **options)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-core
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -79,10 +93,24 @@ files:
 - dry-core.gemspec
 - lib/dry-core.rb
 - lib/dry/core.rb
+- lib/dry/core/basic_object.rb
 - lib/dry/core/cache.rb
 - lib/dry/core/class_attributes.rb
 - lib/dry/core/class_builder.rb
 - lib/dry/core/constants.rb
+- lib/dry/core/container.rb
+- lib/dry/core/container/config.rb
+- lib/dry/core/container/configuration.rb
+- lib/dry/core/container/item.rb
+- lib/dry/core/container/item/callable.rb
+- lib/dry/core/container/item/factory.rb
+- lib/dry/core/container/item/memoizable.rb
+- lib/dry/core/container/mixin.rb
+- lib/dry/core/container/namespace.rb
+- lib/dry/core/container/namespace_dsl.rb
+- lib/dry/core/container/registry.rb
+- lib/dry/core/container/resolver.rb
+- lib/dry/core/container/stub.rb
 - lib/dry/core/deprecations.rb
 - lib/dry/core/descendants_tracker.rb
 - lib/dry/core/equalizer.rb
@@ -96,7 +124,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-core/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-core/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-core
   bug_tracker_uri: https://github.com/dry-rb/dry-core/issues
 post_install_message: 
@@ -107,14 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: A toolset of small support modules used throughout the dry-rb ecosystem