scash 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bffa41de0ca678f84bac31ff66ebb2f48530aa0
-  data.tar.gz: 0efbb1eb55d831f2a7c0b3cc360c4c5829b96028
+  metadata.gz: 1544314116a37cfa4425e4e03d8b5ef88d8ca5a9
+  data.tar.gz: 10457d9d63dce1ebd2fdd3fe924ee76c5bdcdade
 SHA512:
-  metadata.gz: 0ad99565ef44a2dd563f5ffc913bea426d47f7e7745fe429062dbb6e7ed58c35b87936435800b1bac13ddc3a4819f52373b57d428a569860243422b846fcf771
-  data.tar.gz: 58df8c537d1285e48d262a99c161b8f59c94adf784a82927a732fd3a5995c8f209509dc40d0dcedda5652304f013dd734a21869203338f9c20596cadcaf4ffbc
+  metadata.gz: 7089aad512341a09766a2874c5f9a800a466b634e326eb4c369bb35bcacfd68c963882c5916aeb394664d2d69d236312c7c410ec9b0be5461dca5b9e86188161
+  data.tar.gz: 22b5976ab4f5356bc133303b6a26ff45362dc2bcade5f17f7e361a1d637b9b2c6e32e755ecf7af849f1ac161e86242d90c540d3b150ecd4ee0724c5ee0530a8e

data/lib/scash.rb

@@ -10,36 +10,41 @@ class Scash
 
   attr_reader :stack
 
-  def initialize(variables = nil, klass = HashWithIndifferentAccess)
+  def initialize(variables = {}, klass = HashWithIndifferentAccess)
     @klass = klass
-    @stack = [convert(variables), global_variables].compact
-    build!
+    @hash = convert(variables)
+    @inverse_hash = convert(variables)
+    @global_variables = {}
   end
 
   def to_hash
-    @hashes.first
+    @hash
   end
 
   def to_inverse_hash
-    @inverse_hashes.first
+    @inverse_hash
   end
 
   def scope(variables)
-    @stack.unshift convert(variables)
-    added = true
-    build!
+    previous_hash = @hash.select{|key|variables.key?(key.to_s) || variables.key?(key.to_sym)}
+    previous_inverse_hash = @inverse_hash.select{|key|variables.key?(key.to_s) || variables.key?(key.to_sym)}
+    @hash.merge! variables
+    @inverse_hash.merge!(variables.reject{|key| @inverse_hash.key?(key)})
     yield
   ensure
-    @stack.shift if added
-    build!
+    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)
   end
   alias :with :scope
 
   def [](key, inverse = false)
     if inverse
-      to_inverse_hash[key]
+      @inverse_hash[key]
     else
-      to_hash[key]
+      @hash[key]
     end
   end
 
@@ -48,9 +53,8 @@ class Scash
   end
 
   def define_global_variables(variables)
-    @stack.each{|hash|variables.keys.each{|key| hash.delete(key)}}
-    global_variables.merge! convert(variables)
-    build!
+    @hash.merge! variables
+    @global_variables.merge! convert(variables)
   end
 
   private
@@ -59,41 +63,7 @@ class Scash
     @global_variables ||= @klass.new
   end
 
-  def any?
-    @stack.any?
-  end
-
-  def build_hash(stack_index = 0)
-    @stack[stack_index..-1].each_with_index.inject(@klass.new) do |hash, (variables, index)|
-      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)
-    return if variables.nil?
-
-    raise(ArgumentError, "Variables should respond to `keys`") unless variables.respond_to?("keys")
     variables.is_a?(@klass) ? variables : @klass.new(variables)
   end
-
-  def build!
-    @hashes = stack.size.times.map do |index|
-      build_hash(index)
-    end
-
-    @inverse_hashes = stack.size.times.map do |index|
-      build_inverse_hash(index)
-    end
-  end
-
 end

data/lib/scash/version.rb

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

data/test/test_scash.rb

@@ -6,20 +6,20 @@ describe Scash do
   end
 
   it "is scopable" do
-    scash = Scash.new
+    scash = Scash.new(:i => true)
 
-    assert_equal %w(), scash.keys
+    assert_equal %w(i), scash.keys
     scash.with({:a => 1}) do
       assert_equal 1, scash[:a]
       assert_equal 1, scash[:a, true]
       assert_equal 1, scash['a', true]
-      assert_equal %w(a), scash.keys
+      assert_equal %w(a i), scash.keys.sort
 
       scash.with({"a" => 2}) do
         assert_equal 2, scash[:a]
         assert_equal 1, scash[:a, true]
         assert_equal 1, scash['a', true]
-        assert_equal %w(a), scash.keys
+        assert_equal %w(a i), scash.keys.sort
 
         scash.with({"b" => 3}) do
           assert_equal 3, scash[:b]
@@ -32,11 +32,14 @@ describe Scash do
             assert_equal 3, scash[:b, true]
           end
         end
+
+        assert_nil scash[:b]
+        assert_nil scash[:b, true]
       end
 
       scash.with({"b" => 3}) do
         assert_equal 1, scash[:a]
-        assert_equal %w(a b), scash.keys
+        assert_equal %w(a b i), scash.keys.sort
         assert_equal 3, scash["b"]
         assert_equal 1, scash[:a, true]
         assert_equal 1, scash['a', true]
@@ -45,14 +48,22 @@ describe Scash do
       end
 
       assert_equal 1, scash[:a]
-      assert_equal %w(a), scash.keys
+      assert_equal %w(a i), scash.keys.sort
+    end
+    assert_equal %w(i), scash.keys
+
+    scash.with("a" => nil) do
+      assert_equal %w(i a), scash.keys
+      scash.with(:a => 1) do
+        assert_equal %w(i a), scash.keys
+      end
+      assert_equal %w(i a), scash.keys
     end
-    assert_equal %w(), scash.keys
   end
 
   it "keeps scope instact when an error occurs" do
     scash = Scash.new
-    assert_raises(ArgumentError) do
+    assert_raises(NoMethodError) do
       scash.with(["a" => 1]) do
       end
     end
@@ -162,6 +173,7 @@ describe Scash do
           assert_equal "foo", scash[:result]
         end
 
+        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.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephan Kaag