dry-configurable 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d220ee0a9d75b6b400a98b8165b32f9c3fe3fbfdc4661f36e8a99a6a36181cb7
-  data.tar.gz: 3c22814973a66b5ea08efaa14c6c8dc2130b7a8c20e48167e400aa51e66426e3
+  metadata.gz: d6c2b78240f829b83467c0edd12a5c4dc59d4d7b0fdb5aa9e44fdfc5e3031e13
+  data.tar.gz: 506974ab79b93359fbac5305fa76860f13b13047dd85a76dffbbdebc500d2d93
 SHA512:
-  metadata.gz: 44819f0abbc69555c660df2cf1e777bd0a6ca9bcccc9fbbd9c1198983e2739e47530527f7d07b737432a4429fe1243d28d62625992bb76f91e1437bab441eb42
-  data.tar.gz: 28001d7d843d4e70bbcc4a57332400b868fd385345b8a5977b82c713fc2b9f21f4a5e5746fee630e8f6d83990144943b7b7b1e604291a91096fd25971982c91e
+  metadata.gz: 4e1bf6f3ea8ebd9bae2d0bd759cd3f81fd591d8df3a11e675b23acc54f1228ec3311bdab3c04f6b85e5db01ca718d1ed64b2347fa2bcbb3d439c127a6efdfe39
+  data.tar.gz: 2ff1ff49ddee94891d5e920e5b48c2c4a5d50d7a2e56c4c4df7c68b46cd61c4270ee375ad6c5a9d6b95f4ca8b01b4d4dd397e2f350a4d6aa584c0d3d87e4442c

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## unreleased 
 
+
+### 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...master](https://github.com/dry-rb/dry-configurable/compare/v0.11.0...master)
+
+## 0.11.0 2020-02-15
+
 Complete rewrite of the library while keeping the public API intact. See #78 for a detailed overview.
 
 ### Changed
@@ -8,7 +19,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,9 @@ module Dry
       #
       # @return Config value
       def [](name)
-        raise ArgumentError, "+#{name}+ is not a setting name" unless settings.key?(name)
+        raise ArgumentError, "+#{name}+ is not a setting name" unless _settings.key?(name)
 
-        settings[name].value
+        _settings[name].value
       end
 
       # Set config value.
@@ -71,7 +71,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 +81,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 +114,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/setting.rb

@@ -63,7 +63,11 @@ module Dry
         @input = input.equal?(Undefined) ? default : input
         @default = default
         @options = options
-        set!
+      end
+
+      # @api private
+      def value
+        @value ||= evaluate
       end
 
       # @api private
@@ -111,7 +115,7 @@ module Dry
       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.1'
   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.1
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby