scash 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d252fda83f48f053eb75f9513f7e7153eeeeb1c
-  data.tar.gz: 66fe967c829bf8eecf540b5c002991b65ff1a1c2
+  metadata.gz: ba5430bd40c724b9b715ab5eaec27f26e13863fb
+  data.tar.gz: 5c37740a7bcffa842b8a4a10e03bbbe375079d27
 SHA512:
-  metadata.gz: ab08cb3cd24b8add4ec104953cfc4708a1e39acc2618c6c5d77d7c17dfe91133478a536e22c491fb2e15e474e6c8ac3b2fdbbe7784bdbaaab8ac2f83098500a2
-  data.tar.gz: 38851b5a215f84ccc3c3009099e7f379322da9132c4a5695a8375cc659077c903045bedbb9580f1504739c2576f68d77e6d3b2207933e529d5f3f6862c351b30
+  metadata.gz: bb73697989ffd56aad60c8dbbeee2295eb494ab76fc39901f51e11f25f887e03cf953ca9b3f55976511071fd8b9898843e686d4f513741d30282328ac81f26f4
+  data.tar.gz: 902810c7daa58981028fe98db2d554a70d23bae3f58e392b1d221e04e55d37c5c585bd2370b7ecde8a336091de8cd508c7ec27b0e403f91d1455e09fabe1a0fe

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/scash.rb

@@ -62,9 +62,10 @@ class Scash
     @stack.any?
   end
 
-  def build_hash(index = 0)
-    @stack[index..-1].inject(@klass.new) do |hash, variables|
-      variables = variables.reject{|key, value| value.nil? && @stack.last.key?(key) }
+  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| value.nil? && !last && @stack.last.key?(key) }
       variables.merge hash
     end
   end

data/test/test_scash.rb

@@ -155,13 +155,13 @@ describe Scash do
         assert_equal 1337, scash[:initial_a]
         assert_equal nil, scash[:initial_b]
 
-        scash.define_global_variables :a => "global a", :b => "global 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 [1, "global b", 1337, "new b"], scash.values
+        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", "global b", 1337, "new b", nil], scash.values # NOTE: only 1 nil value (b)
+          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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport