confuse 0.1.5 → 0.1.6

data/lib/confuse/config.rb

@@ -19,15 +19,12 @@ module Confuse
     def initialize(options = {})
       load_namespaces(self.class.namespaces.clone)
       paths = options[:paths] || []
-      load_defaults = begin
-                        d = options[:load_defaults]
-                        d.nil? ? true : d
-                      end
       if paths.flatten.empty?
         read_files(self.class.config_path.flatten)
       else
         read_files(paths.flatten)
       end
+      options[:conf].tap { |conf| conf && mixin_config!(conf) }
     end
 
     def config

data/lib/confuse/version.rb

@@ -1,3 +1,3 @@
 module Confuse
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/test/test_config_base.rb

@@ -10,19 +10,6 @@ class Foo < Confuse::ConfigBase
 end
 
 class TestConfigBase < MiniTest::Unit::TestCase
-  def test_two_instances_can_exist_with_different_values
-    # instatiate two versions of the config
-    config1 = Foo.new
-    config2 = Foo.new
-
-    # change the values of one of them
-    config1[:foo] = 'bar'
-
-    # assert only one has changed
-    assert_equal 'bar', config1[:foo]
-    assert_equal 'foo', config2[:foo]
-  end
-
   # This is easier to test with an instance of a config object, rather than as
   # part of the test for the module where other tests can modify the model.
   def test_params_hash
@@ -30,5 +17,21 @@ class TestConfigBase < MiniTest::Unit::TestCase
                                       :default => 'foo' } },
                  Foo.new.params_hash)
   end
+
+  def test_can_specify_config_options_on_initialize
+    config = Foo.new(:conf => { :foo => 'bar' })
+
+    assert_equal 'bar', config[:foo]
+  end
+
+  def test_two_instances_can_exist_with_different_values
+    # instatiate two versions of the config
+    config1 = Foo.new
+    config2 = Foo.new(:conf => { :foo => 'bar' })
+
+    # assert config1 and config2 are different
+    assert_equal 'foo', config1[:foo]
+    assert_equal 'bar', config2[:foo]
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confuse
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tom Chipchase