dry-configurable 0.16.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323f300c1cf0cf407272352b81dd0775ac7f855713cd6145fccc9d11dbdae8cf
-  data.tar.gz: b8258cfa9a30108831384e575a00e5afd93b9d94942d52799d23013e3753ceaf
+  metadata.gz: 5d067b9cb78be3e3904b22ab5e73a6903cecb387c241d08c875f2a1eaf1002a4
+  data.tar.gz: c7f9be3367d11ea23c10a8a73d0a63d0fab54a1cf6cd2f5053e8845b808bd801
 SHA512:
-  metadata.gz: d37acc7d39adb1ed1f0da218c5f16ac0e6d09832e70e73220770fa28ad8eff4f21f440a6285b22785de82f76a8df6f444d37024d5059fdc2ba3f3b3006fd19c9
-  data.tar.gz: c7888430539dfa30f4518ca159cae0675d2766ec8c27870a5e74c64f04521aa517fea1772bb766f5c9f364d83e24610c7bf7f72c65739adb05b2e9a0ca1230f0
+  metadata.gz: 45d5b855ac62fa249080b1c40ed9faf0644cf9daa3d3a18c8c3cc0780723006dd510d3b0cb156d2251962775f95396b591e96136d951e08e4679dd684118601d
+  data.tar.gz: fc7420686647324a2c671f183aff7b1fc69131f80db292d0847e53dc5744e16904f56dc74a35b6dadb6cce1f4927409a632d026d7127ccb5844d9b8ba67b4e98

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 <!--- 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
 
 

data/dry-configurable.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-core", "~> 0.6"
+  spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
   spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"

data/lib/dry/configurable/class_methods.rb

@@ -13,7 +13,7 @@ module Dry
 
         subclass.instance_variable_set(:@__config_extension__, __config_extension__)
 
-        new_settings = _settings.dup
+        new_settings = settings.dup
         subclass.instance_variable_set(:@_settings, new_settings)
 
         # Only classes **extending** Dry::Configurable have class-level config. When
@@ -43,28 +43,19 @@ module Dry
       def setting(*args, **options, &block)
         setting = __config_dsl__.setting(*args, **options, &block)
 
-        _settings << setting
+        settings << setting
 
         __config_reader__.define(setting.name) if setting.reader?
 
         self
       end
 
-      # Return declared settings
-      #
-      # @return [Set<Symbol>]
-      #
-      # @api public
-      def settings
-        Set[*_settings.map(&:name)]
-      end
-
-      # Return declared settings
+      # Returns the defined settings for the class.
       #
       # @return [Settings]
       #
       # @api public
-      def _settings
+      def settings
         @_settings ||= Settings.new
       end
 
@@ -78,7 +69,7 @@ module Dry
       end
 
       # @api private
-      def __config_build__(settings = _settings)
+      def __config_build__(settings = self.settings)
         __config_extension__.config_class.new(settings)
       end
 

data/lib/dry/configurable/config.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/constants"
-
-require "dry/core/equalizer"
+require "set"
 
 module Dry
   module Configurable
@@ -18,15 +16,27 @@ module Dry
       # @api private
       attr_reader :_values
 
+      # @api private
+      attr_reader :_configured
+      protected :_configured
+
       # @api private
       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)
-        self.class.new(settings, values: dup_values)
+        dup.tap { |config| config.instance_variable_set(:@_settings, settings) }
       end
 
       # Get config value by a key
@@ -42,10 +52,11 @@ module Dry
         end
 
         _values.fetch(name) {
-          # When reading values, only capture cloneable (i.e. mutable) values in local state, making
-          # it easier to determine which values have actually been changed vs just read
+          # Mutable settings may be configured after read
+          _configured.add(name) if setting.cloneable?
+
           setting.to_value.tap { |value|
-            _values[name] = value if setting.cloneable?
+            _values[name] = value
           }
         }
       end
@@ -56,7 +67,7 @@ module Dry
       # @param [String,Symbol] name
       # @param [Object] value
       def []=(name, value)
