scash 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18dc252c49e5b61bf36756f3094ea165a24143a
-  data.tar.gz: 92cb2148378adfb9a5eb3346c474f8c74feb0f4d
+  metadata.gz: 7d252fda83f48f053eb75f9513f7e7153eeeeb1c
+  data.tar.gz: 66fe967c829bf8eecf540b5c002991b65ff1a1c2
 SHA512:
-  metadata.gz: c39f698028d8efc8151e5d885c09a007d1680bcb9bdd40b8f604ec427e9b713643a2568d79727dd86be8fcd20c1f4bfbe2b97c004ca76a44f4e9dca56c47c071
-  data.tar.gz: 61f207aa4f27ea24a197211ed38ec26759338ba0604cd2f70e582ee01db129017a55b5b42081fe9adf22f5ce4b2aefb16bee808cbd065a23529c4bc2eb056833
+  metadata.gz: ab08cb3cd24b8add4ec104953cfc4708a1e39acc2618c6c5d77d7c17dfe91133478a536e22c491fb2e15e474e6c8ac3b2fdbbe7784bdbaaab8ac2f83098500a2
+  data.tar.gz: 38851b5a215f84ccc3c3009099e7f379322da9132c4a5695a8375cc659077c903045bedbb9580f1504739c2576f68d77e6d3b2207933e529d5f3f6862c351b30

data/lib/scash.rb

@@ -12,7 +12,7 @@ class Scash
 
   def initialize(variables = nil, klass = HashWithIndifferentAccess)
     @klass = klass
-    @stack = [global_variables, convert(variables)].compact
+    @stack = [convert(variables), global_variables].compact
     build!
   end
 
@@ -64,6 +64,7 @@ class Scash
 
   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) }
       variables.merge hash
     end
   end

data/lib/scash/version.rb

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

data/test/helper.rb

@@ -18,7 +18,7 @@ begin
 rescue LoadError
 end
 
-require 'scash'
+require_relative "../lib/scash"
 
 require 'minitest/autorun'
 require 'minitest/pride'

data/test/test_scash.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 describe Scash do
   it "is instantiable" do
@@ -122,52 +122,84 @@ describe Scash do
     assert_equal "bar1", foo1.bar
     assert_equal "bar2", foo2.bar
   end
-end
 
-describe "global variables" do
-  it "is able to define a global variable" do
-    scash = Scash.new
-    scash.with({:a => 1}) do
-      scash.define_global_variables :result => 1337
-      assert_equal 1, scash[:a]
-      assert_equal 1337, scash[:result]
+  describe "global variables" do
+    it "is able to define a global variable" do
+      scash = Scash.new
+      scash.with({:a => 1}) do
+        scash.define_global_variables :result => 1337
+        assert_equal 1, scash[:a]
+        assert_equal 1337, scash[:result]
+
+        scash.with({:b => 2}) do
+          assert_equal 1, scash[:a]
+          assert_equal 2, scash[:b]
+          assert_equal 1337, scash[:result]
+        end
 
-      scash.with({:b => 2}) do
         assert_equal 1, scash[:a]
-        assert_equal 2, scash[:b]
+        assert_nil scash[:b]
         assert_equal 1337, scash[:result]
       end
 
-      assert_equal 1, scash[:a]
+      assert_nil scash[:a]
       assert_nil scash[:b]
       assert_equal 1337, scash[:result]
     end
 
-    assert_nil scash[:a]
-    assert_nil scash[:b]
-    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]
 
-  it "overwrites a global variable with same name" do
-    scash = Scash.new
-    scash.with({:a => 1}) do
-      scash.define_global_variables :result => 1337
-      assert_equal 1337, scash[:result]
+        scash.define_global_variables :a => "global a", :b => "global b"
+        scash.define_global_variables :initial_a => "new a", :initial_b => "new b"
 
-      scash.with({:b => 2}) do
+        assert_equal [1, "global b", 1337, "new b"], scash.values
+
+        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", 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
+      scash = Scash.new
+      scash.with({:a => 1}) do
+        scash.define_global_variables :result => 1337
         assert_equal 1337, scash[:result]
-        assert_equal 2, scash[:b]
-        scash.define_global_variables :result => "foo"
-        scash.define_global_variables :b => "bar"
-        assert_equal 2, scash[:b]
+
+        scash.with({:b => 2}) do
+          assert_equal 1337, scash[:result]
+          assert_equal 2, scash[:b]
+          scash.define_global_variables :result => "foo"
+          scash.define_global_variables :b => "bar"
+          assert_equal 2, scash[:b]
+          assert_equal "foo", scash[:result]
+        end
+
         assert_equal "foo", scash[:result]
       end
 
       assert_equal "foo", scash[:result]
+      assert_equal "bar", scash[:b]
     end
-
-    assert_equal "foo", scash[:result]
-    assert_equal "bar", scash[:b]
   end
 
   it "responds to merge" do
@@ -176,4 +208,4 @@ describe "global variables" 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.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport