configatron 4.2.0 → 4.2.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 4.2.1
+
+* Fix a bug with deep cloning which caused temping to break for nested settings
+
 === 4.2.0
 
 * [backwards-incompatible] Make to_h/to_hash recursively hashify Configatron::Stores, and resolve Configatron::Procs.

data/lib/configatron/deep_clone.rb

@@ -37,8 +37,16 @@ module Configatron::DeepClone
   def self.deep_clone( obj=self, cloned={} )
     if Configatron::RootStore === obj
       # We never actually want to have multiple copies of our
-      # Configatron::RootStore (and every Store has a reference).
+      # Configatron::RootStore -- when making a temp, we just stick
+      # the state-to-revert-to into an ivar.
       return obj
+    elsif Configatron::Store === obj
+      # Need to special-case this since it's a BasicObject, meaning it
+      # doesn't respond to all the usual ivar magic methods
+      cl = obj.clone(cloned)
+      cloned[obj.__id__] = cl
+      cloned[cl.__id__] = cl
+      return cl
     elsif cloned.key?( obj.__id__ )
       return cloned[obj.__id__]
     else
@@ -52,7 +60,6 @@ module Configatron::DeepClone
         cloned[obj.__id__] = cl
         cloned[cl.__id__] = cl
         case
-        when Configatron::Store === cl then return cl
         when Hash === cl
           cl.clone.each do |k,v|
             cl[k] = deep_clone( v, cloned )

data/lib/configatron/store.rb

@@ -88,8 +88,12 @@ class Configatron
     end
 
     # Needed for deep_clone to actually clone this object
-    def clone
-      Store.new(@root_store, @name, @attributes.clone)
+    def clone(cloned={})
+      root_store = DeepClone.deep_clone(@root_store, cloned)
+      name = DeepClone.deep_clone(@name, cloned)
+      attributes = DeepClone.deep_clone(@attributes, cloned)
+
+      Store.new(root_store, name, attributes)
     end
 
     def to_h

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

data/test/functional/configatron.rb

@@ -26,6 +26,15 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
       assert_equal(false, @kernel.key?(:c))
     end
 
+    it 'nested' do
+      @kernel.foo.bar = 'original'
+      @kernel.temp do
+        @kernel.foo.bar = 'temp'
+        assert_equal('temp', @kernel.foo.bar)
+      end
+      assert_equal('original', @kernel.foo.bar)
+    end
+
     describe 'start/end' do
       it 'allows for temporary setting of values' do
         assert_equal('A', @kernel.a)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3864894795624167904
+      hash: -3339507519042551569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3864894795624167904
+      hash: -3339507519042551569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25