dry-core 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bebc041fb4b4179274ef429212f91054377d05b6d4e6f353eb515a008794bff
-  data.tar.gz: 58401fbebb0f25c9990d5f3f7a5dad7e5bc0512c1aa2787732e7c35016d913f8
+  metadata.gz: 9d3ee16c97a04071316e718d8277a4a0ac5aea083b37ac7944d65fd3fd78dfc2
+  data.tar.gz: 44e0e7cb408530f47add47481dd393ba8544e2bcb41256fa0d88af915e7ce547
 SHA512:
-  metadata.gz: da17cd2eecc9cfdc1ac6210161b94cbf46a5e572a563ab4e1173fed488ad2690fedee3c64dcb8db55285dfc3277b988de794800d21a23161b8f537c14ec6ceff
-  data.tar.gz: 9a7530f8bdc1e5398638562a00021d689da2de8c52b704d4dc59817f0a70ce640b1e0fcc618690ff59853e437adc8456e3d8a4830978f2b0217c8bbe845bd352
+  metadata.gz: 0a9787d9d8514c54564448b7e38a5c52810dfd95f098c399c0067928c221357ee772273ca8d8d258e9305679ad3d2ff552b3ea38318a8872136e36d7c434d0b3
+  data.tar.gz: 8f073e6e1c574404f6df1b699470432e4406129a20d2a8d27b0de10db52a8363beb5aaa086fb4c8c629402e3d1d5735715c5126e38384e20519dbee4f30a233f

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.8.0
+
+### Added
+
+- `Dry::Core::BasicObject` ported from hanami-utils (@jodosha)
+
+### Changed
+
+- [BREAKING] [descendants tracker] switch to using `Class#subclasses` on Ruby 3.1+.
+This changes the order of returned subclasses (immediate subclasses now go first) (@flash-gordon)
+
+
+[Compare v0.7.1...v0.8.0](https://github.com/dry-rb/dry-core/compare/v0.7.1...master)
+
+## 0.7.1 2021-07-10
+
+
+### Fixed
+
+- [memoizable] memoizable correctly handles cases where a method
+has unnamed params (e.g. happens when the new `...` syntax is used) (@flash-gordon)
+
+
+
+[Compare v0.7.0...v0.7.1](https://github.com/dry-rb/dry-core/compare/v0.7.0...v0.7.1)
+
 ## 0.7.0 2021-07-08
 
 
@@ -11,6 +37,7 @@
 ### Changed
 
 - Minimal Ruby version is 2.6
+- [memoizable] memoization of block-accepting methods is deprecated (@flash-gordon)
 
 [Compare v0.6.0...v0.7.0](https://github.com/dry-rb/dry-core/compare/v0.6.0...v0.7.0)
 
@@ -30,7 +57,7 @@
 
 [Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-core/compare/v0.5.0...v0.6.0)
 
-## 0.5.0 2012-12-12
+## 0.5.0 2020-12-12
 
 
 ### Added

data/README.md

@@ -11,7 +11,7 @@
 [![CI Status](https://github.com/dry-rb/dry-core/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/40946292b9094624beec604a149a6023)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/40946292b9094624beec604a149a6023)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-core.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-core.svg?branch=main)][inchpages]
 
 ## Links
 
@@ -22,8 +22,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.6.0`
-* ~~jruby~~ `>= 9.3` (we are waiting for [2.6 support](https://github.com/jruby/jruby/issues/6161))
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-core.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-core/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-core/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-core"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-core/issues"
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"

data/lib/dry/core/basic_object.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+# This implementation was imported from `hanami-utils` gem.
+module Dry
+  module Core
+    # BasicObject
+    #
+    # @since 0.8.0
+    class BasicObject < ::BasicObject
+      # Lookups constants at the top-level namespace, if they are missing in the
+      # current context.
+      #
+      # @param name [Symbol] the constant name
+      #
+      # @return [Object, Module] the constant
+      #
+      # @raise [NameError] if the constant cannot be found
+      #
+      # @since 0.8.0
+      # @api private
+      #
+      # @see https://ruby-doc.org/core/Module.html#method-i-const_missing
+      def self.const_missing(name)
+        ::Object.const_get(name)
+      end
+
+      # Returns the class for debugging purposes.
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-class
+      def class
+        (class << self; self; end).superclass
+      end
+
+      # Bare minimum inspect for debugging purposes.
+      #
+      # @return [String] the inspect string
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-inspect
+      inspect_method = ::Kernel.instance_method(:inspect)
+      define_method(:inspect) do
+        original = inspect_method.bind_call(self)
+        "#{original[0...-1]}#{__inspect}>"
+      end
+
+      # @!macro [attach] instance_of?(class)
+      #
+      # Determines if self is an instance of given class or module
+      #
+      # @param class [Class,Module] the class of module to verify
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @raise [TypeError] if the given argument is not of the expected types
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-instance_of-3F
+      define_method :instance_of?, ::Object.instance_method(:instance_of?)
+
+      # @!macro [attach] is_a?(class)
+      #
+      # Determines if self is of the type of the object class or module
+      #
+      # @param class [Class,Module] the class of module to verify
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @raise [TypeError] if the given argument is not of the expected types
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-is_a-3F
+      define_method :is_a?, ::Object.instance_method(:is_a?)
+
+      # @!macro [attach] kind_of?(class)
+      #
+      # Determines if self is of the kind of the object class or module
+      #
+      # @param class [Class,Module] the class of module to verify
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @raise [TypeError] if the given argument is not of the expected types
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-kind_of-3F
+      define_method :kind_of?, ::Object.instance_method(:kind_of?)
+
+      # Alias for __id__
+      #
+      # @return [Fixnum] the object id
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-object_id
+      def object_id
+        __id__
+      end
+
+      # Interface for pp
+      #
+      # @param printer [PP] the Pretty Printable printer
+      # @return [String] the pretty-printable inspection of the object
+      #
+      # @since 0.8.0
+      #
+      # @see https://ruby-doc.org/stdlib/libdoc/pp/rdoc/PP.html
+      def pretty_print(printer)
+        printer.text(inspect)
+      end
+
+      # Returns true if responds to the given method.
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @since 0.8.0
+      #
+      # @see http://ruby-doc.org/core/Object.html#method-i-respond_to-3F
+      def respond_to?(method_name, include_all = false) # rubocop:disable Style/OptionalBooleanParameter
+        respond_to_missing?(method_name, include_all)
+      end
+
+      private
+
+      # Must be overridden by descendants
+      #
+      # @since 0.8.0
+      # @api private
+      def respond_to_missing?(_method_name, _include_all)
+        ::Kernel.raise ::NotImplementedError
+      end
+
+      # @since 0.8.0
+      # @api private
+      def __inspect # rubocop:disable Style/EmptyMethod
+      end
+    end
+  end
+end

data/lib/dry/core/cache.rb

@@ -60,8 +60,8 @@ module Dry
         # @yield An arbitrary block
         #
         # @return [Object] block's return value
-        def fetch_or_store(*args, &block)
-          self.class.fetch_or_store(*args, &block)
+        def fetch_or_store(...)
+          self.class.fetch_or_store(...)
         end
       end
     end

data/lib/dry/core/class_attributes.rb

@@ -80,7 +80,7 @@ module Dry
               if Undefined.equal?(value)
                 if instance_variable_defined?(ivar)
                   instance_variable_get(ivar)
-                else # rubocop:disable Style/EmptyElse
+                else
                   nil
                 end
               elsif type === value # rubocop:disable Style/CaseEquality

data/lib/dry/core/constants.rb

@@ -62,7 +62,7 @@ module Dry
         #     1 + Undefined.default(val, 2)
         #   end
         #
-        def undefined.default(x, y = self) # rubocop:disable Naming/MethodParameterName
+        def undefined.default(x, y = self)
           if equal?(x)
             if equal?(y)
               yield

data/lib/dry/core/deprecations.rb

@@ -4,7 +4,7 @@ require "logger"
 
 module Dry
   module Core
-    # An extension for issueing warnings on using deprecated methods.
+    # An extension for issuing warnings on using deprecated methods.
     #
     # @example
     #

data/lib/dry/core/memoizable.rb

@@ -6,12 +6,20 @@ module Dry
   module Core
     module Memoizable
       MEMOIZED_HASH = {}.freeze
+      PARAM_PLACEHOLDERS = %i[* ** &].freeze
 
       module ClassInterface
         module Base
           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)
+          end
         end
 
         module BasicObject
@@ -51,6 +59,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()
@@ -64,25 +78,56 @@ module Dry
         private
 
         # @api private
+        # 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}
-                if @__memoized__.key?(#{key})
-                  @__memoized__[#{key}]
-                else
-                  @__memoized__[#{key}] = super
-                end
+            key = "#{object_id}:#{method.name}".hash.abs
+
+            define_method(method.name) do
+              value = super()
+
+              if kernel[:frozen].bind(self).call
+                # 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(self).(ivar_name, value)
+                eigenclass = kernel[:singleton].bind(self).call
+                eigenclass.attr_reader(attr_name)
+                eigenclass.alias_method(method.name, attr_name)
+                eigenclass.remove_method(attr_name)
               end
-            RUBY
+
+              value
+            end
           else
             mapping = parameters.to_h { |k, v = nil| [k, v] }
             params, binds = declaration(parameters, mapping)
+            last_param = parameters.last
 
-            if parameters.last[0].eql?(:block)
+            if last_param[0].eql?(:block) && !last_param[1].eql?(:&)
               Deprecations.warn(<<~WARN)
                 Memoization for block-accepting methods isn't safe.
                 Every call creates a new block instance bloating cached results.
@@ -91,23 +136,27 @@ module Dry
               WARN
             end
 
-            module_eval <<~RUBY, __FILE__, __LINE__ + 1
-              def #{method.name}(#{params.join(", ")})
-                key = [:"#{method.name}", #{binds.join(", ")}].hash
-
-                if @__memoized__.key?(key)
-                  @__memoized__[key]
-                else
-                  @__memoized__[key] = super
-                end
-              end
+            m = module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+              def #{method.name}(#{params.join(", ")})                 # def slow_calc(arg1, arg2, arg3)
+                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]
+                else                                                   #   else
+                  @__memoized__[key] = super                           #     @__memoized__[key] = super
+                end                                                    #   end
+              end                                                      # end
             RUBY
 
             if respond_to?(:ruby2_keywords, true) && mapping.key?(:reyrest)
               ruby2_keywords(method.name)
             end
+
+            m
           end
         end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
 
         # @api private
         def declaration(definition, lookup)
@@ -116,13 +165,13 @@ module Dry
           defined = {}
 
           definition.each do |type, name|
-            mapped_type = map_bind_type(type, lookup, defined) do
+            mapped_type = map_bind_type(type, name, lookup, defined) do
               raise ::NotImplementedError, "type: #{type}, name: #{name}"
             end
 
             if mapped_type
               defined[mapped_type] = true
-              bind = name || make_bind_name(binds.size)
+              bind = name_from_param(name) || make_bind_name(binds.size)
 
               binds << bind
               params << param(bind, mapped_type)
@@ -132,18 +181,35 @@ module Dry
           [params, binds]
         end
 
+        # @api private
+        def name_from_param(name)
+          if PARAM_PLACEHOLDERS.include?(name)
+            nil
+          else
+            name
+          end
+        end
+
         # @api private
         def make_bind_name(idx)
           :"__lv_#{idx}__"
         end
 
         # @api private
-        def map_bind_type(type, original_params, defined_types) # rubocop:disable Metrics/PerceivedComplexity
+        def map_bind_type(type, name, original_params, defined_types) # rubocop:disable Metrics/PerceivedComplexity
           case type
           when :req
             :reqular
-          when :rest, :keyreq, :keyrest, :block
+          when :rest, :keyreq, :keyrest
             type
+          when :block
+            if name.eql?(:&)
+              # most likely this is a case of delegation
+              # rather than actual block
+              nil
+            else
+              type
+            end
           when :opt
             if original_params.key?(:rest) || defined_types[:rest]
               nil

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = "0.7.0"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-core
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -79,6 +79,7 @@ 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
@@ -96,7 +97,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,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="