scash 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435c9ec1908e446eadcabfbd799e211f4b794831
-  data.tar.gz: 6468a6f6506e6a9788a62e589e2f6c636ab3e603
+  metadata.gz: 070a314766d03d1326f0ad6306df78ff51f4dc24
+  data.tar.gz: fb711994359bbc24bbe18b8f58179ea7e214f121
 SHA512:
-  metadata.gz: 887e1b2094f5b91242fe2a2c17b63de4160db7ec3b76d57c4b66b818e02a2aea356c10cbf674410d0314fef95f9cac9ecb5248c3deb0833bb1ea495281025890
-  data.tar.gz: dcb3e970ee5abd68ade49a25a7b2b13c55bfaea88bebb5482c07191fa2894f317675ccee7a50fb791107adb236455d1b062affccec136202a0ef5e7ef5bf4bc0
+  metadata.gz: 4f8ec2f9ebccaeb047f2ff69bb582ba3ab53a3ad15201e3326f083e3e6ef5804ee6f42dd262fa9b3b4fe9ea722649818d9f83a4edfd1bb333489d6b95eac612a
+  data.tar.gz: 01e2cf1c0cc210269f1ba2e7352afcc46f405340e6f951aff126070b775a87d3f4fbcf6a553eee1192ca5356f7b338c4b7218cda4a9fc1a8769f93c4f7cb8b95

data/lib/scash.rb

@@ -1,5 +1,6 @@
 require "active_support/hash_with_indifferent_access"
 require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/hash/slice"
 require "active_support/core_ext/module/delegation"
 require "scash/version"
 
@@ -25,8 +26,8 @@ class Scash
   end
 
   def scope(variables)
-    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)}
+    previous_hash = @hash.slice *variables.keys.select{|key| @hash.key?(key)}
+    previous_inverse_hash = @inverse_hash.slice *variables.keys.select{|key| @inverse_hash.key?(key)}
     @hash.merge! variables
     @inverse_hash.merge!(variables.reject{|key| @inverse_hash.key?(key)})
     yield

data/lib/scash/version.rb

@@ -1,3 +1,3 @@
 class Scash
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/test/test_scash.rb

@@ -206,4 +206,33 @@ describe Scash do
       assert_equal({:a => 1, :b => 2}.with_indifferent_access, scash.merge(:b => 2))
     end
   end
+
+  it "respects key conversion" do
+    ihash = HashWithIndifferentAccess.new(:a => 1)
+    def ihash.convert_key(key)
+      key.to_s.gsub(/^secret_/, "")
+    end
+
+    scash = Scash.new ihash
+    def scash.[](key)
+      @hash.fetch(key)
+    end
+
+    assert_equal 1, scash["a"]
+    assert_equal 1, scash[:a]
+    assert_equal 1, scash["secret_a"]
+    assert_equal 1, scash[:secret_a]
+
+    scash.with({:secret_a => 2}) do
+      assert_equal 2, scash["a"]
+      assert_equal 2, scash[:a]
+      assert_equal 2, scash["secret_a"]
+      assert_equal 2, scash[:secret_a]
+    end
+
+    assert_equal 1, scash["a"]
+    assert_equal 1, scash[:a]
+    assert_equal 1, scash["secret_a"]
+    assert_equal 1, scash[:secret_a]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scash
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A scoped hash