dry-core 0.8.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3ee16c97a04071316e718d8277a4a0ac5aea083b37ac7944d65fd3fd78dfc2
-  data.tar.gz: 44e0e7cb408530f47add47481dd393ba8544e2bcb41256fa0d88af915e7ce547
+  metadata.gz: 518b0050fe58a57f837980c65799982ee76a803f684288b58bb47fb7a59e91f6
+  data.tar.gz: 77db1195074bfd0e6de6a33a0e3b14b25c7d82e0cab202a9738d1a1ffa7f28de
 SHA512:
-  metadata.gz: 0a9787d9d8514c54564448b7e38a5c52810dfd95f098c399c0067928c221357ee772273ca8d8d258e9305679ad3d2ff552b3ea38318a8872136e36d7c434d0b3
-  data.tar.gz: 8f073e6e1c574404f6df1b699470432e4406129a20d2a8d27b0de10db52a8363beb5aaa086fb4c8c629402e3d1d5735715c5126e38384e20519dbee4f30a233f
+  metadata.gz: 9dedf1b3b3b2f1b08a0d8b2fd382d9b96bc2dafdce30a53a3cef75869bc037090bd9b30a16f032d075dd95a55212f25f6ef055af1bf1473b5083609524c65fbb
+  data.tar.gz: 861672b79b3286c54d4886a02b861488e30d86e9bb8ab625cd1eac32cf45b571c51e61537c69a5d48d5cd45a9f87682dc8602b7f84bb9b908774e0e8db6906f3

data/CHANGELOG.md

