dry-config 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bdac42ba070c133bd4c02d1675b3f5d15a34eb
-  data.tar.gz: c640bf904bdce15098be492e2e7ff8dba96f9aed
+  metadata.gz: fe732b8904f1e9a3fa01f901618ea841b24fa35e
+  data.tar.gz: b5bd5f10972da2af169f21c71c12d174e8d3c2ce
 SHA512:
-  metadata.gz: 81fa0b488861ccd5fd22141febda0113bc2cd54534e0d6ba2e7b95e992fed47800ef8cf095d6c1324984e2cdfa430eb4f8cf0d62acf083fb81b146353aeb4591
-  data.tar.gz: 6580dc6edf6eb2c201f54942c25be63df1425ec120f4bee0f388e282cc91bc10f8e711e6d708f06c7581b332ace7e5d9f9895b3755764d9b163e1834bfc27b6d
+  metadata.gz: ff0a71be24d0dc6f7c119030976cb11f144baf87a3d8fc6e1ccae28038d03794fb8b83de62d1c87475518da52840f7609f0aa0e952df025a717850e25ac7eb05
+  data.tar.gz: fdaaf9786d8ac6bc104e97f1999946010540473aea18922b0ea480e3d03ff7ab6f4a745cf4b82444ab36b150060fe63a8074ae40409dcda62e08cdcc31d422dc

data/README.md

@@ -43,17 +43,19 @@ class AcmeConfig < Dry::Config::Base
     # (optional) make this the only instance 
     include Singleton
     
-    # seed the sensible defaults here
-    def seed_default_configuration
-      
-      @configuration = {
-          environment: nil,
-          strategy: :blue_green,
-          package: {
-              verbose: false
-          },
-          options: {}
-      }
+    def initialize(options = {})
+      options = {
+          # seed the sensible defaults here (overridable)
+          default_configuration: {
+              environment: nil,
+              strategy: :blue_green,
+              package: {
+                  verbose: false
+              },
+              options: {}
+          }}.merge(options)
+
+      super(options)
     end
 end
 ```

data/lib/dry/config/base.rb

@@ -18,17 +18,20 @@ module Dry
       attr_reader :filenames
 
       def initialize(options = {})
-        @options = {interpolation: true, symbolize: true}.merge options
+        @options = {
+            interpolation: true,
+            symbolize: true,
+            default_configuration: {},
+            potential_environments: [:development, :test, :staging, :production]
+        }.merge options
 
-        seed_default_configuration
+        @default_configuration = @options[:default_configuration]
 
         # used for pruning initial base set.  See #load!
-        @potential_environments = [:development, :test, :staging, :production]
-      end
+        @potential_environments = @options[:potential_environments]
 
-      def seed_default_configuration
-        # override and seed the sensible defaults here
-        @configuration = {}
+        # setup a default configuration
+        clear
       end
 
       # This is the main point of entry - we call #load! and provide
@@ -41,9 +44,7 @@ module Dry
         raise 'Unspecified filename' if filenames.nil?
 
         # ensure symbol
-        if environment
-          environment = environment.to_sym unless environment.is_a? Symbol
-        end
+        environment = environment.to_sym unless environment.nil?
 
         # save these in case we #reload
         @environment = environment
@@ -121,7 +122,9 @@ module Dry
       end
 
       def clear
-        seed_default_configuration
+        # clone a copy of the default
+        @configuration = {}.merge @default_configuration
+        @configuration.deep_symbolize if @options[:symbolize]
       end
 
       def method_missing(name, *args, &block)

data/lib/dry/config/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Config
-    VERSION = '1.1.6'
+    VERSION = '1.2.0'
   end
 end

data/spec/dry/config/base_spec.rb

@@ -6,16 +6,19 @@ describe Dry::Config::Base do
   class AcmeConfig < Dry::Config::Base
     include Singleton
 
-    def seed_default_configuration
-      # seed the sensible defaults here
-      @configuration = {
-          environment: nil,
-          strategy: :blue_green,
-          package: {
-              verbose: false
-          },
-          options: {}
-      }
+    def initialize(options = {})
+      options = {
+          # seed the sensible defaults here (overridable)
+          default_configuration: {
+              environment: nil,
+              strategy: :blue_green,
+              package: {
+                  verbose: false
+              },
+              options: {}
+          }}.merge(options)
+
+      super(options)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-config
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler