dry-core 0.7.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb330574bba6050e9a3d0fd466fdbd276ce76749b2661b8091ebf6178a2ef6c9
-  data.tar.gz: c1319b83600515df992a91556000989aa092d4229f69669b8f544368d93d21a8
+  metadata.gz: 81d1266061bbae6eb6d4c08dba39d2787f29f033ec6b8ed8555830e170cae6fc
+  data.tar.gz: bb44a8177749013af0a3245e5e7e9c168818700c6d93b5dbbcf4d46d05e9e4fd
 SHA512:
-  metadata.gz: 2b1967bb0c991637ea01da5d267df78daa12e4801288932372eca2ecf8aff0c5933ef2cb9cdc06d978d6223da963a31dc5e362f1ad1052490e10ebbc2b39fae6
-  data.tar.gz: 22662f066d46742cfd12d79eddcfb1e76811ab00b0080be8bac8fef53a1229fa91f5501b9f0b34f09182f5843c7bf995332fc16d1fe192daeadff186cd543cb7
+  metadata.gz: 48c5e7b008c7f1b3ec9d23801f020ee67f34199aec9e9690066cd7a4316e7d79e48c77056df180679e22767b367b4988c0f617948c49d931e5d62f3be54a1c4f
+  data.tar.gz: a2eb13da61361ef1d7c2ebb52390df5406f1598d1a9f64c2b11de9fc574d51f28920cc34342dfa3027bb9eb73b13802114b0d0aaafd51e0688cda7b66fd647bc

data/CHANGELOG.md

@@ -1,5 +1,50 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.9.1 2022-10-18
+
+
+### Changed
+
+- Correct missing constant for IDENTITY (issue #75 fixed via #76) (@poloka)
+
+[Compare v0.9.0...v0.9.1](https://github.com/dry-rb/dry-core/compare/v0.9.0...v0.9.1)
+
+## 0.9.0 2022-10-15
+
+
+### Changed
+
+- dry-core now uses zeitwerk for autoloading (@solnic)
+
+[Compare v0.8.1...v0.9.0](https://github.com/dry-rb/dry-core/compare/v0.8.1...v0.9.0)
+
+## 0.8.1 2022-07-27
+
+
+### Fixed
+
+- [memoizable] plays better with inheritance.
+There were cases when cached values from base claesses were used, see #70 (@flash-gordon)
+
+
+
+[Compare v0.8.0...v0.8.1](https://github.com/dry-rb/dry-core/compare/v0.8.0...v0.8.1)
+
+## 0.8.0 2022-07-15
+
+
+### 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...v0.8.0)
+
 ## 0.7.1 2021-07-10
 
 
@@ -43,7 +88,7 @@ has unnamed params (e.g. happens when the new `...` syntax is used) (@flash-gord
 
 [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/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

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,14 +22,15 @@ 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"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/core/constants"
-require "dry/core/errors"
 
 module Dry
   module Core
@@ -10,7 +9,6 @@ module Dry
     # @api public
     module ClassAttributes
       include Constants
-
       # Specify what attributes a class will use
       #
       # @example
@@ -80,13 +78,13 @@ 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
                 instance_variable_set(ivar, coerce.call(value))
               else
-                raise InvalidClassAttributeValue.new(name, value)
+                raise InvalidClassAttributeValueError.new(name, value)
               end
             end
           end

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/equalizer.rb

@@ -1,17 +1,6 @@
 # frozen_string_literal: true
 
 module Dry
-  # 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
-
   module Core
     # Define equality, equivalence and inspection methods
     class Equalizer < ::Module
@@ -149,4 +138,19 @@ module Dry
       end
     end
   end
+
+  # Old modules that depend on dry/core/equalizer may miss
+  # this method if dry/core is not required explicitly
+  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

data/lib/dry/core/errors.rb

@@ -2,7 +2,7 @@
 
 module Dry
   module Core
-    class InvalidClassAttributeValue < StandardError
+    class InvalidClassAttributeValueError < StandardError
       def initialize(name, value)
         super(
           "Value #{value.inspect} is invalid for class attribute #{name.inspect}"

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)
+          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 = "0.9.1"
   end
 end

data/lib/dry/core.rb

@@ -1,10 +1,44 @@
 # 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"
+        )
+      end
+    end
+
+    loader.setup
+  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: 0.9.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2022-10-18 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,6 +93,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 +111,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 +122,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:
   - - ">="