@@ -1,6 +1,47 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 0.8.0
+## 1.0.0 2022-11-04
+
+
+### Added
+
+- Import dry-container as `Dry::Core::Container` (via #77) (@solnic)
+
+
+[Compare v0.9.1...v1.0.0](https://github.com/dry-rb/dry-core/compare/v0.9.1...v1.0.0)
+
+## 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
 
@@ -12,7 +53,7 @@
 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...master)
+[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
 

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/dry-core.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
 
   # 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/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
@@ -86,7 +84,7 @@ module Dry
               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/container/config.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # @api public
+      class Config
+        DEFAULT_NAMESPACE_SEPARATOR = "."
+        DEFAULT_RESOLVER = Resolver.new
+        DEFAULT_REGISTRY = Registry.new
+
+        # @api public
+        attr_accessor :namespace_separator
+
+        # @api public
+        attr_accessor :resolver
+
+        # @api public
+        attr_accessor :registry
+
+        # @api private
+        def initialize(
+          namespace_separator: DEFAULT_NAMESPACE_SEPARATOR,
+          resolver: DEFAULT_RESOLVER,
+          registry: DEFAULT_REGISTRY
+        )
+          @namespace_separator = namespace_separator
+          @resolver = resolver
+          @registry = registry
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # @api public
+      module Configuration
+        # Use dry/configurable if it's available
+        begin
+          require "dry/configurable"
+
+          # @api private
+          def self.extended(klass)
+            super
+            klass.class_eval do
+              extend Dry::Configurable
+
+              setting :namespace_separator, default: Config::DEFAULT_NAMESPACE_SEPARATOR
+              setting :resolver, default: Config::DEFAULT_RESOLVER
+              setting :registry, default: Config::DEFAULT_REGISTRY
+            end
+          end
+        rescue LoadError
+          # @api private
+          def config
+            @config ||= Container::Config.new
+          end
+        end
+
+        # @api private
+        def configure
+          yield config
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      class Item
+        # Callable class to returns a item call
+        #
+        # @api public
+        #
+        class Callable < Item
+          # Returns the result of item call or item
+          #
+          # @return [Mixed]
+          def call
+            callable? ? item.call : item
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      class Item
+        # Factory for create an Item to register inside of container
+        #
+        # @api public
+        class Factory
+          # Creates an Item Memoizable or Callable
+          # @param [Mixed] item
+          # @param [Hash] options
+          #
+          # @raise [Dry::Core::Container::Error]
+          #
+          # @return [Dry::Core::Container::Item::Base]
+          def call(item, options = {})
+            if options[:memoize]
+              Item::Memoizable.new(item, options)
+            else
+              Item::Callable.new(item, options)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      class Item
+        # Memoizable class to store and execute item calls
+        #
+        # @api public
+        #
+        class Memoizable < Item
+          # @return [Mutex] the stored mutex
+          attr_reader :memoize_mutex
+
+          # Returns a new Memoizable instance
+          #
+          # @param [Mixed] item
+          # @param [Hash] options
+          #
+          # @raise [Dry::Core::Container::Error]
+          #
+          # @return [Dry::Core::Container::Item::Base]
+          def initialize(item, options = {})
+            super
+            raise_not_supported_error unless callable?
+
+            @memoize_mutex = ::Mutex.new
+          end
+
+          # Returns the result of item call using a syncronized mutex
+          #
+          # @return [Dry::Core::Container::Item::Base]
+          def call
+            memoize_mutex.synchronize do
+              @memoized_item ||= item.call
+            end
+          end
+
+          private
+
+          # @private
+          def raise_not_supported_error
+            raise ::Dry::Core::Container::Error, "Memoize only supported for a block or a proc"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # Base class to abstract Memoizable and Callable implementations
+      #
+      # @api abstract
+      #
+      class Item
+        # @return [Mixed] the item to be solved later
+        attr_reader :item
+
+        # @return [Hash] the options to memoize, call or no.
+        attr_reader :options
+
+        # @api abstract
+        def initialize(item, options = {})
+          @item = item
+          @options = {
+            call: item.is_a?(::Proc) && item.parameters.empty?
+          }.merge(options)
+        end
+
+        # @api abstract
+        def call
+          raise NotImplementedError
+        end
+
+        # @private
+        def value?
+          !callable?
+        end
+
+        # @private
+        def callable?
+          options[:call]
+        end
+
+        # Build a new item with transformation applied
+        #
+        # @private
+        def map(func)
+          if callable?
+            self.class.new(-> { func.(item.call) }, options)
+          else
+            self.class.new(func.(item), options)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,311 @@
+# frozen_string_literal: true
+
+require "concurrent/hash"
+require "dry/core/constants"
+
+module Dry
+  module Core
+    class Container
+      include Dry::Core::Constants
+
+      # @api public
+      Error = Class.new(StandardError)
+
+      # Error raised when key is not defined in the registry
+      #
+      # @api public
+      KeyError = Class.new(::KeyError)
+
+      if defined?(DidYouMean::KeyErrorChecker)
+        DidYouMean.correct_error(KeyError, DidYouMean::KeyErrorChecker)
+      end
+
+      # Mixin to expose Inversion of Control (IoC) container behaviour
+      #
+      # @example
+      #
+      #   class MyClass
+      #     extend Dry::Core::Container::Mixin
+      #   end
+      #
+      #   MyClass.register(:item, 'item')
+      #   MyClass.resolve(:item)
+      #   => 'item'
+      #
+      #   class MyObject
+      #     include Dry::Core::Container::Mixin
+      #   end
+      #
+      #   container = MyObject.new
+      #   container.register(:item, 'item')
+      #   container.resolve(:item)
+      #   => 'item'
+      #
+      # @api public
+      #
+      # rubocop:disable Metrics/ModuleLength
+      module Mixin
+        PREFIX_NAMESPACE = lambda do |namespace, key, config|
+          [namespace, key].join(config.namespace_separator)
+        end
+
+        # @private
+        def self.extended(base)
+          hooks_mod = ::Module.new do
+            def inherited(subclass)
+              subclass.instance_variable_set(:@_container, @_container.dup)
+              super
+            end
+          end
+
+          base.class_eval do
+            extend Configuration
+            extend hooks_mod
+
+            @_container = ::Concurrent::Hash.new
+          end
+        end
+
+        # @private
+        module Initializer
+          def initialize(*args, &block)
+            @_container = ::Concurrent::Hash.new
+            super
+          end
+        end
+
+        # @private
+        def self.included(base)
+          base.class_eval do
+            extend Configuration
+            prepend Initializer
+
+            def config
+              self.class.config
+            end
+          end
+        end
+
+        # Register an item with the container to be resolved later
+        #
+        # @param [Mixed] key
+        #   The key to register the container item with (used to resolve)
+        # @param [Mixed] contents
+        #   The item to register with the container (if no block given)
+        # @param [Hash] options
+        #   Options to pass to the registry when registering the item
+        # @yield
+        #   If a block is given, contents will be ignored and the block
+        #   will be registered instead
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def register(key, contents = nil, options = EMPTY_HASH, &block)
+          if block_given?
+            item = block
+            options = contents if contents.is_a?(::Hash)
+          else
+            item = contents
+          end
+
+          config.registry.call(_container, key, item, options)
+
+          self
+        rescue FrozenError
+          raise FrozenError,
+                "can't modify frozen #{self.class} (when attempting to register '#{key}')"
+        end
+
+        # Resolve an item from the container
+        #
+        # @param [Mixed] key
+        #   The key for the item you wish to resolve
+        # @yield
+        #   Fallback block to call when a key is missing. Its result will be returned
+        # @yieldparam [Mixed] key Missing key
+        #
+        # @return [Mixed]
+        #
+        # @api public
+        def resolve(key, &block)
+          config.resolver.call(_container, key, &block)
+        end
+
+        # Resolve an item from the container
+        #
+        # @param [Mixed] key
+        #   The key for the item you wish to resolve
+        #
+        # @return [Mixed]
+        #
+        # @api public
+        # @see Dry::Core::Container::Mixin#resolve
+        def [](key)
+          resolve(key)
+        end
+
+        # Merge in the items of the other container
+        #
+        # @param [Dry::Core::Container] other
+        #   The other container to merge in
+        # @param [Symbol, nil] namespace
+        #   Namespace to prefix other container items with, defaults to nil
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def merge(other, namespace: nil, &block)
+          if namespace
+            _container.merge!(
+              other._container.each_with_object(::Concurrent::Hash.new) { |(key, item), hsh|
+                hsh[PREFIX_NAMESPACE.call(namespace, key, config)] = item
+              },
+              &block
+            )
+          else
+            _container.merge!(other._container, &block)
+          end
+
+          self
+        end
+
+        # Check whether an item is registered under the given key
+        #
+        # @param [Mixed] key
+        #   The key you wish to check for registration with
+        #
+        # @return [Bool]
+        #
+        # @api public
+        def key?(key)
+          config.resolver.key?(_container, key)
+        end
+
+        # An array of registered names for the container
+        #
+        # @return [Array<String>]
+        #
+        # @api public
+        def keys
+          config.resolver.keys(_container)
+        end
+
+        # Calls block once for each key in container, passing the key as a parameter.
+        #
+        # If no block is given, an enumerator is returned instead.
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def each_key(&block)
+          config.resolver.each_key(_container, &block)
+          self
+        end
+
+        # Calls block once for each key/value pair in the container, passing the key and
+        # the registered item parameters.
+        #
+        # If no block is given, an enumerator is returned instead.
+        #
+        # @return [Enumerator]
+        #
+        # @api public
+        #
+        # @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)
+        end
+
+        # Decorates an item from the container with specified decorator
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def decorate(key, with: nil, &block)
+          key = key.to_s
+          original = _container.delete(key) do
+            raise KeyError, "Nothing registered with the key #{key.inspect}"
+          end
+
+          if with.is_a?(Class)
+            decorator = with.method(:new)
+          elsif block.nil? && !with.respond_to?(:call)
+            raise Error, "Decorator needs to be a Class, block, or respond to the `call` method"
+          else
+            decorator = with || block
+          end
+
+          _container[key] = original.map(decorator)
+          self
+        end
+
+        # Evaluate block and register items in namespace
+        #
+        # @param [Mixed] namespace
+        #   The namespace to register items in
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def namespace(namespace, &block)
+          ::Dry::Core::Container::NamespaceDSL.new(
+            self,
+            namespace,
+            config.namespace_separator,
+            &block
+          )
+
+          self
+        end
+
+        # Import a namespace
+        #
+        # @param [Dry::Core::Container::Namespace] namespace
+        #   The namespace to import
+        #
+        # @return [Dry::Core::Container::Mixin] self
+        #
+        # @api public
+        def import(namespace)
+          namespace(namespace.name, &namespace.block)
+
+          self
+        end
+
+        # Freeze the container. Nothing can be registered after freezing
+        #
+        # @api public
+        def freeze
+          super
+          _container.freeze
+          self
+        end
+
+        # @private no, really
+        def _container
+          @_container
+        end
+
+        # @api public
+        def dup
+          copy = super
+          copy.instance_variable_set(:@_container, _container.dup)
+          copy
+        end
+
+        # @api public
+        def clone
+          copy = super
+          unless copy.frozen?
+            copy.instance_variable_set(:@_container, _container.dup)
+          end
+          copy
+        end
+      end
+      # rubocop:enable Metrics/ModuleLength
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # Create a namespace to be imported
+      #
+      # @example
+      #
+      #   ns = Dry::Core::Container::Namespace.new('name') do
+      #     register('item', 'item')
+      #   end
+      #
+      #   container = Dry::Core::Container.new
+      #
+      #   container.import(ns)
+      #
+      #   container.resolve('name.item')
+      #   => 'item'
+      #
+      #
+      # @api public
+      class Namespace
+        # @return [Mixed] The namespace (name)
+        attr_reader :name
+
+        # @return [Proc] The block to be executed when the namespace is imported
+        attr_reader :block
+
+        # Create a new namespace
+        #
+        # @param [Mixed] name
+        #   The name of the namespace
+        # @yield
+        #   The block to evaluate when the namespace is imported
+        #
+        # @return [Dry::Core::Container::Namespace]
+        #
+        # @api public
+        def initialize(name, &block)
+          @name = name
+          @block = block
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "delegate"
+
+module Dry
+  module Core
+    class Container
+      # @api private
+      class NamespaceDSL < ::SimpleDelegator
+        # DSL for defining namespaces
+        #
+        # @param [Dry::Core::Container::Mixin] container
+        #   The container
+        # @param [String] namespace
+        #   The namespace (name)
+        # @param [String] namespace_separator
+        #   The namespace separator
+        # @yield
+        #   The block to evaluate to define the namespace
+        #
+        # @return [Mixed]
+        #
+        # @api private
+        def initialize(container, namespace, namespace_separator, &block)
+          @namespace = namespace
+          @namespace_separator = namespace_separator
+
+          super(container)
+
+          if block.arity.zero?
+            instance_eval(&block)
+          else
+            yield self
+          end
+        end
+
+        def register(key, *args, &block)
+          super(namespaced(key), *args, &block)
+        end
+
+        def namespace(namespace, &block)
+          super(namespaced(namespace), &block)
+        end
+
+        def import(namespace)
+          namespace(namespace.name, &namespace.block)
+
+          self
+        end
+
+        def resolve(key)
+          super(namespaced(key))
+        end
+
+        private
+
+        def namespaced(key)
+          [@namespace, key].join(@namespace_separator)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # Default registry for registering items with the container
+      #
+      # @api public
+      class Registry
+        # @private
+        def initialize
+          @_mutex = ::Mutex.new
+        end
+
+        # Register an item with the container to be resolved later
+        #
+        # @param [Concurrent::Hash] container
+        #   The container
+        # @param [Mixed] key
+        #   The key to register the container item with (used to resolve)
+        # @param [Mixed] item
+        #   The item to register with the container
+        # @param [Hash] options
+        # @option options [Symbol] :call
+        #   Whether the item should be called when resolved
+        #
+        # @raise [Dry::Core::Container::KeyError]
+        #   If an item is already registered with the given key
+        #
+        # @return [Mixed]
+        #
+        # @api public
+        def call(container, key, item, options)
+          key = key.to_s.dup.freeze
+
+          @_mutex.synchronize do
+            if container.key?(key)
+              raise KeyError, "There is already an item registered with the key #{key.inspect}"
+            end
+
+            container[key] = factory.call(item, options)
+          end
+        end
+
+        # @api private
+        def factory
+          @factory ||= Container::Item::Factory.new
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      # Default resolver for resolving items from container
+      #
+      # @api public
+      class Resolver
+        # Resolve an item from the container
+        #
+        # @param [Concurrent::Hash] container
+        #   The container
+        # @param [Mixed] key
+        #   The key for the item you wish to resolve
+        # @yield
+        #   Fallback block to call when a key is missing. Its result will be returned
+        # @yieldparam [Mixed] key Missing key
+        #
+        # @raise [KeyError]
+        #   If the given key is not registered with the container (and no block provided)
+        #
+        #
+        # @return [Mixed]
+        #
+        # @api public
+        def call(container, key)
+          item = container.fetch(key.to_s) do
+            if block_given?
+              return yield(key)
+            else
+              raise KeyError.new(%(key not found: "#{key}"), key: key.to_s, receiver: container)
+            end
+          end
+
+          item.call
+        end
+
+        # Check whether an items is registered under the given key
+        #
+        # @param [Concurrent::Hash] container
+        #   The container
+        # @param [Mixed] key
+        #   The key you wish to check for registration with
+        #
+        # @return [Bool]
+        #
+        # @api public
+        def key?(container, key)
+          container.key?(key.to_s)
+        end
+
+        # An array of registered names for the container
+        #
+        # @return [Array]
+        #
+        # @api public
+        def keys(container)
+          container.keys
+        end
+
+        # Calls block once for each key in container, passing the key as a parameter.
+        #
+        # If no block is given, an enumerator is returned instead.
+        #
+        # @return Hash
+        #
+        # @api public
+        def each_key(container, &block)
+          container.each_key(&block)
+        end
+
+        # Calls block once for each key in container, passing the key and
+        # the registered item parameters.
+        #
+        # If no block is given, an enumerator is returned instead.
+        #
+        # @return Key, Value
+        #
+        # @api public
+        # @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)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    class Container
+      module Stub
+        # Overrides resolve to look into stubbed keys first
+        #
+        # @api public
+        def resolve(key)
+          _stubs.fetch(key.to_s) { super }
+        end
+
+        # 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"
+          end
+
+          _stubs[key.to_s] = value
+
+          if block
+            yield
+            unstub(key)
+          end
+
+          self
+        end
+
+        # Remove stubbed keys from the container
+        def unstub(*keys)
+          keys = _stubs.keys if keys.empty?
+          keys.each { |key| _stubs.delete(key.to_s) }
+        end
+
+        # Stubs have already been enabled turning this into a noop
+        def enable_stubs!
+          # DO NOTHING
+        end
+
+        private
+
+        # Stubs container
+        def _stubs
+          @_stubs ||= {}
+        end
+      end
+
+      module Mixin
+        # Enable stubbing functionality into the current container
+        def enable_stubs!
+          extend ::Dry::Core::Container::Stub
+        end
+      end
+    end
+  end
+end

data/lib/dry/core/container.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Dry
+  module Core
+    # Thread-safe object registry
+    #
+    # @example
+    #
+    #   container = Dry::Core::Container.new
+    #   container.register(:item, 'item')
+    #   container.resolve(:item)
+    #   => 'item'
+    #
+    #   container.register(:item1, -> { 'item' })
+    #   container.resolve(:item1)
+    #   => 'item'
+    #
+    #   container.register(:item2, -> { 'item' }, call: false)
+    #   container.resolve(:item2)
+    #   => #<Proc:0x007f33b169e998@(irb):10 (lambda)>
+    #
+    # @api public
+    class Container
+      include Container::Mixin
+    end
+  end
+end

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
@@ -18,7 +16,7 @@ module Dry
             super
 
             memoizer = base.ancestors.find { _1.is_a?(Memoizer) }
-            base.prepend(memoizer.dup)
+            base.prepend(memoizer.dup) if memoizer
           end
         end
 
@@ -91,7 +89,7 @@ module Dry
             define_method(method.name) do
               value = super()
 
-              if kernel[:frozen].bind(self).call
+              if kernel[:frozen].bind_call(self)
                 # It's not possible to modify singleton classes
                 # of frozen objects
                 mod.remove_method(method.name)
@@ -113,8 +111,8 @@ module Dry
                 # expect :)
                 attr_name = :"__memozed_#{key}__"
                 ivar_name = :"@#{attr_name}"
-                kernel[:ivar_set].bind(self).(ivar_name, value)
-                eigenclass = kernel[:singleton].bind(self).call
+                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)

data/lib/dry/core/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Core
-    VERSION = "0.8.1"
+    VERSION = "1.0.0"
   end
 end

data/lib/dry/core.rb

@@ -1,10 +1,45 @@
 # 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"
+        )
+        loader.inflector.inflect("namespace_dsl" => "NamespaceDSL")
+      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.8.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-11-04 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
@@ -84,6 +98,19 @@ files:
 - lib/dry/core/class_attributes.rb
 - lib/dry/core/class_builder.rb
 - lib/dry/core/constants.rb
+- lib/dry/core/container.rb
+- lib/dry/core/container/config.rb
+- lib/dry/core/container/configuration.rb
+- lib/dry/core/container/item.rb
+- lib/dry/core/container/item/callable.rb
+- lib/dry/core/container/item/factory.rb
+- lib/dry/core/container/item/memoizable.rb
+- lib/dry/core/container/mixin.rb
+- lib/dry/core/container/namespace.rb
+- lib/dry/core/container/namespace_dsl.rb
+- lib/dry/core/container/registry.rb
+- lib/dry/core/container/resolver.rb
+- lib/dry/core/container/stub.rb
 - lib/dry/core/deprecations.rb
 - lib/dry/core/descendants_tracker.rb
 - lib/dry/core/equalizer.rb