-        raise FrozenConfig, "Cannot modify frozen config" if frozen?
+        raise FrozenConfigError, "Cannot modify frozen config" if frozen?
 
         name = name.to_sym
 
@@ -64,6 +75,8 @@ module Dry
           raise ArgumentError, "+#{name}+ is not a setting name"
         end
 
+        _configured.add(name)
+
         _values[name] = setting.constructor.(value)
       end
 
@@ -101,11 +114,11 @@ module Dry
       #
       # @api public
       def configured?(key)
-        if _settings[key].cloneable? && _values.key?(key)
+        if _configured.include?(key) && _settings[key].cloneable?
           return _values[key] != _settings[key].to_value
         end
 
-        _values.key?(key)
+        _configured.include?(key)
       end
 
       # Returns the current config values.
@@ -116,7 +129,10 @@ module Dry
       #
       # @api public
       def values
-        _settings.to_h { |setting| [setting.name, self[setting.name]] }
+        # Ensure all settings are represented in values
+        _settings.each { |setting| self[setting.name] unless _values.key?(setting.name) }
+
+        _values
       end
 
       # Returns config values as a hash, with nested values also converted from {Config} instances
@@ -130,7 +146,19 @@ module Dry
       end
 
       # @api private
+      alias_method :_dry_equalizer_hash, :hash
+
+      # @api public
+      def hash
+        return @__hash__ if instance_variable_defined?(:@__hash__)
+
+        _dry_equalizer_hash
+      end
+
+      # @api public
       def finalize!(freeze_values: false)
+        return self if frozen?
+
         values.each_value do |value|
           if value.is_a?(self.class)
             value.finalize!(freeze_values: freeze_values)
@@ -139,6 +167,13 @@ module Dry
           end
         end
 
+        # Memoize the hash for the object when finalizing (regardless of whether values themselves
+        # are to be frozen; the intention of finalization is that no further changes should be
+        # made). The benefit of freezing the hash at this point is that it saves repeated expensive
+        # computation (through Dry::Equalizer's hash implementation) if that hash is to be used
+        # later in performance-sensitive situations, such as when serving as a cache key or similar.
+        @__hash__ = _dry_equalizer_hash
+
         freeze
       end
 
@@ -175,11 +210,6 @@ module Dry
           dup_hsh[key] = _settings[key].cloneable? ? val.dup : val
         }
       end
-
-      def initialize_copy(source)
-        super
-        @_values = source.__send__(:dup_values)
-      end
     end
   end
 end

data/lib/dry/configurable/constants.rb

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

data/lib/dry/configurable/dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Configurable
     # Setting DSL used by the class API

data/lib/dry/configurable/errors.rb

@@ -6,7 +6,8 @@ module Dry
   # @api public
   module Configurable
     Error = Class.new(::StandardError)
-    AlreadyIncluded = ::Class.new(Error)
-    FrozenConfig = ::Class.new(Error)
+
+    AlreadyIncludedError = Class.new(Error)
+    FrozenConfigError = Class.new(Error)
   end
 end

data/lib/dry/configurable/extension.rb

@@ -26,7 +26,7 @@ module Dry
 
       # @api private
       def included(klass)
-        raise AlreadyIncluded if klass.include?(InstanceMethods)
+        raise AlreadyIncludedError if klass.include?(InstanceMethods)
 
         super
 

data/lib/dry/configurable/instance_methods.rb

@@ -12,7 +12,7 @@ module Dry
     module Initializer
       # @api private
       def initialize(*)
-        @config = self.class.__config_build__(self.class._settings)
+        @config = self.class.__config_build__(self.class.settings)
 
         super
       end

data/lib/dry/configurable/methods.rb

@@ -8,7 +8,7 @@ module Dry
     module Methods
       # @api public
       def configure(&block)
-        raise FrozenConfig, "Cannot modify frozen config" if frozen?
+        raise FrozenConfigError, "Cannot modify frozen config" if config.frozen?
 
         yield(config) if block
         self

data/lib/dry/configurable/setting.rb

@@ -2,40 +2,41 @@
 
 require "set"
 
-require "dry/core/equalizer"
-
 module Dry
   module Configurable
-    # This class represents a setting and is used internally.
+    # A defined setting.
     #
-    # @api private
+    # @api public
     class Setting
       include Dry::Equalizer(:name, :default, :constructor, :children, :options, inspect: false)
 
-      OPTIONS = %i[default reader constructor cloneable settings config_class].freeze
+      OPTIONS = %i[default reader constructor mutable cloneable settings config_class].freeze
 
       DEFAULT_CONSTRUCTOR = -> v { v }.freeze
 
-      CLONEABLE_VALUE_TYPES = [Array, Hash, Set, Config].freeze
+      MUTABLE_VALUE_TYPES = [Array, Hash, Set, Config].freeze
 
-      # @api private
+      # @api public
       attr_reader :name
 
-      # @api private
+      # @api public
       attr_reader :default
 
-      # @api private
+      # @api public
+      attr_reader :mutable
+
+      # @api public
       attr_reader :constructor
 
-      # @api private
+      # @api public
       attr_reader :children
 
-      # @api private
+      # @api public
       attr_reader :options
 
       # @api private
-      def self.cloneable_value?(value)
-        CLONEABLE_VALUE_TYPES.any? { |type| value.is_a?(type) }
+      def self.mutable_value?(value)
+        MUTABLE_VALUE_TYPES.any? { |type| value.is_a?(type) }
       end
 
       # @api private
@@ -48,6 +49,10 @@ module Dry
       )
         @name = name
         @default = default
+        @mutable = children.any? || options.fetch(:mutable) {
+          # Allow `cloneable` as an option alias for `mutable`
+          options.fetch(:cloneable) { Setting.mutable_value?(default) }
+        }
         @constructor = constructor
         @children = children
         @options = options
@@ -58,10 +63,11 @@ module Dry
         options[:reader].equal?(true)
       end
 
-      # @api private
-      def cloneable?
-        children.any? || options.fetch(:cloneable) { Setting.cloneable_value?(default) }
+      # @api public
+      def mutable?
+        mutable
       end
+      alias_method :cloneable?, :mutable?
 
       # @api private
       def to_value
@@ -71,7 +77,7 @@ module Dry
           value = default
           value = constructor.(value) unless value.eql?(Undefined)
 
-          cloneable? ? value.dup : value
+          mutable? ? value.dup : value
         end
       end
     end

data/lib/dry/configurable/settings.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 module Dry
   module Configurable
-    # A settings map
+    # A collection of defined settings on a given class.
     #
     # @api private
     class Settings
@@ -20,37 +18,48 @@ module Dry
         @settings = settings.each_with_object({}) { |s, m| m[s.name] = s }
       end
 
+      # @api private
+      private def initialize_copy(source)
+        @settings = source.settings.dup
+      end
+
       # @api private
       def <<(setting)
         settings[setting.name] = setting
         self
       end
 
-      # @api private
+      # Returns the setting for the given name, if found.
+      #
+      # @return [Setting, nil] the setting, or nil if not found
+      #
+      # @api public
       def [](name)
         settings[name]
       end
 
-      # @api private
+      # Returns true if a setting for the given name is defined.
+      #
+      # @return [Boolean]
+      #
+      # @api public
       def key?(name)
         keys.include?(name)
       end
 
-      # @api private
+      # Returns the list of defined setting names.
+      #
+      # @return [Array<Symbol>]
+      #
+      # @api public
       def keys
         settings.keys
       end
 
-      # @api private
+      # @api public
       def each(&block)
         settings.each_value(&block)
       end
-
-      private
-
-      def initialize_copy(source)
-        @settings = source.settings.dup
-      end
     end
   end
 end

data/lib/dry/configurable/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Configurable
     # @api public
-    VERSION = "0.16.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/dry/configurable.rb

@@ -2,7 +2,7 @@
 
 require "zeitwerk"
 
-require "dry/core/constants"
+require "dry/core"
 require "dry/configurable/constants"
 require "dry/configurable/errors"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-configurable
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andy Holland
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +120,7 @@ metadata:
   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:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A mixin to add configuration functionality to your classes
 test_files: []