dry-configurable 0.12.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b75c91290021054add38bdd9e3313f17aa133e219330a9b02a83227abd101c
-  data.tar.gz: 4b808bd3880c35e2e80a702e4577f2b2da35ef2b31667f4314accc3cf0c20470
+  metadata.gz: 0d8c3e4ebee8cf7f978c48580f64c1547c6c818b50ed7064b0758b4bffb072ee
+  data.tar.gz: 2aa701383b59289fbe591100642027fc5bc0d074bd0ec5d6d085359293af0f8f
 SHA512:
-  metadata.gz: efdd98ed5f60acf8090296954942f01c21702c29fa60c1edea21e0fbbb185955963b268191cb042ee33cc4651f4350419e7cbc2b7125c36103dce2733d137fa4
-  data.tar.gz: 21d278a4f9f4a90d530145408585c30e004ce2830d5777a408bd9ea83bdfd5cba2ce58f1a1ca46f1212d0e8d5967891a25467f39e59a8af20291cf5ca1beff3f
+  metadata.gz: 221e2cfb38c4eae38ab6b56250e2d70672c9d1e6883b048f5a6bc807d0996065bf1b8e4a102fd78b6a95a4a4ffcf21dcfd46c64737acd915b3d1b80f9dca273e
+  data.tar.gz: 1f04a6b9af22d12a6b310902cdf5761362762a7fcca97c78a2feb17a28ce3199285a8cd1b6e80c56cde10f7fc2983c8598990fa263e5e55656502ad22761dd2e

data/CHANGELOG.md

@@ -1,5 +1,123 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.16.1 2022-10-13
+
+### Changed
+
+- Restored performance of config value reads (direct reader methods as well as aggregate methods like `#values` and `#to_h`) to pre-0.16.0 levels (#149 by @timriley)
+
+[Compare v0.16.0...v0.16.1](https://github.com/dry-rb/dry-configurable/compare/v0.16.0...v0.16.1)
+
+## 0.16.0 2022-10-08
+
+
+### Added
+
+- Support for custom config classes via `config_class:` option (#136 by @solnic)
+
+  ```ruby
+  extend Dry::Configurable(config_class: MyConfig)
+  ```
+
+  Your config class should inherit from `Dry::Configurable::Config`.
+- Return `Dry::Core::Constants::Undefined` (instead of nil) as the value for non-configured settings via a `default_undefined: true` option (#141 by @timriley)
+
+  ```ruby
+  extend Dry::Configurable(default_undefined: true)
+  ```
+
+  You must opt into this feature via the `default_undefined: true` option. Non-configured setting values are still `nil` by default.
+
+### Fixed
+
+- Remove exec bit from version.rb (#139 by @Fryguy)
+
+### Changed
+
+- Improve memory usage by separating setting definitions from config values (#138 by @timriley)
+
+  Your usage of dry-configurable may be impacted if you have been accessing objects from `_settings` or the internals of `Dry::Configurable::Config`. `_settings` now returns `Dry::Configurable::Setting` instances, which contain only the details from the setting's definition. Setting _values_ remain in `Dry::Configurable::Config`.
+- Use Zeitwerk to speed up load time (#135 by @solnic)
+
+[Compare v0.15.0...v0.16.0](https://github.com/dry-rb/dry-configurable/compare/v0.15.0...v0.16.0)
+
+## 0.15.0 2022-04-21
+
+
+### Changed
+
+- The `finalize!` method (as class or instance method, depending on whether you extend or include `Dry::Configurable` respectively) now accepts a boolean `freeze_values:` argument, which if true, will recursively freeze all config values in addition to the `config` itself. (#105 by @ojab)
+
+  ```ruby
+  class MyConfigurable
+    include Dry::Configurable
+
+    setting :db, default: "postgre"
+  end
+
+  my_obj = MyConfigurable.new
+  my_obj.finalize!(freeze_values: true)
+  my_obj.config.db << "sql" # Will raise FrozenError
+  ```
+- `Dry::Configurable::Config#update` will set hashes as values for non-nested settings (#131 by @ojab)
+
+  ```ruby
+  class MyConfigurable
+    extend Dry::Configurable
+
+    setting :sslcert, constructor: ->(v) { v&.values_at(:pem, :pass)&.join }
+  end
+
+  MyConfigurable.config.update(sslcert: {pem: "cert", pass: "qwerty"})
+  MyConfigurable.config.sslcert # => "certqwerty"
+  ```
+- `Dry::Configurable::Config#update` will accept any values implicitly convertible to hash via `#to_hash` (#133 by @timriley)
+
+[Compare v0.14.0...v0.15.0](https://github.com/dry-rb/dry-configurable/compare/v0.14.0...v0.15.0)
+
+## 0.14.0 2022-01-14
+
+
+### Changed
+
+- Settings defined after an access to `config` will still be made available on that `config`. (#130 by @timriley)
+- Cloneable settings are cloned immediately upon assignment. (#130 by @timriley)
+- Changes to config values in parent classes after subclasses have already been created will not be propogated to those subclasses. Subclasses created _after_ config values have been changed in the parent _will_ receive those config values. (#130 by @timriley)
+
+[Compare v0.13.0...v0.14.0](https://github.com/dry-rb/dry-configurable/compare/v0.13.0...v0.14.0)
+
+## 0.13.0 2021-09-12
+
+
+### Added
+
+- Added flags to determine whether to warn on the API usage deprecated in this release (see "Changed" section below). Set these to `false` to suppress the warnings. (#124 by @timriley)
+
+  ```ruby
+  Dry::Configurable.warn_on_setting_constructor_block false
+  Dry::Configurable.warn_on_setting_positional_default false
+  ```
+
+### Fixed
+
+- Fixed `ArgumentError` for classes including `Dry::Configurable` whose `initializer` has required kwargs. (#113 by @timriley)
+
+### Changed
+
+- Deprecated the setting constructor provided as a block. Provide it via the `constructor:` keyword argument instead. (#111 by @waiting-for-dev & @timriley)
+
+  ```ruby
+  setting :path, constructor: -> path { Pathname(path) }
+  ```
+- Deprecated the setting default provided as the second positional argument. Provide it via the `default:` keyword argument instead. (#112 and #121 by @waiting-for-dev & @timriley)
+
+  ```ruby
+  setting :path, default: "some/default/path"
+  ```
+- [BREAKING] Removed implicit `to_hash` conversion from `Config`. (#114 by @timriley)
+
+[Compare v0.12.1...v0.13.0](https://github.com/dry-rb/dry-configurable/compare/v0.12.1...v0.13.0)
+
 ## 0.12.1 2021-02-15
 
 

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

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-configurable
 [actions]: https://github.com/dry-rb/dry-configurable/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-configurable
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-configurable/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/0276a97990e04eb0ac722b3e7f3620b5)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/0276a97990e04eb0ac722b3e7f3620b5)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-configurable.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-configurable.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-configurable)
+* [User documentation](https://dry-rb.org/gems/dry-configurable)
 * [API documentation](http://rubydoc.info/gems/dry-configurable)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-configurable.gemspec

@@ -1,35 +1,36 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/configurable/version'
+require "dry/configurable/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-configurable'
+  spec.name          = "dry-configurable"
   spec.authors       = ["Andy Holland"]
   spec.email         = ["andyholland1991@aol.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Configurable::VERSION.dup
 
   spec.summary       = "A mixin to add configuration functionality to your classes"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-configurable'
+  spec.homepage      = "https://dry-rb.org/gems/dry-configurable"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-configurable.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-configurable/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-configurable'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-configurable/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-configurable/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-configurable"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-configurable/issues"
 
-  spec.required_ruby_version = ">= 2.5.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 "dry-core", "~> 0.5", ">= 0.5.0"
+  spec.add_runtime_dependency "dry-core", "~> 0.6"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/configurable/class_methods.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-require 'set'
-
-require 'dry/configurable/constants'
-require 'dry/configurable/dsl'
-require 'dry/configurable/methods'
-require 'dry/configurable/settings'
+require "set"
 
 module Dry
   module Configurable
@@ -13,30 +8,40 @@ module Dry
       include Methods
 
       # @api private
-      def inherited(klass)
+      def inherited(subclass)
         super
 
-        parent_settings = (respond_to?(:config) ? config._settings : _settings)
+        subclass.instance_variable_set(:@__config_extension__, __config_extension__)
+
+        new_settings = _settings.dup
+        subclass.instance_variable_set(:@_settings, new_settings)
 
-        klass.instance_variable_set('@_settings', parent_settings)
+        # Only classes **extending** Dry::Configurable have class-level config. When
+        # Dry::Configurable is **included**, the class-level config method is undefined because it
+        # resides at the instance-level instead (see `Configurable.included`).
+        if respond_to?(:config)
+          subclass.instance_variable_set(:@config, config.dup_for_settings(new_settings))
+        end
       end
 
       # Add a setting to the configuration
       #
-      # @param [Mixed] key
+      # @param [Mixed] name
       #   The accessor key for the configuration value
       # @param [Mixed] default
-      #   The default config value
-      #
+      #   Default value for the setting
+      # @param [#call] constructor
+      #   Transformation given value will go through
+      # @param [Boolean] reader
+      #   Whether a reader accessor must be created
       # @yield
-      #   If a block is given, it will be evaluated in the context of
-      #   a new configuration class, and bound as the default value
+      #   A block can be given to add nested settings.
       #
       # @return [Dry::Configurable::Config]
       #
       # @api public
-      def setting(*args, &block)
-        setting = __config_dsl__.setting(*args, &block)
+      def setting(*args, **options, &block)
+        setting = __config_dsl__.setting(*args, **options, &block)
 
         _settings << setting
 
@@ -51,7 +56,7 @@ module Dry
       #
       # @api public
       def settings
-        @settings ||= Set[*_settings.map(&:name)]
+        Set[*_settings.map(&:name)]
       end
 
       # Return declared settings
@@ -69,12 +74,25 @@ module Dry
       #
       # @api public
       def config
-        @config ||= Config.new(_settings)
+        @config ||= __config_build__
+      end
+
+      # @api private
+      def __config_build__(settings = _settings)
+        __config_extension__.config_class.new(settings)
+      end
+
+      # @api private
+      def __config_extension__
+        @__config_extension__
       end
 
       # @api private
       def __config_dsl__
-        @dsl ||= DSL.new
+        @__config_dsl__ ||= DSL.new(
+          config_class: __config_extension__.config_class,
+          default_undefined: __config_extension__.default_undefined
+        )
       end
 
       # @api private

data/lib/dry/configurable/compiler.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/configurable/setting'
-require 'dry/configurable/settings'
-
 module Dry
   module Configurable
     # Setting compiler used internally by the DSL
@@ -23,22 +20,18 @@ module Dry
         public_send(:"visit_#{type}", rest)
       end
 
-      # @api private
-      def visit_constructor(node)
-        setting, constructor = node
-        visit(setting).with(constructor: constructor)
-      end
-
       # @api private
       def visit_setting(node)
-        name, default, opts = node
-        Setting.new(name, **opts, default: default)
+        name, opts = node
+        Setting.new(name, **opts)
       end
 
       # @api private
       def visit_nested(node)
         parent, children = node
-        visit(parent).nested(call(children))
+        name, opts = parent[1]
+
+        Setting.new(name, **opts, children: Settings.new(call(children)))
       end
     end
   end

data/lib/dry/configurable/config.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
+require "dry/core/constants"
+require "set"
 
-require 'dry/core/equalizer'
-
-require 'dry/configurable/constants'
-require 'dry/configurable/errors'
+require "dry/core/equalizer"
 
 module Dry
   module Configurable
@@ -19,12 +17,29 @@ module Dry
       attr_reader :_settings
 
       # @api private
-      attr_reader :_resolved
+      attr_reader :_values
+
+      # @api private
+      attr_reader :_configured
+      protected :_configured
 
       # @api private
-      def initialize(settings)
-        @_settings = settings.dup
-        @_resolved = Concurrent::Map.new
+      def initialize(settings, values: {})
+        @_settings = settings
+        @_values = values
+        @_configured = Set.new
+      end
+
+      # @api private
+      private def initialize_copy(source)
+        super
+        @_values = source.__send__(:dup_values)
+        @_configured = source._configured.dup
+      end
+
+      # @api private
+      def dup_for_settings(settings)
+        dup.tap { |config| config.instance_variable_set(:@_settings, settings) }
       end
 
       # Get config value by a key
@@ -34,9 +49,19 @@ module Dry
       # @return Config value
       def [](name)
         name = name.to_sym
-        raise ArgumentError, "+#{name}+ is not a setting name" unless _settings.key?(name)
 
-        _settings[name].value
+        unless (setting = _settings[name])
+          raise ArgumentError, "+#{name}+ is not a setting name"
+        end
+
+        _values.fetch(name) {
+          # Mutable settings may be configured after read
+          _configured.add(name) if setting.cloneable?
+
+          setting.to_value.tap { |value|
+            _values[name] = value
+          }
+        }
       end
 
       # Set config value.
@@ -45,21 +70,34 @@ module Dry
       # @param [String,Symbol] name
       # @param [Object] value
       def []=(name, value)
-        public_send(:"#{name}=", value)
+        raise FrozenConfig, "Cannot modify frozen config" if frozen?
+
+        name = name.to_sym
+
+        unless (setting = _settings[name])
+          raise ArgumentError, "+#{name}+ is not a setting name"
+        end
+
+        _configured.add(name)
+
+        _values[name] = setting.constructor.(value)
       end
 
       # Update config with new values
       #
-      # @param values [Hash] A hash with new values
+      # @param values [Hash, #to_hash] A hash with new values
       #
       # @return [Config]
       #
       # @api public
       def update(values)
         values.each do |key, value|
-          case value
-          when Hash
-            self[key].update(value)
+          if self[key].is_a?(self.class)
+            unless value.respond_to?(:to_hash)
+              raise ArgumentError, "#{value.inspect} is not a valid setting value"
+            end
+
+            self[key].update(value.to_hash)
           else
             self[key] = value
           end
@@ -67,62 +105,94 @@ module Dry
         self
       end
 
-      # Dump config into a hash
+      # Returns true if the value for the given key has been set on this config.
+      #
+      # For simple values, this returns true if the value has been explicitly assigned.
+      #
+      # For cloneable (mutable) values, since these are captured on read, returns true if the value
+      # does not compare equally to its corresdponing default value. This relies on these objects
+      # having functioning `#==` checks.
+      #
+      # @return [Bool]
+      #
+      # @api public
+      def configured?(key)
+        if _configured.include?(key) && _settings[key].cloneable?
+          return _values[key] != _settings[key].to_value
+        end
+
+        _configured.include?(key)
+      end
+
+      # Returns the current config values.
+      #
+      # Nested configs remain in their {Config} instances.
       #
       # @return [Hash]
       #
       # @api public
       def values
-        _settings
-          .map { |setting| [setting.name, setting.value] }
-          .map { |key, value| [key, value.is_a?(self.class) ? value.to_h : value] }
-          .to_h
+        # Ensure all settings are represented in values
+        _settings.each { |setting| self[setting.name] unless _values.key?(setting.name) }
+
+        _values
       end
-      alias_method :to_h, :values
-      alias_method :to_hash, :values
 
-      # @api private
-      def finalize!
-        _settings.freeze
-        freeze
+      # Returns config values as a hash, with nested values also converted from {Config} instances
+      # into hashes.
+      #
+      # @return [Hash]
+      #
+      # @api public
+      def to_h
+        values.to_h { |key, value| [key, value.is_a?(self.class) ? value.to_h : value] }
       end
 
       # @api private
-      def pristine
-        self.class.new(_settings.pristine)
+      def finalize!(freeze_values: false)
+        values.each_value do |value|
+          if value.is_a?(self.class)
+            value.finalize!(freeze_values: freeze_values)
+          elsif freeze_values
+            value.freeze
+          end
+        end
+
+        freeze
       end
 
       # @api private
-      def respond_to_missing?(meth, include_private = false)
-        super || _settings.key?(resolve(meth))
+      def pristine
+        self.class.new(_settings)
       end
 
       private
 
-      # @api private
-      def method_missing(meth, *args)
-        setting = _settings[resolve(meth)]
+      def method_missing(name, *args)
+        setting_name = setting_name_from_method(name)
+        setting = _settings[setting_name]
 
         super unless setting
 
-        if setting.writer?(meth)
-          raise FrozenConfig, 'Cannot modify frozen config' if frozen?
-
-          _settings << setting.with(input: args[0])
+        if name.end_with?("=")
+          self[setting_name] = args[0]
         else
-          setting.value
+          self[setting_name]
         end
       end
 
-      # @api private
-      def resolve(meth)
-        _resolved.fetch(meth) { _resolved[meth] = meth.to_s.tr('=', '').to_sym }
+      def respond_to_missing?(meth, include_private = false)
+        _settings.key?(setting_name_from_method(meth)) || super
       end
 
-      # @api private
-      def initialize_copy(source)
-        super
-        @_settings = source._settings.dup
+      def setting_name_from_method(method_name)
+        method_name.to_s.tr("=", "").to_sym
+      end
+
+      def dup_values
+        _values.each_with_object({}) { |(key, val), dup_hsh|
+          dup_hsh[key] = _settings[key].cloneable? ? val.dup : val
+        }
       end
     end
   end

data/lib/dry/configurable/constants.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/constants'
+require "dry/core/constants"
 
 module Dry
   # Shared constants

data/lib/dry/configurable/dsl.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/configurable/constants'
-require 'dry/configurable/setting'
-require 'dry/configurable/settings'
-require 'dry/configurable/compiler'
-require 'dry/configurable/dsl/args'
+require "dry/core/deprecations"
 
 module Dry
   module Configurable
@@ -14,49 +10,67 @@ module Dry
     class DSL
       VALID_NAME = /\A[a-z_]\w*\z/i.freeze
 
-      # @api private
       attr_reader :compiler
 
-      # @api private
       attr_reader :ast
 
-      # @api private
-      def initialize(&block)
+      attr_reader :options
+
+      def initialize(**options, &block)
         @compiler = Compiler.new
         @ast = []
+        @options = options
         instance_exec(&block) if block
       end
 
-      # Register a new setting node and compile it into a setting object
+      # Registers a new setting node and compile it into a setting object
       #
       # @see ClassMethods.setting
-      # @api public
+      # @api private
       # @return Setting
-      def setting(name, *args, &block)
+      def setting(name, **options, &block) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         unless VALID_NAME.match?(name.to_s)
           raise ArgumentError, "#{name} is not a valid setting name"
         end
 
-        args = Args.new(args)
+        ensure_valid_options(options)
 
-        args.ensure_valid_options
+        options = {default: default, config_class: config_class, **options}
 
-        default, opts = args
-
-        node = [:setting, [name.to_sym, default, opts == default ? EMPTY_HASH : opts]]
+        node = [:setting, [name.to_sym, options]]
 
         if block
-          if block.arity.zero?
-            ast << [:nested, [node, DSL.new(&block).ast]]
-          else
-            ast << [:constructor, [node, block]]
-          end
+          ast << [:nested, [node, DSL.new(&block).ast]]
         else
           ast << node
         end
 
         compiler.visit(ast.last)
       end
+
+      def config_class
+        options[:config_class]
+      end
+
+      def default
+        options[:default_undefined] ? Undefined : nil
+      end
+
+      private
+
+      def ensure_valid_options(options)
+        return if options.none?
+
+        invalid_keys = options.keys - Setting::OPTIONS
+
+        raise ArgumentError, "Invalid options: #{invalid_keys.inspect}" unless invalid_keys.empty?
+      end
+
+      # Returns a tuple of valid and invalid options hashes derived from the options hash
+      # given to the setting
+      def valid_and_invalid_options(options)
+        options.partition { |k, _| Setting::OPTIONS.include?(k) }.map(&:to_h)
+      end
     end
   end
 end

data/lib/dry/configurable/extension.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Dry
+  module Configurable
+    class Extension < Module
+      # @api private
+      attr_reader :config_class
+
+      # @api private
+      attr_reader :default_undefined
+
+      # @api private
+      def initialize(config_class: Configurable::Config, default_undefined: false)
+        super()
+        @config_class = config_class
+        @default_undefined = default_undefined
+        freeze
+      end
+
+      # @api private
+      def extended(klass)
+        super
+        klass.extend(ClassMethods)
+        klass.instance_variable_set(:@__config_extension__, self)
+      end
+
+      # @api private
+      def included(klass)
+        raise AlreadyIncluded if klass.include?(InstanceMethods)
+
+        super
+
+        klass.class_eval do
+          extend(ClassMethods)
+          include(InstanceMethods)
+          prepend(Initializer)
+
+          class << self
+            undef :config
+            undef :configure
+          end
+        end
+
+        klass.instance_variable_set(:@__config_extension__, self)
+      end
+    end
+  end
+end

data/lib/dry/configurable/instance_methods.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/configurable/config'
-require 'dry/configurable/methods'
+require "dry/configurable/config"
+require "dry/configurable/methods"
 
 module Dry
   module Configurable
@@ -12,9 +12,11 @@ module Dry
     module Initializer
       # @api private
       def initialize(*)
-        @config = Config.new(self.class._settings.dup)
+        @config = self.class.__config_build__(self.class._settings)
+
         super
       end
+      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
     end
 
     # Instance-level API when `Dry::Configurable` is included in a class
@@ -33,9 +35,7 @@ module Dry
       # Finalize the config and freeze the object
       #
       # @api public
-      def finalize!
-        return self if frozen?
-
+      def finalize!(freeze_values: false)
         super
         freeze
       end

data/lib/dry/configurable/methods.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/configurable/errors'
-
 module Dry
   module Configurable
     # Common API for both classes and instances
@@ -10,7 +8,7 @@ module Dry
     module Methods
       # @api public
       def configure(&block)
-        raise FrozenConfig, 'Cannot modify frozen config' if frozen?
+        raise FrozenConfig, "Cannot modify frozen config" if frozen?
 
         yield(config) if block
         self
@@ -21,10 +19,8 @@ module Dry
       # @return [Dry::Configurable::Config]
       #
       # @api public
-      def finalize!
-        return self if config.frozen?
-
-        config.finalize!
+      def finalize!(freeze_values: false)
+        config.finalize!(freeze_values: freeze_values)
         self
       end
     end

data/lib/dry/configurable/setting.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
-require 'dry/core/equalizer'
-
-require 'dry/configurable/constants'
-require 'dry/configurable/config'
+require "dry/core/equalizer"
 
 module Dry
   module Configurable
@@ -13,9 +10,9 @@ module Dry
     #
     # @api private
     class Setting
-      include Dry::Equalizer(:name, :value, :options, inspect: false)
+      include Dry::Equalizer(:name, :default, :constructor, :children, :options, inspect: false)
 
-      OPTIONS = %i[input default reader constructor cloneable settings].freeze
+      OPTIONS = %i[default reader constructor cloneable settings config_class].freeze
 
       DEFAULT_CONSTRUCTOR = -> v { v }.freeze
 
@@ -25,33 +22,19 @@ module Dry
       attr_reader :name
 
       # @api private
-      attr_reader :writer_name
+      attr_reader :default
 
       # @api private
-      attr_reader :input
+      attr_reader :cloneable
 
       # @api private
-      attr_reader :default
+      attr_reader :constructor
 
       # @api private
-      attr_reader :options
+      attr_reader :children
 
-      # Specialized Setting which includes nested settings
-      #
       # @api private
-      class Nested < Setting
-        CONSTRUCTOR = Config.method(:new)
-
-        # @api private
-        def pristine
-          with(input: input.pristine)
-        end
-
-        # @api private
-        def constructor
-          CONSTRUCTOR
-        end
-      end
+      attr_reader :options
 
       # @api private
       def self.cloneable_value?(value)
@@ -59,49 +42,21 @@ module Dry
       end
 
       # @api private
-      def initialize(name, input: Undefined, default: Undefined, **options)
+      def initialize(
+        name,
+        default:,
+        constructor: DEFAULT_CONSTRUCTOR,
+        children: EMPTY_ARRAY,
+        **options
+      )
         @name = name
-        @writer_name = :"#{name}="
-        @input = input
         @default = default
+        @cloneable = children.any? || options.fetch(:cloneable) {
+          Setting.cloneable_value?(default)
+        }
+        @constructor = constructor
+        @children = children
         @options = options
-
-        evaluate if input_defined?
-      end
-
-      # @api private
-      def input_defined?
-        !input.equal?(Undefined)
-      end
-
-      # @api private
-      def value
-        @value ||= evaluate
-      end
-
-      # @api private
-      def evaluated?
-        instance_variable_defined?(:@value)
-      end
-
-      # @api private
-      def nested(settings)
-        Nested.new(name, input: settings, **options)
-      end
-
-      # @api private
-      def pristine
-        with(input: Undefined)
-      end
-
-      # @api private
-      def with(new_opts)
-        self.class.new(name, input: input, default: default, **options, **new_opts)
-      end
-
-      # @api private
-      def constructor
-        options[:constructor] || DEFAULT_CONSTRUCTOR
       end
 
       # @api private
@@ -109,43 +64,22 @@ module Dry
         options[:reader].equal?(true)
       end
 
-      # @api private
-      def writer?(meth)
-        writer_name.equal?(meth)
-      end
-
       # @api private
       def cloneable?
-        if options.key?(:cloneable)
-          # Return cloneable option if explicitly set
-          options[:cloneable]
-        else
-          # Otherwise, infer cloneable from any of the input, default, or value
-          Setting.cloneable_value?(input) || Setting.cloneable_value?(default) || (
-            evaluated? && Setting.cloneable_value?(value)
-          )
-        end
+        cloneable
       end
 
-      private
-
       # @api private
-      def initialize_copy(source)
-        super
-
-        @options = source.options.dup
+      def to_value
+        if children.any?
+          (options[:config_class] || Config).new(children)
+        else
+          value = default
+          value = constructor.(value) unless value.eql?(Undefined)
 
-        if source.cloneable?
-          @input = source.input.dup
-          @default = source.default.dup
-          @value = source.value.dup if source.evaluated?
+          cloneable? ? value.dup : value
         end
       end
-
-      # @api private
-      def evaluate
-        @value = constructor[Undefined.coalesce(input, default, nil)]
-      end
     end
   end
 end

data/lib/dry/configurable/settings.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-
-require 'dry/core/equalizer'
-require 'dry/configurable/constants'
+require "dry/core/equalizer"
 
 module Dry
   module Configurable
@@ -11,27 +8,27 @@ module Dry
     #
     # @api private
     class Settings
-      include Dry::Equalizer(:elements)
+      include Dry::Equalizer(:settings)
 
       include Enumerable
 
       # @api private
-      attr_reader :elements
+      attr_reader :settings
 
       # @api private
-      def initialize(elements = EMPTY_ARRAY)
-        initialize_elements(elements)
+      def initialize(settings = EMPTY_ARRAY)
+        @settings = settings.each_with_object({}) { |s, m| m[s.name] = s }
       end
 
       # @api private
       def <<(setting)
-        elements[setting.name] = setting
+        settings[setting.name] = setting
         self
       end
 
       # @api private
       def [](name)
-        elements[name]
+        settings[name]
       end
 
       # @api private
@@ -41,31 +38,18 @@ module Dry
 
       # @api private
       def keys
-        elements.keys
+        settings.keys
       end
 
       # @api private
       def each(&block)
-        elements.values.each(&block)
-      end
-
-      # @api private
-      def pristine
-        self.class.new(map(&:pristine))
+        settings.each_value(&block)
       end
 
       private
 
-      # @api private
       def initialize_copy(source)
-        initialize_elements(source.map(&:dup))
-      end
-
-      # @api private
-      def initialize_elements(elements)
-        @elements = elements.each_with_object(Concurrent::Map.new) { |s, m|
-          m[s.name] = s
-        }
+        @settings = source.settings.dup
       end
     end
   end

data/lib/dry/configurable/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Configurable
     # @api public
-    VERSION = '0.12.1'
+    VERSION = "0.16.1"
   end
 end

data/lib/dry/configurable.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require 'concurrent/array'
+require "zeitwerk"
 
-require 'dry/configurable/constants'
-require 'dry/configurable/class_methods'
-require 'dry/configurable/instance_methods'
-require 'dry/configurable/config'
-require 'dry/configurable/setting'
-require 'dry/configurable/errors'
+require "dry/core/constants"
+require "dry/configurable/constants"
+require "dry/configurable/errors"
 
 module Dry
+  # @api public
+  def self.Configurable(**options)
+    Configurable::Extension.new(**options)
+  end
+
   # A simple configuration mixin
   #
   # @example class-level configuration
@@ -44,27 +46,32 @@ module Dry
   #
   # @api public
   module Configurable
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-configurable"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-configurable.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-configurable.rb",
+          "#{root}/dry/configurable/{constants,errors,version}.rb"
+        )
+        loader.inflector.inflect("dsl" => "DSL")
+      end
+    end
+
     # @api private
     def self.extended(klass)
       super
-      klass.extend(ClassMethods)
+      klass.extend(Extension.new)
     end
 
     # @api private
     def self.included(klass)
-      raise AlreadyIncluded if klass.include?(InstanceMethods)
-
       super
-      klass.class_eval do
-        extend(ClassMethods)
-        include(InstanceMethods)
-        prepend(Initializer)
-
-        class << self
-          undef :config
-          undef :configure
-        end
-      end
+      klass.include(Extension.new)
     end
+
+    loader.setup
   end
 end

data/lib/dry-configurable.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/configurable'
+require "dry/configurable"

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dry-configurable
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.16.1
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +98,8 @@ files:
 - lib/dry/configurable/config.rb
 - lib/dry/configurable/constants.rb
 - lib/dry/configurable/dsl.rb
-- lib/dry/configurable/dsl/args.rb
 - lib/dry/configurable/errors.rb
+- lib/dry/configurable/extension.rb
 - lib/dry/configurable/instance_methods.rb
 - lib/dry/configurable/methods.rb
 - lib/dry/configurable/setting.rb
@@ -117,7 +111,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-configurable/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-configurable/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-configurable
   bug_tracker_uri: https://github.com/dry-rb/dry-configurable/issues
 post_install_message: 
@@ -128,14 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A mixin to add configuration functionality to your classes

data/lib/dry/configurable/dsl/args.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/configurable/constants'
-require 'dry/configurable/setting'
-
-module Dry
-  module Configurable
-    class DSL
-      # @api private
-      class Args
-        # @api private
-        attr_reader :args
-
-        # @api private
-        attr_reader :size
-
-        # @api private
-        attr_reader :opts
-
-        # @api private
-        def initialize(args)
-          @args = args
-          @size = args.size
-          @opts = Setting::OPTIONS
-        end
-
-        # @api private
-        def ensure_valid_options
-          return unless options
-
-          keys = options.keys - opts
-          raise ArgumentError, "Invalid options: #{keys.inspect}" unless keys.empty?
-        end
-
-        # @api private
-        def to_ary
-          [default, options || EMPTY_HASH]
-        end
-
-        # @api private
-        def default
-          if size.equal?(1) && options.nil?
-            args[0]
-          elsif size > 1 && options
-            args[0]
-          else
-            Undefined
-          end
-        end
-
-        # @api private
-        def options
-          args.detect { |arg| arg.is_a?(Hash) && (opts & arg.keys).any? }
-        end
-      end
-    end
-  end
-end