scash 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1544314116a37cfa4425e4e03d8b5ef88d8ca5a9
-  data.tar.gz: 10457d9d63dce1ebd2fdd3fe924ee76c5bdcdade
+  metadata.gz: 4176c2aeb1fef862467a9776c9f3a4524f9c69db
+  data.tar.gz: 40ea5d25325f7a2de15f82d73850bb37a1913dac
 SHA512:
-  metadata.gz: 7089aad512341a09766a2874c5f9a800a466b634e326eb4c369bb35bcacfd68c963882c5916aeb394664d2d69d236312c7c410ec9b0be5461dca5b9e86188161
-  data.tar.gz: 22b5976ab4f5356bc133303b6a26ff45362dc2bcade5f17f7e361a1d637b9b2c6e32e755ecf7af849f1ac161e86242d90c540d3b150ecd4ee0724c5ee0530a8e
+  metadata.gz: 1de6938194f4189ee0aa1e060e16b914e9c1d4dcb63477347122ee83afd66ba3a512bb9f6158e6667ba0c3efe3332342244124b064b118093d88818a8c2df506
+  data.tar.gz: df6d5ea94b6b15d583695b953b7e21817b6d7a53e12fa9d749f4936c52e067434c451992b52a0b6a7beee7f0a82f104be100b4f45c49fff7b36aa9ab01e6c67c

data/lib/scash.rb

@@ -34,9 +34,9 @@ class Scash
   ensure
     variables.keys.each{|key| @hash.delete(key)}
     variables.keys.each{|key| @inverse_hash.delete(key)}
-    @hash.merge!(@global_variables)
     @inverse_hash.merge!(previous_inverse_hash)
     @hash.merge!(previous_hash)
+    @hash.merge!(@global_variables)
   end
   alias :with :scope
 
@@ -54,7 +54,7 @@ class Scash
 
   def define_global_variables(variables)
     @hash.merge! variables
-    @global_variables.merge! convert(variables)
+    @global_variables.merge! variables
   end
 
   private

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_scash.rb

@@ -179,6 +179,15 @@ describe Scash do
 
       assert_equal "foo", scash[:result]
       assert_equal "bar", scash[:b]
+
+      scash.with({:a => 1}) do
+        scash.with({:a => 2}) do
+          scash.define_global_variables :a => 3
+          assert_equal 3, scash[:a]
+        end
+        assert_equal 3, scash[:a]
+      end
+      assert_equal 3, scash[:a]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephan Kaag