dry-core 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f3b305a44c07e1b2de42160317f823835eafc272bffad043ffdf98e3fcd67c
-  data.tar.gz: 5d040687f80c2c6d03a55bc228027f4d094820b7a7f8bcc22edec3e32e99a1a4
+  metadata.gz: 5bebc041fb4b4179274ef429212f91054377d05b6d4e6f353eb515a008794bff
+  data.tar.gz: 58401fbebb0f25c9990d5f3f7a5dad7e5bc0512c1aa2787732e7c35016d913f8
 SHA512:
-  metadata.gz: 418356154a80dfd5cc2e31e04c84eeac838ff6d0d37c463db58ae68000d51b3eadb43f62ad5b41b3965b823967cd11967170dd38bc4ca71019ab54f098b14db0
-  data.tar.gz: 1afa97c77840ed121fb2b501e3bbafb3854d34aefc47596d435ad405c83153ca4e18fbf2e15e929093a90f81e4113bfd339c80d67056e86d3c349c607cf95749
+  metadata.gz: da17cd2eecc9cfdc1ac6210161b94cbf46a5e572a563ab4e1173fed488ad2690fedee3c64dcb8db55285dfc3277b988de794800d21a23161b8f537c14ec6ceff
+  data.tar.gz: 9a7530f8bdc1e5398638562a00021d689da2de8c52b704d4dc59817f0a70ce640b1e0fcc618690ff59853e437adc8456e3d8a4830978f2b0217c8bbe845bd352

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.7.0 2021-07-08
+
+
+### Fixed
+
+- [memoizable] warnings when using keyword arguments (@flash-gordon)
+- [deprecations] warnings show more relevant information about caller by default (@timriley)
+
+### Changed
+
+- Minimal Ruby version is 2.6
+
+[Compare v0.6.0...v0.7.0](https://github.com/dry-rb/dry-core/compare/v0.6.0...v0.7.0)
+
 ## 0.6.0 2021-06-03
 
 

data/README.md

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-core
 [actions]: https://github.com/dry-rb/dry-core/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-core
@@ -14,15 +15,15 @@
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-core)
+* [User documentation](https://dry-rb.org/gems/dry-core)
 * [API documentation](http://rubydoc.info/gems/dry-core)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.6.0`
+* ~~jruby~~ `>= 9.3` (we are waiting for [2.6 support](https://github.com/jruby/jruby/issues/6161))
 
 ## License
 

data/dry-core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   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.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"

data/lib/dry/core/cache.rb

@@ -46,7 +46,8 @@ module Dry
       #       this means you shouldn't pass Procs in args unless you're sure
       #       they are always the same instances, otherwise you introduce a memory leak
       #
-      # @return [Object] block's return value (cached for subsequent calls with the same argument values)
+      # @return [Object] block's return value (cached for subsequent calls with
+      #   the same argument values)
       def fetch_or_store(*args, &block)
         cache.fetch_or_store(args.hash, &block)
       end

data/lib/dry/core/class_attributes.rb

@@ -67,7 +67,7 @@ module Dry
       #    defines :one, coerce: Dry::Types['coercible.string']
       #  end
       #
-      def defines(*args, type: ::Object, coerce: IDENTITY)
+      def defines(*args, type: ::Object, coerce: IDENTITY) # rubocop:disable Metrics/PerceivedComplexity
         unless coerce.respond_to?(:call)
           raise ::ArgumentError, "Non-callable coerce option: #{coerce.inspect}"
         end
@@ -80,10 +80,10 @@ module Dry
               if Undefined.equal?(value)
                 if instance_variable_defined?(ivar)
                   instance_variable_get(ivar)
-                else
+                else # rubocop:disable Style/EmptyElse
                   nil
                 end
-              elsif type === value
+              elsif type === value # rubocop:disable Style/CaseEquality
                 instance_variable_set(ivar, coerce.call(value))
               else
                 raise InvalidClassAttributeValue.new(name, value)

data/lib/dry/core/class_builder.rb

@@ -6,9 +6,7 @@ module Dry
     class ClassBuilder
       ParentClassMismatch = Class.new(TypeError)
 
-      attr_reader :name
-      attr_reader :parent
-      attr_reader :namespace
+      attr_reader :name, :parent, :namespace
 
       def initialize(name:, parent: nil, namespace: nil)
         @name = name
@@ -83,7 +81,7 @@ module Dry
       def create_base(namespace, name, parent)
         begin
           namespace.const_get(name)
-        rescue NameError
+        rescue NameError # rubocop:disable Lint/SuppressedException
         end
 
         if namespace.const_defined?(name, false)

data/lib/dry/core/constants.rb

@@ -25,7 +25,7 @@ module Dry
       # An empty set
       EMPTY_SET = ::Set.new.freeze
       # An empty string
-      EMPTY_STRING = "".freeze
+      EMPTY_STRING = ""
       # Identity function
       IDENTITY = (-> x { x }).freeze
 
@@ -42,7 +42,7 @@ module Dry
       #   end
       Undefined = Object.new.tap do |undefined|
         # @api private
-        Self = -> { Undefined }
+        Self = -> { Undefined } # rubocop:disable Lint/ConstantDefinitionInBlock
 
         # @api public
         def undefined.to_s
@@ -62,7 +62,7 @@ module Dry
         #     1 + Undefined.default(val, 2)
         #   end
         #
-        def undefined.default(x, y = self)
+        def undefined.default(x, y = self) # rubocop:disable Naming/MethodParameterName
           if equal?(x)
             if equal?(y)
               yield

data/lib/dry/core/deprecations.rb

@@ -37,12 +37,11 @@ module Dry
         #   Defaults to "deprecated"
         # @param [Integer] Caller frame to add to the message
         def warn(msg, tag: nil, uplevel: nil)
-          caller_info = uplevel.nil? ? nil : caller[uplevel]
-          tag = "[#{tag || "deprecated"}]"
+          caller_info = uplevel.nil? ? nil : "#{caller_locations(uplevel + 2, 1)[0]} "
+          tag = "[#{tag || "deprecated"}] "
           hint = msg.gsub(/^\s+/, "")
-          logger.warn(
-            [caller_info, tag, hint].compact.join(" ")
-          )
+
+          logger.warn("#{caller_info}#{tag}#{hint}")
         end
 
         # Wraps arguments with a standard message format and prints a warning
@@ -50,6 +49,10 @@ module Dry
         # @param [Object] name what is deprecated
         # @param [String] msg additional message usually containing upgrade instructions
         def announce(name, msg, tag: nil, uplevel: nil)
+          # Bump the uplevel (if provided) by one to account for the uplevel calculation
+          # taking place one frame deeper in `.warn`
+          uplevel += 1 if uplevel
+
           warn(deprecation_message(name, msg), tag: tag, uplevel: uplevel)
         end
 
@@ -99,7 +102,7 @@ module Dry
         #   @param [#warn] logger
         #
         # @api public
-        def set_logger!(output = $stderr)
+        def set_logger!(output = $stderr) # rubocop:disable Naming/AccessorMethodName
           if output.respond_to?(:warn)
             @logger = output
           else
@@ -115,8 +118,9 @@ module Dry
       end
 
       # @api private
-      class Tagged < Module
+      class Tagged < ::Module
         def initialize(tag)
+          super()
           @tag = tag
         end
 
@@ -152,8 +156,8 @@ module Dry
         # @option [String] message optional deprecation message
         def deprecate(old_name, new_name = nil, message: nil)
           full_msg = Deprecations.deprecated_name_message(
-            "#{self.name}##{old_name}",
-            new_name ? "#{self.name}##{new_name}" : nil,
+            "#{name}##{old_name}",
+            new_name ? "#{name}##{new_name}" : nil,
             message
           )
           mod = self
@@ -185,8 +189,8 @@ module Dry
         # @option [String] message optional deprecation message
         def deprecate_class_method(old_name, new_name = nil, message: nil)
           full_msg = Deprecations.deprecated_name_message(
-            "#{self.name}.#{old_name}",
-            new_name ? "#{self.name}.#{new_name}" : nil,
+            "#{name}.#{old_name}",
+            new_name ? "#{name}.#{new_name}" : nil,
             message
           )
 
@@ -210,7 +214,7 @@ module Dry
           remove_const(constant_name)
 
           full_msg = Deprecations.deprecated_name_message(
-            "#{self.name}::#{constant_name}",
+            "#{name}::#{constant_name}",
             message
           )
 

data/lib/dry/core/equalizer.rb

@@ -14,7 +14,7 @@ module Dry
 
   module Core
     # Define equality, equivalence and inspection methods
-    class Equalizer < Module
+    class Equalizer < ::Module
       # Initialize an Equalizer with the given keys
       #
       # Will use the keys with which it is initialized to define #cmp?,
@@ -29,6 +29,7 @@ module Dry
       #
       # @api private
       def initialize(*keys, **options)
+        super()
         @keys = keys.uniq
         define_methods(**options)
         freeze

data/lib/dry/core/memoizable.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "dry/core/deprecations"
+
 module Dry
   module Core
     module Memoizable
@@ -27,7 +29,7 @@ module Dry
 
           def new(*)
             obj = super
-            obj.instance_variable_set(:'@__memoized__', MEMOIZED_HASH.dup)
+            obj.instance_variable_set(:@__memoized__, MEMOIZED_HASH.dup)
             obj
           end
 
@@ -48,9 +50,10 @@ module Dry
       end
 
       # @api private
-      class Memoizer < Module
+      class Memoizer < ::Module
         # @api private
         def initialize(klass, names)
+          super()
           names.each do |name|
             define_memoizable(
               method: klass.instance_method(name)
@@ -62,45 +65,116 @@ module Dry
 
         # @api private
         def define_memoizable(method:)
-          module_eval <<~RUBY, __FILE__, __LINE__ + 1
-            def #{method.name}(#{to_declaration(method.parameters)})
-              key = [Kernel.__method__] + Kernel.local_variables.map { |var| Kernel.eval(var.to_s) }
-
-              if @__memoized__.key?(key)
-                @__memoized__[key]
-              else
-                @__memoized__[key] = super
+          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
+            RUBY
+          else
+            mapping = parameters.to_h { |k, v = nil| [k, v] }
+            params, binds = declaration(parameters, mapping)
+
+            if parameters.last[0].eql?(:block)
+              Deprecations.warn(<<~WARN)
+                Memoization for block-accepting methods isn't safe.
+                Every call creates a new block instance bloating cached results.
+                In the future, blocks will still be allowed but won't participate in
+                cache key calculation.
+              WARN
             end
-          RUBY
 
-          if respond_to?(:ruby2_keywords, true)
-            ruby2_keywords(method.name)
+            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
+            RUBY
+
+            if respond_to?(:ruby2_keywords, true) && mapping.key?(:reyrest)
+              ruby2_keywords(method.name)
+            end
+          end
+        end
+
+        # @api private
+        def declaration(definition, lookup)
+          params = []
+          binds = []
+          defined = {}
+
+          definition.each do |type, name|
+            mapped_type = map_bind_type(type, lookup, defined) do
+              raise ::NotImplementedError, "type: #{type}, name: #{name}"
+            end
+
+            if mapped_type
+              defined[mapped_type] = true
+              bind = name || make_bind_name(binds.size)
+
+              binds << bind
+              params << param(bind, mapped_type)
+            end
           end
+
+          [params, binds]
+        end
+
+        # @api private
+        def make_bind_name(idx)
+          :"__lv_#{idx}__"
         end
 
         # @api private
-        def to_declaration(params, lookup = params.to_h)
-          params.map do |type, name|
-            case type
-            when :req
-              name
-            when :rest
-              "*#{name}"
-            when :keyreq
-              "#{name}:"
-            when :keyrest
-              "**#{name}"
-            when :block
-              "&#{name}"
-            when :opt
-              lookup.key?(:rest) ? nil : "*args"
-            when :key
-              lookup.key?(:keyrest) ? nil : "**kwargs"
+        def map_bind_type(type, original_params, defined_types) # rubocop:disable Metrics/PerceivedComplexity
+          case type
+          when :req
+            :reqular
+          when :rest, :keyreq, :keyrest, :block
+            type
+          when :opt
+            if original_params.key?(:rest) || defined_types[:rest]
+              nil
             else
-              raise NotImplementedError, "type: #{type}, name: #{name}"
+              :rest
             end
-          end.compact.join(", ")
+          when :key
+            if original_params.key?(:keyrest) || defined_types[:keyrest]
+              nil
+            else
+              :keyrest
+            end
+          else
+            yield
+          end
+        end
+
+        # @api private
+        def param(name, type)
+          case type
+          when :reqular
+            name
+          when :rest
+            "*#{name}"
+          when :keyreq
+            "#{name}:"
+          when :keyrest
+            "**#{name}"
+          when :block
+            "&#{name}"
+          end
         end
       end
     end

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = "0.6.0".freeze
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="