dry-core 0.4.9 → 0.7.1

data/lib/dry/core/extensions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module Dry
   module Core

data/lib/dry/core/inflector.rb

@@ -7,15 +7,15 @@ module Dry
       # List of supported backends
       BACKENDS = {
         activesupport: [
-          'active_support/inflector',
+          "active_support/inflector",
           proc { ::ActiveSupport::Inflector }
         ],
         dry_inflector: [
-          'dry/inflector',
+          "dry/inflector",
           proc { Dry::Inflector.new }
         ],
         inflecto: [
-          'inflecto',
+          "inflecto",
           proc { ::Inflecto }
         ]
       }.freeze
@@ -49,6 +49,7 @@ module Dry
         if name && !BACKENDS.key?(name)
           raise NameError, "Invalid inflector library selection: '#{name}'"
         end
+
         @inflector = name ? realize_backend(*BACKENDS[name]) : detect_backend
       end
 

data/lib/dry/core/memoizable.rb

@@ -1,67 +1,200 @@
 # frozen_string_literal: true
 
+require "dry/core/deprecations"
+
 module Dry
   module Core
     module Memoizable
       MEMOIZED_HASH = {}.freeze
+      PARAM_PLACEHOLDERS = %i[* ** &].freeze
 
       module ClassInterface
-        def memoize(*names)
-          prepend(Memoizer.new(self, names))
+        module Base
+          def memoize(*names)
+            prepend(Memoizer.new(self, names))
+          end
         end
 
-        def new(*)
-          obj = super
-          obj.instance_variable_set(:'@__memoized__', MEMOIZED_HASH.dup)
-          obj
+        module BasicObject
+          include Base
+
+          def new(*)
+            obj = super
+            obj.instance_eval { @__memoized__ = MEMOIZED_HASH.dup }
+            obj
+          end
+        end
+
+        module Object
+          include Base
+
+          def new(*)
+            obj = super
+            obj.instance_variable_set(:@__memoized__, MEMOIZED_HASH.dup)
+            obj
+          end
+
+          if respond_to?(:ruby2_keywords, true)
+            ruby2_keywords(:new)
+          end
         end
       end
 
       def self.included(klass)
         super
-        klass.extend(ClassInterface)
-      end
 
-      attr_reader :__memoized__
+        if klass <= Object
+          klass.extend(ClassInterface::Object)
+        else
+          klass.extend(ClassInterface::BasicObject)
+        end
+      end
 
       # @api private
-      class Memoizer < Module
-        attr_reader :klass
-        attr_reader :names
-
+      class Memoizer < ::Module
         # @api private
         def initialize(klass, names)
-          @names = names
-          @klass = klass
-          define_memoizable_names!
+          super()
+          names.each do |name|
+            define_memoizable(
+              method: klass.instance_method(name)
+            )
+          end
         end
 
         private
 
         # @api private
-        def define_memoizable_names!
-          names.each do |name|
-            meth = klass.instance_method(name)
-
-            if meth.parameters.size > 0
-              define_method(name) do |*args|
-                name_with_args = :"#{name}_#{args.hash}"
-
-                if __memoized__.key?(name_with_args)
-                  __memoized__[name_with_args]
-                else
-                  __memoized__[name_with_args] = super(*args)
-                end
-              end
+        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}                    # 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 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.
+                In the future, blocks will still be allowed but won't participate in
+                cache key calculation.
+              WARN
+            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
+
+        # @api private
+        def declaration(definition, lookup)
+          params = []
+          binds = []
+          defined = {}
+
+          definition.each do |type, name|
+            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_from_param(name) || make_bind_name(binds.size)
+
+              binds << bind
+              params << param(bind, mapped_type)
+            end
+          end
+
+          [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, name, original_params, defined_types) # rubocop:disable Metrics/PerceivedComplexity
+          case type
+          when :req
+            :reqular
+          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
             else
-              define_method(name) do
-                if __memoized__.key?(name)
-                  __memoized__[name]
-                else
-                  __memoized__[name] = super()
-                end
-              end
+              :rest
             end
+          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

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = '0.4.9'.freeze
+    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.4.9
+  version: 0.7.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -42,48 +42,40 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: A toolset of small support modules used throughout the dry-rb ecosystem.
+        version: '0'
+description: A toolset of small support modules used throughout the dry-rb ecosystem
 email:
 - fg@flashgordon.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".inch.yml"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
 - dry-core.gemspec
 - lib/dry-core.rb
 - lib/dry/core.rb
@@ -93,16 +85,20 @@ files:
 - lib/dry/core/constants.rb
 - lib/dry/core/deprecations.rb
 - lib/dry/core/descendants_tracker.rb
+- lib/dry/core/equalizer.rb
 - lib/dry/core/errors.rb
 - lib/dry/core/extensions.rb
 - lib/dry/core/inflector.rb
 - lib/dry/core/memoizable.rb
 - lib/dry/core/version.rb
-homepage: https://github.com/dry-rb/dry-core
+homepage: https://dry-rb.org/gems/dry-core
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-core/blob/master/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: 
 rdoc_options: []
 require_paths:
@@ -111,15 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: A toolset of small support modules used throughout the dry-rb ecosystem.
+summary: A toolset of small support modules used throughout the dry-rb ecosystem
 test_files: []

data/.codeclimate.yml

@@ -1,15 +0,0 @@
-version: "2"
-
-prepare:
-  fetch:
-  - url: "https://raw.githubusercontent.com/dry-rb/devtools/master/.rubocop.yml"
-    path: ".rubocop.yml"
-
-exclude_patterns:
-  - "benchmarks/"
-  - "examples/"
-  - "spec/"
-
-plugins:
-  rubocop:
-    enabled: true

data/.gitignore

@@ -1,11 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-spec/examples.txt
-.rubocop.yml

data/.inch.yml

@@ -1,4 +0,0 @@
-files:
-  excluded:
-    - lib/dry/core.rb
-    - lib/dry/core/version.rb

data/.rspec

@@ -1,3 +0,0 @@
---format progress
---color
---require ./spec/spec_helper.rb

data/.travis.yml

@@ -1,34 +0,0 @@
-language: ruby
-dist: trusty
-sudo: required
-cache: bundler
-bundler_args: --without benchmarks tools
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
-before_install:
-  - gem install bundler
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - truffleruby
-env:
-  global:
-    - COVERAGE=true
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: truffleruby
-  include:
-    - rvm: jruby-9.2.7.0
-      jdk: openjdk8
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false