dry-configurable 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d220ee0a9d75b6b400a98b8165b32f9c3fe3fbfdc4661f36e8a99a6a36181cb7
-  data.tar.gz: 3c22814973a66b5ea08efaa14c6c8dc2130b7a8c20e48167e400aa51e66426e3
+  metadata.gz: f0faa56dea70f112144295394747175b526e116cdfd09d3ccfa047b85dd06b11
+  data.tar.gz: 48fc6304ef41ea05076765bbe8f7286e90ed69ee54b388650d3654b74b4ebfda
 SHA512:
-  metadata.gz: 44819f0abbc69555c660df2cf1e777bd0a6ca9bcccc9fbbd9c1198983e2739e47530527f7d07b737432a4429fe1243d28d62625992bb76f91e1437bab441eb42
-  data.tar.gz: 28001d7d843d4e70bbcc4a57332400b868fd385345b8a5977b82c713fc2b9f21f4a5e5746fee630e8f6d83990144943b7b7b1e604291a91096fd25971982c91e
+  metadata.gz: 9c6c284433350053c27e745a8bcb0a0c000c22d4fe684c39eeb20340d026b764f8d80ee155a30ba88af66f4e9ba1022e1572accfa5aff4657b463978534d964e
+  data.tar.gz: ed4d650fb3f2d7f92d05bad9575c452bf67138489a734e91ccc4fb6d9fa5932a6dee72430a84c7b2994b8d28bb42a6d7c4dda8e5b82e9ce51ac588a0888f1b2b

data/CHANGELOG.md

@@ -1,4 +1,58 @@
-## unreleased 
+## 0.11.5 2020-03-23
+
+
+### Fixed
+
+- When settings are copied or cloned, unevaluated values will no longer be copied. This prevents unintended crashes when settings have constructors expecting a certain type of value, but that value is yet to be provided (Fixed via #87) (@timriley)
+
+
+[Compare v0.11.4...v0.11.5](https://github.com/dry-rb/dry-configurable/compare/v0.11.4...v0.11.5)
+
+## 0.11.4 2020-03-16
+
+
+### Fixed
+
+- `Config#update` returns `self` again (issue #60 fixed via #92) (@solnic)
+
+### Changed
+
+- `Setting#inspect` no longer uses its value - this could cause crashes when inspecting settings that are yet to have a value applied (e.g. when they have a constructor that expects a value to be present) (@timriley)
+
+[Compare v0.11.3...v0.11.4](https://github.com/dry-rb/dry-configurable/compare/v0.11.3...v0.11.4)
+
+## 0.11.3 2020-02-22
+
+
+### Fixed
+
+- Retrieving settings by a string name works again (issue #82) (@waiting-for-dev)
+
+
+[Compare v0.11.2...v0.11.3](https://github.com/dry-rb/dry-configurable/compare/v0.11.2...v0.11.3)
+
+## 0.11.2 2020-02-20
+
+
+### Fixed
+
+- Warning about redefined `Setting#value` is gone (@solnic)
+
+
+[Compare v0.11.1...v0.11.2](https://github.com/dry-rb/dry-configurable/compare/v0.11.1...v0.11.2)
+
+## 0.11.1 2020-02-18
+
+
+### Fixed
+
+- You can use `:settings` as a config key again (issue #80) (@solnic)
+- Setting value is lazy-evaluated now, which fixes some cases where a constructor could crash with a `nil` value (@solnic)
+
+
+[Compare v0.11.0...v0.11.1](https://github.com/dry-rb/dry-configurable/compare/v0.11.0...v0.11.1)
+
+## 0.11.0 2020-02-15
 
 Complete rewrite of the library while keeping the public API intact. See #78 for a detailed overview.
 
@@ -8,7 +62,7 @@ Complete rewrite of the library while keeping the public API intact. See #78 for
 - (internal) New low-level Setting and Config API (@solnic)
 - (internal) `config` objects use method_missing now (@solnic)
 
-[Compare v0.10.0...master](https://github.com/dry-rb/dry-configurable/compare/v0.10.0...master)
+[Compare v0.10.0...v0.11.0](https://github.com/dry-rb/dry-configurable/compare/v0.10.0...v0.11.0)
 
 ## 0.10.0 2020-01-31
 

data/lib/dry/configurable/class_methods.rb

@@ -16,7 +16,7 @@ module Dry
       def inherited(klass)
         super
 
-        parent_settings = (respond_to?(:config) ? config.settings : _settings)
+        parent_settings = (respond_to?(:config) ? config._settings : _settings)
 
         klass.instance_variable_set('@_settings', parent_settings)
       end

data/lib/dry/configurable/config.rb

@@ -16,15 +16,15 @@ module Dry
       include Dry::Equalizer(:values)
 
       # @api private
-      attr_reader :settings
+      attr_reader :_settings
 
       # @api private
-      attr_reader :resolved
+      attr_reader :_resolved
 
       # @api private
       def initialize(settings)
-        @settings = settings.dup
-        @resolved = Concurrent::Map.new
+        @_settings = settings.dup
+        @_resolved = Concurrent::Map.new
       end
 
       # Get config value by a key
@@ -33,9 +33,10 @@ module Dry
       #
       # @return Config value
       def [](name)
-        raise ArgumentError, "+#{name}+ is not a setting name" unless settings.key?(name)
+        name = name.to_sym
+        raise ArgumentError, "+#{name}+ is not a setting name" unless _settings.key?(name)
 
-        settings[name].value
+        _settings[name].value
       end
 
       # Set config value.
@@ -49,7 +50,7 @@ module Dry
 
       # Update config with new values
       #
-      # @param [Hash] A hash with new values
+      # @param values [Hash] A hash with new values
       #
       # @return [Config]
       #
@@ -63,6 +64,7 @@ module Dry
             self[key] = value
           end
         end
+        self
       end
 
       # Dump config into a hash
@@ -71,7 +73,7 @@ module Dry
       #
       # @api public
       def values
-        settings
+        _settings
           .map { |setting| [setting.name, setting.value] }
           .map { |key, value| [key, value.is_a?(self.class) ? value.to_h : value] }
           .to_h
@@ -81,32 +83,32 @@ module Dry
 
       # @api private
       def finalize!
-        settings.freeze
+        _settings.freeze
         freeze
       end
 
       # @api private
       def pristine
-        self.class.new(settings.pristine)
+        self.class.new(_settings.pristine)
       end
 
       # @api private
       def respond_to_missing?(meth, include_private = false)
-        super || settings.key?(resolve(meth))
+        super || _settings.key?(resolve(meth))
       end
 
       private
 
       # @api private
       def method_missing(meth, *args)
-        setting = settings[resolve(meth)]
+        setting = _settings[resolve(meth)]
 
         super unless setting
 
         if setting.writer?(meth)
           raise FrozenConfig, 'Cannot modify frozen config' if frozen?
 
-          settings << setting.with(input: args[0])
+          _settings << setting.with(input: args[0])
         else
           setting.value
         end
@@ -114,13 +116,13 @@ module Dry
 
       # @api private
       def resolve(meth)
-        resolved.fetch(meth) { resolved[meth] = meth.to_s.tr('=', '').to_sym }
+        _resolved.fetch(meth) { _resolved[meth] = meth.to_s.tr('=', '').to_sym }
       end
 
       # @api private
       def initialize_copy(source)
         super
-        @settings = source.settings.dup
+        @_settings = source._settings.dup
       end
     end
   end

data/lib/dry/configurable/dsl.rb

@@ -43,7 +43,7 @@ module Dry
 
         default, opts = args
 
-        node = [:setting, [name, default, opts == default ? EMPTY_HASH : opts]]
+        node = [:setting, [name.to_sym, default, opts == default ? EMPTY_HASH : opts]]
 
         if block
           if block.arity.zero?

data/lib/dry/configurable/setting.rb

@@ -13,7 +13,7 @@ module Dry
     #
     # @api private
     class Setting
-      include Dry::Equalizer(:name, :value, :options)
+      include Dry::Equalizer(:name, :value, :options, inspect: false)
 
       OPTIONS = %i[input default reader constructor settings].freeze
 
@@ -33,9 +33,6 @@ module Dry
       # @api private
       attr_reader :default
 
-      # @api private
-      attr_reader :value
-
       # @api private
       attr_reader :options
 
@@ -63,7 +60,21 @@ module Dry
         @input = input.equal?(Undefined) ? default : input
         @default = default
         @options = options
-        set!
+      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
@@ -106,12 +117,12 @@ module Dry
       # @api private
       def initialize_copy(source)
         super
-        @value = source.value.dup if source.clonable_value?
+        @value = source.value.dup if source.input_defined? && source.clonable_value?
         @options = source.options.dup
       end
 
       # @api private
-      def set!
+      def evaluate
         @value = constructor[input.equal?(Undefined) ? nil : input]
       end
     end

data/lib/dry/configurable/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Configurable
     # @api public
-    VERSION = '0.11.0'
+    VERSION = '0.11.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-configurable
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby