confuse 0.1.3 → 0.1.4

data/lib/confuse/config.rb

@@ -12,8 +12,17 @@ module Confuse
     include ConfigMixin
     extend DSL
 
-    def initialize(*paths)
-      load_namespaces(self.class.namespaces)
+    def namespaces
+      @namespaces ||= {}
+    end
+
+    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

data/lib/confuse/config_item.rb

@@ -25,6 +25,10 @@ module Confuse
       @default_value = block unless block.nil?
     end
 
+    def value=(val)
+      @value = val
+    end
+
     def value
       @value || @default_value
     end

data/lib/confuse/config_mixin.rb

@@ -12,8 +12,9 @@ module Confuse
     def load_namespaces(new_namespaces)
       new_namespaces.each do |key, value|
         existing = namespaces[key]
-        existing ? existing.merge!(value) : namespaces[key] = value
+        existing ? existing.merge!(value) : namespaces[key] = value.clone
       end
+      @foo = true
     end
 
     def read_files(file_paths)
@@ -35,6 +36,7 @@ module Confuse
     end
 
     def []=(key, value)
+      puts "WARNING: changing config after it has been set!"
       mixin_config!({key => value})
     end
 

data/lib/confuse/namespace.rb

@@ -9,8 +9,8 @@ module Confuse
 
     def initialize(&block)
       @items = {}
-      @supress_warnings = false
-      @strict = false
+      @supress_warnings_flag = false
+      @strict_flag = false
       instance_eval(&block)
     end
 
@@ -58,7 +58,17 @@ module Confuse
     def merge!(namespace)
       @strict_flag = namespace.strict
       @supress_warnings_flag = namespace.supress_warnings
-      @items.merge! namespace.items
+      @items.merge! namespace.clone.items
+    end
+
+    def clone
+      c = super
+      items = @items.reduce({}) do |m, (k, v)|
+        m[k] = v.clone
+        m
+      end
+      c.instance_variable_set(:"@items", items)
+      c
     end
 
   end

data/lib/confuse/version.rb

@@ -1,3 +1,3 @@
 module Confuse
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/test/test_config_base.rb

@@ -0,0 +1,24 @@
+require 'minitest/autorun'
+require 'confuse'
+
+class Foo < Confuse::ConfigBase
+  define :foo do
+    default 'foo'
+  end
+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
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confuse
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tom Chipchase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-09 00:00:00 Z
+date: 2013-10-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile
@@ -92,6 +92,7 @@ files:
 - lib/confuse/namespace.rb
 - lib/confuse/version.rb
 - test/test_config.rb
+- test/test_config_base.rb
 - test/test_namespace.rb
 homepage: https://github.com/mediasp/confuse
 licenses: 
@@ -128,5 +129,6 @@ specification_version: 3
 summary: A DSL for defining configuration options in classes
 test_files: 
 - test/test_config.rb
+- test/test_config_base.rb
 - test/test_namespace.rb
 has_rdoc: