dry-configurable 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323f300c1cf0cf407272352b81dd0775ac7f855713cd6145fccc9d11dbdae8cf
-  data.tar.gz: b8258cfa9a30108831384e575a00e5afd93b9d94942d52799d23013e3753ceaf
+  metadata.gz: 0d8c3e4ebee8cf7f978c48580f64c1547c6c818b50ed7064b0758b4bffb072ee
+  data.tar.gz: 2aa701383b59289fbe591100642027fc5bc0d074bd0ec5d6d085359293af0f8f
 SHA512:
-  metadata.gz: d37acc7d39adb1ed1f0da218c5f16ac0e6d09832e70e73220770fa28ad8eff4f21f440a6285b22785de82f76a8df6f444d37024d5059fdc2ba3f3b3006fd19c9
-  data.tar.gz: c7888430539dfa30f4518ca159cae0675d2766ec8c27870a5e74c64f04521aa517fea1772bb766f5c9f364d83e24610c7bf7f72c65739adb05b2e9a0ca1230f0
+  metadata.gz: 221e2cfb38c4eae38ab6b56250e2d70672c9d1e6883b048f5a6bc807d0996065bf1b8e4a102fd78b6a95a4a4ffcf21dcfd46c64737acd915b3d1b80f9dca273e
+  data.tar.gz: 1f04a6b9af22d12a6b310902cdf5761362762a7fcca97c78a2feb17a28ce3199285a8cd1b6e80c56cde10f7fc2983c8598990fa263e5e55656502ad22761dd2e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 <!--- 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/lib/dry/configurable/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/core/constants"
+require "set"
 
 require "dry/core/equalizer"
 
@@ -18,15 +19,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 +55,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
@@ -64,6 +78,8 @@ module Dry
           raise ArgumentError, "+#{name}+ is not a setting name"
         end
 
+        _configured.add(name)
+
         _values[name] = setting.constructor.(value)
       end
 
@@ -101,11 +117,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 +132,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
@@ -175,11 +194,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/setting.rb

@@ -24,6 +24,9 @@ module Dry
       # @api private
       attr_reader :default
 
+      # @api private
+      attr_reader :cloneable
+
       # @api private
       attr_reader :constructor
 
@@ -48,6 +51,9 @@ module Dry
       )
         @name = name
         @default = default
+        @cloneable = children.any? || options.fetch(:cloneable) {
+          Setting.cloneable_value?(default)
+        }
         @constructor = constructor
         @children = children
         @options = options
@@ -60,7 +66,7 @@ module Dry
 
       # @api private
       def cloneable?
-        children.any? || options.fetch(:cloneable) { Setting.cloneable_value?(default) }
+        cloneable
       end
 
       # @api private

data/lib/dry/configurable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-configurable
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Andy Holland
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -114,7 +114,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 +129,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: []