dry-core 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bebc041fb4b4179274ef429212f91054377d05b6d4e6f353eb515a008794bff
-  data.tar.gz: 58401fbebb0f25c9990d5f3f7a5dad7e5bc0512c1aa2787732e7c35016d913f8
+  metadata.gz: cb330574bba6050e9a3d0fd466fdbd276ce76749b2661b8091ebf6178a2ef6c9
+  data.tar.gz: c1319b83600515df992a91556000989aa092d4229f69669b8f544368d93d21a8
 SHA512:
-  metadata.gz: da17cd2eecc9cfdc1ac6210161b94cbf46a5e572a563ab4e1173fed488ad2690fedee3c64dcb8db55285dfc3277b988de794800d21a23161b8f537c14ec6ceff
-  data.tar.gz: 9a7530f8bdc1e5398638562a00021d689da2de8c52b704d4dc59817f0a70ce640b1e0fcc618690ff59853e437adc8456e3d8a4830978f2b0217c8bbe845bd352
+  metadata.gz: 2b1967bb0c991637ea01da5d267df78daa12e4801288932372eca2ecf8aff0c5933ef2cb9cdc06d978d6223da963a31dc5e362f1ad1052490e10ebbc2b39fae6
+  data.tar.gz: 22662f066d46742cfd12d79eddcfb1e76811ab00b0080be8bac8fef53a1229fa91f5501b9f0b34f09182f5843c7bf995332fc16d1fe192daeadff186cd543cb7

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 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 +23,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)
 

data/lib/dry/core/memoizable.rb

@@ -6,6 +6,7 @@ module Dry
   module Core
     module Memoizable
       MEMOIZED_HASH = {}.freeze
+      PARAM_PLACEHOLDERS = %i[* ** &].freeze
 
       module ClassInterface
         module Base
@@ -64,25 +65,26 @@ module Dry
         private
 
         # @api private
-        def define_memoizable(method:)
+        def define_memoizable(method:) # rubocop:disable Metrics/AbcSize
           parameters = method.parameters
 
           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
-              end
+            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
           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,21 +93,23 @@ 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    #   [: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
 
@@ -116,13 +120,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 +136,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.7.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.7.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby