dry-core 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36bbcb4408defe80fa90d925a7cb44f39a7e879bf0b2a8c81833e798a5446c63
-  data.tar.gz: d15a43167c6de013170621a556a7d2845f79cb24e1d611359d17bf8918f2d0fd
+  metadata.gz: ada367e2c1685eb461bc598f50ccf1496db04ca3872db6767cb78b68f662ce17
+  data.tar.gz: 2d4649248b3f5ed774e29a4bca37330aa38c0a044f834f01af9181d4454ebf9b
 SHA512:
-  metadata.gz: 8189675ea585094286244bef37ca1bc400eadf18a295e3d6a3beb23ed3e733c94a5bf8da8c3df001022244df2b2d1a68212370a6e248b53504d1a48726131a7f
-  data.tar.gz: 70b957e62e938bee19922086549d3472ab36676d5e30cf6f671e88f844d1ce4787d4d71f4980875cbf6d8b5c4d79fe6eb7afe0a626b6bb38d45f28ddce18fec8
+  metadata.gz: 0f4a9cecf88aea238ea6fd977edd0878bc83c773a7f2955afec6552092ebcad0717a4978b47f4ceeb1dd316d201ba0adba4c4d6934c8b01a8eb3eac4f6d43d0e
+  data.tar.gz: 86b97e82c64baae2ae65c7da27c91102f1bc21a0c0c3c58a9c15dc541ebd10efeb9f1e5f8764297ad12a403e14be0d0ec15f5148182b83c0f891312824c03a42

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.1.0 2025-01-04
+
+
+### Changed
+
+- Minimal Ruby version is 3.1 (@flash-gordon)
+- Fixed clash with `dry-logger` (see #80) (@flash-gordon)
+
+[Compare v1.0.1...v1.1.0](https://github.com/dry-rb/dry-core/compare/v1.0.1...v1.1.0)
+
 ## 1.0.1 2023-08-06
 
 
@@ -12,7 +22,7 @@
 
 ### Changed
 
-- Minimal Ruby version is 3.0
+- Minimal Ruby version is 3.0 (@flash-gordon)
 
 [Compare v1.0.0...v1.0.1](https://github.com/dry-rb/dry-core/compare/v1.0.0...v1.0.1)
 

data/README.md

@@ -2,7 +2,7 @@
 [gem]: https://rubygems.org/gems/dry-core
 [actions]: https://github.com/dry-rb/dry-core/actions
 
-# dry-core [![Gem Version](https://badge.fury.io/rb/dry-core.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-core/workflows/ci/badge.svg)][actions]
+# dry-core [![Gem Version](https://badge.fury.io/rb/dry-core.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-core/workflows/CI/badge.svg)][actions]
 
 ## Links
 
@@ -14,7 +14,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 3.0.0`
+* MRI `>= 3.1`
 * jruby `>= 9.4` (not tested on CI)
 
 ## License

data/dry-core.gemspec

@@ -21,19 +21,16 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  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.metadata["allowed_push_host"]     = "https://rubygems.org"
+  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.metadata["rubygems_mfa_required"] = "true"
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "logger"
-  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_dependency "logger"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/dry/core/cache.rb

@@ -23,7 +23,7 @@ module Dry
       def self.extended(klass)
         super
         klass.include(Methods)
-        klass.instance_variable_set(:@__cache__, Concurrent::Map.new)
+        klass.instance_variable_set(:@__cache__, ::Concurrent::Map.new)
       end
 
       # @api private
@@ -48,8 +48,8 @@ module Dry
       #
       # @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)
+      def fetch_or_store(*args, &)
+        cache.fetch_or_store(args.hash, &)
       end
 
       # Instance methods

data/lib/dry/core/class_builder.rb

@@ -4,14 +4,14 @@ module Dry
   module Core
     # Class for generating more classes
     class ClassBuilder
-      ParentClassMismatch = Class.new(TypeError)
+      ParentClassMismatch = ::Class.new(::TypeError)
 
       attr_reader :name, :parent, :namespace
 
       def initialize(name:, parent: nil, namespace: nil)
         @name = name
         @namespace = namespace
-        @parent = parent || Object
+        @parent = parent || ::Object
       end
 
       # Generate a class based on options
@@ -48,7 +48,7 @@ module Dry
 
       # @api private
       def create_anonymous
-        klass = Class.new(parent)
+        klass = ::Class.new(parent)
         name = self.name
 
         klass.singleton_class.class_eval do
@@ -64,7 +64,7 @@ module Dry
       def create_named
         name = self.name
         base = create_base(namespace, name, parent)
-        klass = Class.new(base)
+        klass = ::Class.new(base)
 
         namespace.module_eval do
           remove_const(name)
@@ -93,7 +93,7 @@ module Dry
 
           existing
         else
-          klass = Class.new(parent || Object)
+          klass = ::Class.new(parent || ::Object)
           namespace.const_set(name, klass)
           klass
         end

data/lib/dry/core/constants.rb

@@ -27,7 +27,7 @@ module Dry
       # An empty string
       EMPTY_STRING = ""
       # Identity function
-      IDENTITY = (-> x { x }).freeze
+      IDENTITY = ->(x) { x }.freeze
 
       # A special value you can use as a default to know if no arguments
       # were passed to the method
@@ -40,7 +40,7 @@ module Dry
       #       puts value
       #     end
       #   end
-      Undefined = Object.new.tap do |undefined|
+      Undefined = ::Object.new.tap do |undefined|
         # @api private
         Self = -> { Undefined } # rubocop:disable Lint/ConstantDefinitionInBlock
 

data/lib/dry/core/container/item.rb

@@ -8,6 +8,8 @@ module Dry
       # @api abstract
       #
       class Item
+        NO_OPTIONS = {}.freeze
+
         # @return [Mixed] the item to be solved later
         attr_reader :item
 
@@ -15,16 +17,17 @@ module Dry
         attr_reader :options
 
         # @api abstract
-        def initialize(item, options = {})
+        def initialize(item, options = NO_OPTIONS)
           @item = item
           @options = {
-            call: item.is_a?(::Proc) && item.parameters.empty?
-          }.merge(options)
+            call: item.is_a?(::Proc) && item.parameters.empty?,
+            **options
+          }
         end
 
         # @api abstract
         def call
-          raise NotImplementedError
+          raise ::NotImplementedError
         end
 
         # @private

data/lib/dry/core/container/mixin.rb

@@ -6,18 +6,18 @@ require "dry/core/constants"
 module Dry
   module Core
     class Container
-      include Dry::Core::Constants
+      include ::Dry::Core::Constants
 
       # @api public
-      Error = Class.new(StandardError)
+      Error = ::Class.new(::StandardError)
 
       # Error raised when key is not defined in the registry
       #
       # @api public
-      KeyError = Class.new(::KeyError)
+      KeyError = ::Class.new(::KeyError)
 
-      if defined?(DidYouMean::KeyErrorChecker)
-        DidYouMean.correct_error(KeyError, DidYouMean::KeyErrorChecker)
+      if defined?(::DidYouMean::KeyErrorChecker)
+        ::DidYouMean.correct_error(KeyError, ::DidYouMean::KeyErrorChecker)
       end
 
       # Mixin to expose Inversion of Control (IoC) container behaviour
@@ -68,7 +68,7 @@ module Dry
 
         # @private
         module Initializer
-          def initialize(*args, &block)
+          def initialize(...)
             @_container = ::Concurrent::Hash.new
             super
           end
@@ -112,8 +112,8 @@ module Dry
           config.registry.call(_container, key, item, options)
 
           self
-        rescue FrozenError
-          raise FrozenError,
+        rescue ::FrozenError
+          raise ::FrozenError,
                 "can't modify frozen #{self.class} (when attempting to register '#{key}')"
         end
 
@@ -128,8 +128,8 @@ module Dry
         # @return [Mixed]
         #
         # @api public
-        def resolve(key, &block)
-          config.resolver.call(_container, key, &block)
+        def resolve(key, &)
+          config.resolver.call(_container, key, &)
         end
 
         # Resolve an item from the container
@@ -198,8 +198,8 @@ module Dry
         # @return [Dry::Core::Container::Mixin] self
         #
         # @api public
-        def each_key(&block)
-          config.resolver.each_key(_container, &block)
+        def each_key(&)
+          config.resolver.each_key(_container, &)
           self
         end
 
@@ -215,8 +215,8 @@ module Dry
         # @note In discussions with other developers, it was felt that being able to iterate
         #       over not just the registered keys, but to see what was registered would be
         #       very helpful. This is a step toward doing that.
-        def each(&block)
-          config.resolver.each(_container, &block)
+        def each(&)
+          config.resolver.each(_container, &)
         end
 
         # Decorates an item from the container with specified decorator
@@ -250,12 +250,12 @@ module Dry
         # @return [Dry::Core::Container::Mixin] self
         #
         # @api public
-        def namespace(namespace, &block)
+        def namespace(namespace, &)
           ::Dry::Core::Container::NamespaceDSL.new(
             self,
             namespace,
             config.namespace_separator,
-            &block
+            &
           )
 
           self

data/lib/dry/core/container/namespace_dsl.rb

@@ -34,12 +34,12 @@ module Dry
           end
         end
 
-        def register(key, *args, &block)
-          super(namespaced(key), *args, &block)
+        def register(key, ...)
+          super(namespaced(key), ...)
         end
 
-        def namespace(namespace, &block)
-          super(namespaced(namespace), &block)
+        def namespace(namespace, &)
+          super(namespaced(namespace), &)
         end
 
         def import(namespace)

data/lib/dry/core/container/resolver.rb

@@ -66,8 +66,8 @@ module Dry
         # @return Hash
         #
         # @api public
-        def each_key(container, &block)
-          container.each_key(&block)
+        def each_key(container, &)
+          container.each_key(&)
         end
 
         # Calls block once for each key in container, passing the key and
@@ -81,8 +81,8 @@ module Dry
         # @note In discussions with other developers, it was felt that being able
         #       to iterate over not just the registered keys, but to see what was
         #       registered would be very helpful. This is a step toward doing that.
-        def each(container, &block)
-          container.map { |key, value| [key, value.call] }.each(&block)
+        def each(container, &)
+          container.map { |key, value| [key, value.call] }.each(&)
         end
       end
     end

data/lib/dry/core/container/stub.rb

@@ -14,7 +14,7 @@ module Dry
         # Add a stub to the container
         def stub(key, value, &block)
           unless key?(key)
-            raise ArgumentError, "cannot stub #{key.to_s.inspect} - no such key in container"
+            raise ::ArgumentError, "cannot stub #{key.to_s.inspect} - no such key in container"
           end
 
           _stubs[key.to_s] = value

data/lib/dry/core/deprecations.rb

@@ -106,7 +106,7 @@ module Dry
           if output.respond_to?(:warn)
             @logger = output
           else
-            @logger = Logger.new(output).tap do |logger|
+            @logger = ::Logger.new(output).tap do |logger|
               logger.formatter = proc { |_, _, _, msg| "#{msg}\n" }
             end
           end
@@ -218,7 +218,7 @@ module Dry
             message
           )
 
-          mod = Module.new do
+          mod = ::Module.new do
             define_method(:const_missing) do |missing|
               if missing == constant_name
                 warn("#{full_msg}\n#{STACK.()}")

data/lib/dry/core/descendants_tracker.rb

@@ -30,7 +30,7 @@ module Dry
       class << self
         # @api private
         def setup(target)
-          target.instance_variable_set(:@descendants, Concurrent::Array.new)
+          target.instance_variable_set(:@descendants, ::Concurrent::Array.new)
         end
 
         private

data/lib/dry/core/equalizer.rb

@@ -150,7 +150,7 @@ module Dry
     #
     # @api public
     def self.Equalizer(*keys, **options)
-      Dry::Core::Equalizer.new(*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 InvalidClassAttributeValueError < StandardError
+    class InvalidClassAttributeValueError < ::StandardError
       def initialize(name, value)
         super(
           "Value #{value.inspect} is invalid for class attribute #{name.inspect}"

data/lib/dry/core/extensions.rb

@@ -25,7 +25,7 @@ module Dry
       def self.extended(obj)
         super
         obj.instance_variable_set(:@__available_extensions__, {})
-        obj.instance_variable_set(:@__loaded_extensions__, Set.new)
+        obj.instance_variable_set(:@__loaded_extensions__, ::Set.new)
       end
 
       # Register an extension
@@ -50,7 +50,7 @@ module Dry
       def load_extensions(*extensions)
         extensions.each do |ext|
           block = @__available_extensions__.fetch(ext) do
-            raise ArgumentError, "Unknown extension: #{ext.inspect}"
+            raise ::ArgumentError, "Unknown extension: #{ext.inspect}"
           end
           unless @__loaded_extensions__.include?(ext)
             block.call

data/lib/dry/core/inflector.rb

@@ -12,7 +12,7 @@ module Dry
         ],
         dry_inflector: [
           "dry/inflector",
-          proc { Dry::Inflector.new }
+          proc { ::Dry::Inflector.new }
         ],
         inflecto: [
           "inflecto",
@@ -25,7 +25,7 @@ module Dry
       # @api private
       def self.realize_backend(path, backend_factory)
         require path
-      rescue LoadError
+      rescue ::LoadError
         nil
       else
         backend_factory.call
@@ -37,9 +37,11 @@ module Dry
       def self.detect_backend
         BACKENDS.inject(nil) do |backend, (_, (path, factory))|
           backend || realize_backend(path, factory)
-        end || raise(LoadError,
-                     "No inflector library could be found: "\
-                     "please install either the `inflecto` or `activesupport` gem.")
+        end || raise(
+          LoadError,
+          "No inflector library could be found: " \
+          "please install either the `inflecto` or `activesupport` gem."
+        )
       end
 
       # Set preferred backend
@@ -47,7 +49,7 @@ module Dry
       # @param [Symbol] name backend name (:activesupport or :inflecto)
       def self.select_backend(name = nil)
         if name && !BACKENDS.key?(name)
-          raise NameError, "Invalid inflector library selection: '#{name}'"
+          raise ::NameError, "Invalid inflector library selection: '#{name}'"
         end
 
         @inflector = name ? realize_backend(*BACKENDS[name]) : detect_backend

data/lib/dry/core/memoizable.rb

@@ -23,7 +23,7 @@ module Dry
         module BasicObject
           include Base
 
-          def new(*)
+          def new(*, **)
             obj = super
             obj.instance_eval { @__memoized__ = MEMOIZED_HASH.dup }
             obj
@@ -33,15 +33,11 @@ module Dry
         module Object
           include Base
 
-          def new(*)
+          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
 
@@ -77,14 +73,13 @@ module Dry
 
         # @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 = "#{object_id}:#{method.name}".hash.abs
+            key = "#{__id__}:#{method.name}".hash.abs
 
             define_method(method.name) do
               value = super()
@@ -134,7 +129,7 @@ module Dry
               WARN
             end
 
-            m = module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+            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
                                                                        #
@@ -146,16 +141,10 @@ module Dry
               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
 
+        # rubocop:enable Metrics/AbcSize
         # @api private
         def declaration(definition, lookup)
           params = []

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/dry/core.rb

@@ -13,10 +13,10 @@ module Dry
     include Constants
 
     def self.loader
-      @loader ||= Zeitwerk::Loader.new.tap do |loader|
-        root = File.expand_path("..", __dir__)
+      @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.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-core.rb")
         loader.push_dir(root)
         loader.ignore(
           "#{root}/dry-core.rb",
@@ -50,7 +50,7 @@ module Dry
     #
     # @api public
     def self.Equalizer(*keys, **options)
-      Dry::Core::Equalizer.new(*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: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nikita Shilnikov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -52,48 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A toolset of small support modules used throughout the dry-rb ecosystem
 email:
 - fg@flashgordon.ru
@@ -141,7 +99,8 @@ metadata:
   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: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A toolset of small support modules used throughout the dry-rb ecosystem
 test_files: []