configatron 4.2.1 → 4.3.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 4.3.0
+
+* [backwards-incompatible] Make nil into a valid config value
+* [backwards-incompatible] Make temp clean up after itself when an exception is thrown
+
 === 4.2.1
 
 * Fix a bug with deep cloning which caused temping to break for nested settings

data/lib/configatron/root_store.rb

@@ -30,8 +30,12 @@ class Configatron::RootStore < BasicObject
 
   def temp(&block)
     temp_start
-    yield
-    temp_end
+
+    begin
+      yield
+    ensure
+      temp_end
+    end
   end
 
   def temp_start

data/lib/configatron/store.rb

@@ -28,8 +28,10 @@ class Configatron
     end
 
     def fetch(key, default_value = nil, &block)
-      val = @attributes[key.to_sym]
-      if val == nil
+      key = key.to_sym
+      if key?(key)
+        val = @attributes[key]
+      else
         if block
           val = block.call
         elsif default_value

data/lib/configatron/version.rb

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

data/test/functional/configatron.rb

@@ -35,6 +35,19 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
       assert_equal('original', @kernel.foo.bar)
     end
 
+    it 'cleans up after an exception' do
+      @kernel.foo.bar = 'original'
+
+      assert_raises(RuntimeError) do
+        @kernel.temp do
+          @kernel.foo.bar = 'temp'
+          raise RuntimeError.new('error')
+        end
+      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)
@@ -116,4 +129,11 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
       assert_equal(expected_hash, @kernel.to_hash)
     end
   end
+
+  describe 'nil value' do
+    it 'remembers a nil value' do
+      @kernel.a = nil
+      assert_equal(nil, @kernel.a)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-23 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: -3339507519042551569
+      hash: -4412635049792496814
 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: -3339507519042551569
+      hash: -4412635049792496814
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25