scash 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570eef32d6464578fcb182f5b2a2cb480c9c6160
-  data.tar.gz: 60f4308b7368944b2c123ffb0e579fdd57b9da96
+  metadata.gz: 0bffa41de0ca678f84bac31ff66ebb2f48530aa0
+  data.tar.gz: 0efbb1eb55d831f2a7c0b3cc360c4c5829b96028
 SHA512:
-  metadata.gz: 7fbdb1a988fcd3eb8984ff8cb78f852b13f804d0b0c9d123751e468911c93f0fd500ef78438b1f97ae272f3c9b05f4e36ec2be6834a4bf6439250bb9e1482cc5
-  data.tar.gz: a8bfcae6af2ffd8bc621c6b3b8f1d1baa0035acb92905104f28a7000472d42f493f7510fa331bd1aff3a6e76944bce4f6bca1483e7bc8e07b075a8fefeb7c763
+  metadata.gz: 0ad99565ef44a2dd563f5ffc913bea426d47f7e7745fe429062dbb6e7ed58c35b87936435800b1bac13ddc3a4819f52373b57d428a569860243422b846fcf771
+  data.tar.gz: 58df8c537d1285e48d262a99c161b8f59c94adf784a82927a732fd3a5995c8f209509dc40d0dcedda5652304f013dd734a21869203338f9c20596cadcaf4ffbc

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/scash.rb

@@ -48,6 +48,7 @@ class Scash
   end
 
   def define_global_variables(variables)
+    @stack.each{|hash|variables.keys.each{|key| hash.delete(key)}}
     global_variables.merge! convert(variables)
     build!
   end
@@ -64,8 +65,6 @@ class Scash
 
   def build_hash(stack_index = 0)
     @stack[stack_index..-1].each_with_index.inject(@klass.new) do |hash, (variables, index)|
-      last = stack_index + index == @stack.size-1
-      variables = variables.reject{|key, value| variables[key].nil? && !last && @stack.last.key?(key) }
       variables.merge hash
     end
   end

data/test/test_scash.rb

@@ -147,39 +147,7 @@ describe Scash do
       assert_equal 1337, scash[:result]
     end
 
-    it "overwrite a nil value with same name" do
-      # initial values can never be overwritten with a global-variable, except nil values
-      scash = Scash.new(:initial_a => 1337, :initial_b => nil)
-      scash.with({:a => 1, :b => nil}) do
-        assert_equal [1337, nil, 1, nil], scash.values
-        assert_equal 1337, scash[:initial_a]
-        assert_equal nil, scash[:initial_b]
-
-        scash.define_global_variables :a => "global a", :b => "global b", :c => nil
-        scash.define_global_variables :initial_a => "new a", :initial_b => "new b"
-
-        assert_equal({"a"=>1, "b"=>"global b", "c"=>nil, "initial_a"=>1337, "initial_b"=>"new b"}, scash.to_hash)
-
-        scash.with(:a => "a", :b => nil, :c => nil) do
-          assert_equal({"a" => "a", "b" => "global b", "c" => nil, "initial_a" => 1337, "initial_b" => "new b"}, scash.to_hash)
-          assert_equal "a", scash[:a]
-          assert_equal "global b", scash[:b]
-          assert_equal nil, scash[:c]
-        end
-
-        assert_equal 1, scash[:a]
-        assert_equal "global b", scash[:b]
-        assert_equal 1337, scash[:initial_a]
-        assert_equal "new b", scash[:initial_b]
-      end
-      assert_equal "global a", scash[:a]
-      assert_equal "global b", scash[:b]
-
-      assert_equal 1337, scash[:initial_a]
-      assert_equal "new b", scash[:initial_b]
-    end
-
-    it "overwrites a global variable with same name" do
+    it "overwrites earlier defined variables with same name" do
       scash = Scash.new
       scash.with({:a => 1}) do
         scash.define_global_variables :result => 1337
@@ -190,7 +158,7 @@ describe Scash do
           assert_equal 2, scash[:b]
           scash.define_global_variables :result => "foo"
           scash.define_global_variables :b => "bar"
-          assert_equal 2, scash[:b]
+          assert_equal "bar", scash[:b]
           assert_equal "foo", scash[:result]
         end
 

metadata

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