scash 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b2f94b76de1c9fbd0867043e4d130ee069368e
-  data.tar.gz: b7cdbf6ad0bbb527cc4a3be066bd48ac79a5e284
+  metadata.gz: eab17874bb39585b1908492ff3167973886daa1a
+  data.tar.gz: 8d79365ffce1fb0712e2dbdb0d196e87f165f558
 SHA512:
-  metadata.gz: eb1f0bfb1cc25491e14415880a779b4d1bd57408b67d110c375fca3564a6621129fab4b5fd26543d73dc1cca578c47a9f48fa4eb519c3c203ef6f7342a0536d1
-  data.tar.gz: 8cca5809b87ea8571e20a1c830b3bdafe6442b672fb7eeec1d515aebad3ddb9b3350562b86d1fe21dbdcec2b9bc4847ae4a8b318cfdc802e046591a7715fe8f4
+  metadata.gz: 4b648c6503c28de69b49dfdd2876d0954481ad61aceceeb66995c453abfb669182de5d68671c99158711a6c5854a95de8b68344ac2c9a7a13283568947aab60f
+  data.tar.gz: a20b50700b57ef2d86ea35ac172685de49210a858151a38fb83861949a1ee4a13f2bd1814e4cac86c1ddcd62c36712afbfaa6ad02365ff782fee181ae3806983

data/lib/scash.rb

@@ -10,27 +10,34 @@ class Scash
 
   attr_reader :stack
 
-  def initialize(variables = {})
-    @stack = [variables.with_indifferent_access]
+  def initialize(variables = {}, klass = HashWithIndifferentAccess)
+    @klass = klass
+    @stack = [convert(variables)]
+    @hashes = [build_hash]
+    @inverse_hashes = [build_inverse_hash]
+    @global_variables = {}
   end
 
   def to_hash
-    @stack.inject(HashWithIndifferentAccess.new) do |hash, variables|
-      variables.merge hash
-    end
+    @hashes.first.merge(@global_variables)
   end
 
   def to_inverse_hash
-    @stack.inject(HashWithIndifferentAccess.new) do |hash, variables|
-      hash.merge variables
-    end
+    @inverse_hashes.first.merge(@global_variables)
   end
 
   def scope(variables)
-    @stack.unshift variables.with_indifferent_access
+    @stack.unshift convert(variables)
+    added = true
+    @hashes.unshift build_hash
+    @inverse_hashes.unshift build_inverse_hash
     yield
   ensure
     @stack.shift
+    if added
+      @hashes.shift
+      @inverse_hashes.shift
+    end
   end
   alias :with :scope
 
@@ -47,16 +54,30 @@ class Scash
   end
 
   def define_global_variables(variables)
-    variables.keys.each do |key|
-      delete_key(key)
-    end
-
-    @stack.push variables.with_indifferent_access
+    @global_variables.merge! convert(variables)
   end
 
   private
 
+  def build_hash(index = 0)
+    @stack[index..-1].inject(@klass.new) do |hash, variables|
+      variables.merge hash
+    end
+  end
+
+  def build_inverse_hash(index = 0)
+    @stack[index..-1].inject(@klass.new) do |hash, variables|
+      hash.merge variables
+    end
+  end
+
   def delete_key(key)
     @stack.each{|hash|hash.delete(key)}
   end
+
+  def convert(variables)
+    raise(ArgumentError, "Variables should respond to `keys`") unless variables.respond_to?("keys")
+    @klass.new(variables)
+  end
+
 end

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/test/test_scash.rb

@@ -53,7 +53,7 @@ class TestScash < Minitest::Test
 
     it "should keep scope instact when an error occurs" do
       scash = Scash.new
-      assert_raises(NoMethodError) do
+      assert_raises(ArgumentError) do
         scash.with(["a" => 1]) do
         end
       end
@@ -74,6 +74,27 @@ class TestScash < Minitest::Test
       assert_equal 3, scash[:c]
     end
 
+    it "should typecast correctly" do
+      scash = Scash.new({:a => 1})
+      assert_equal({"a" => 1}, scash.to_hash)
+      assert_equal HashWithIndifferentAccess, scash.to_hash.class
+
+      scash = Scash.new({:a => 1})
+      assert_equal({"a" => 1}, scash.to_inverse_hash)
+      assert_equal HashWithIndifferentAccess, scash.to_inverse_hash.class
+
+      class SubHash < HashWithIndifferentAccess
+      end
+
+      scash = Scash.new({:a => 1}, SubHash)
+      assert_equal({"a" => 1}, scash.to_hash)
+      assert_equal SubHash, scash.to_hash.class
+
+      scash = Scash.new({:a => 1}, SubHash)
+      assert_equal({"a" => 1}, scash.to_inverse_hash)
+      assert_equal SubHash, scash.to_inverse_hash.class
+    end
+
     it "should reuse instances" do
       class Foo
         attr_accessor :bar
@@ -136,12 +157,18 @@ class TestScash < Minitest::Test
 
         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 "bar", 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
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scash
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport