scash 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb3c105339a4820c5d2fe359594bd710f7bace6
-  data.tar.gz: 06965713698f73c8da9eab643e4d5ae73aa4d167
+  metadata.gz: 435c9ec1908e446eadcabfbd799e211f4b794831
+  data.tar.gz: 6468a6f6506e6a9788a62e589e2f6c636ab3e603
 SHA512:
-  metadata.gz: 7551bb81e9e0ca26bde47cf371e891172d19e18397175560febd0b429578f4e8645246c3f9437f70766e6aac357edb75ea4834c94379a749b3657ab83992c070
-  data.tar.gz: ed4217efe76a8978e28335ccea253726dbaaf06dc49b1c18310f06a1d53196920d39f58e89a80ac5ff7c0c65678e254af36208cc84c04d10573d25a83c977dc6
+  metadata.gz: 887e1b2094f5b91242fe2a2c17b63de4160db7ec3b76d57c4b66b818e02a2aea356c10cbf674410d0314fef95f9cac9ecb5248c3deb0833bb1ea495281025890
+  data.tar.gz: dcb3e970ee5abd68ade49a25a7b2b13c55bfaea88bebb5482c07191fa2894f317675ccee7a50fb791107adb236455d1b062affccec136202a0ef5e7ef5bf4bc0

data/lib/scash.rb

@@ -31,11 +31,11 @@ class Scash
     @inverse_hash.merge!(variables.reject{|key| @inverse_hash.key?(key)})
     yield
   ensure
-    variables.keys.each{|key| @hash.delete(key)}
-    variables.keys.each{|key| @inverse_hash.delete(key)}
+    variables.each_key{|key| @hash.delete(key)}
+    variables.each_key{|key| @inverse_hash.delete(key)}
     @inverse_hash.merge!(previous_inverse_hash)
     @hash.merge!(previous_hash)
-    @hash.merge!(global_variables)
+    @hash.merge!(global_variables.reject { |k| @hash.has_key?(k) })
   end
   alias :with :scope
 

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/test_scash.rb

@@ -164,6 +164,15 @@ describe Scash do
         scash.define_global_variables :result => 1337
         assert_equal 1337, scash[:result]
 
+        scash.with(({:result => 1338})) do
+          assert_equal 1338, scash[:result]
+          scash.with(({:result => 1339})) do
+            assert_equal 1339, scash[:result]
+          end
+          assert_equal 1338, scash[:result]
+        end
+        assert_equal 1337, scash[:result]
+
         scash.with({:b => 2}) do
           assert_equal 1337, scash[:result]
           assert_equal 2, scash[:b]
@@ -185,7 +194,7 @@ describe Scash do
           scash.define_global_variables :a => 3
           assert_equal 3, scash[:a]
         end
-        assert_equal 3, scash[:a]
+        assert_equal 1, scash[:a]
       end
       assert_equal 3, scash[:a]
     end
@@ -197,4 +206,4 @@ describe Scash do
       assert_equal({:a => 1, :b => 2}.with_indifferent_access, scash.merge(:b => 2))
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport