casted_hash 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0f2fb8b553d3505325d01febe43401189b0a7d
-  data.tar.gz: cbcfe7fb86cbbe6bb2befa53c6a6ac10436ed8a3
+  metadata.gz: d7d1e26f467044a7d5b7d059f7553d841550b95f
+  data.tar.gz: f905c88e348f9a48a0cdd73539dcc5403604cd9e
 SHA512:
-  metadata.gz: 29df172201f7b0ffc5549ca5440e9c68953c67fdf433d29b2bc0a5163e8ab54e7e67fd7960d8b3981290a3398612e3f48619a718611b913a3f46b85cb8fb0833
-  data.tar.gz: 823e6e0ce48c462c8b4aa89c107f56a9d188729bca21e1c5ad12deab508c8e44529b9e619390beb2cda40e8b3dbc24059fe5e331bcdaa1201c20569ac64ad4cb
+  metadata.gz: 6143460aa9445965acd03318c3d4dfe65745b9804e09eecca3aae92b75be208f803ae9da4f2065a1973ed2c14e010d85ec1f99758c8581fa399fc3c611a457ae
+  data.tar.gz: 9e2ef962d99a8e1438bbde9c6bd8b59dfa05327a9a184fdbf514cb168f3a3b47541d6e80c71f8a416f7f1f9c8ebefe2777ffacdd0495be69949b066c6b9b2e81

data/casted_hash.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "mocha"
 end

data/lib/casted_hash.rb

@@ -1,5 +1,5 @@
 class CastedHash < Hash
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
@@ -33,14 +33,15 @@ class CastedHash < Hash
   end
 
   def [](key)
-    cast! key
+    cast! convert_key(key)
   end
 
   def fetch(key, *extras)
+    key = convert_key(key)
     value = cast!(key)
 
     if value.nil?
-      super(convert_key(key), *extras)
+      super(key, *extras)
     else
       value
     end
@@ -50,8 +51,9 @@ class CastedHash < Hash
   alias_method :regular_update, :update unless method_defined?(:regular_update)
 
   def []=(key, value)
+    key = convert_key(key)
     uncast! key
-    regular_writer(convert_key(key), value)
+    regular_writer(key, value)
   end
 
   alias_method :store, :[]=
@@ -63,20 +65,19 @@ class CastedHash < Hash
   def update(other_hash)
     return self if other_hash.empty?
 
-    if other_hash.is_a?(CastedHash)
-      super(other_hash).tap do
-        other_hash.keys.each do |key|
-          if other_hash.casted?(key)
-            casted!(key)
-          elsif casted?(key)
-            uncast!(key)
-          end
-        end
+    other_hash.each_pair do |key, value|
+      converted_key = convert_key(key)
+
+      regular_writer converted_key, value
+
+      if other_hash.is_a?(CastedHash) && other_hash.casted?(key)
+        casted!(key)
+      elsif casted?(key)
+        uncast!(converted_key)
       end
-    else
-      other_hash.each_pair { |key, value| self[key] = value }
-      self
     end
+
+    self
   end
 
   alias_method :merge!, :update
@@ -98,8 +99,9 @@ class CastedHash < Hash
   end
 
   def delete(key)
+    key = convert_key(key)
     uncast! key
-    super(convert_key(key))
+    super(key)
   end
 
   def values
@@ -118,11 +120,11 @@ class CastedHash < Hash
   end
 
   def casted?(key)
-    @casted_keys.include?(key.to_s)
+    @casted_keys.include?(convert_key(key))
   end
 
   def casting?(key)
-    @casting_keys.include?(key.to_s)
+    @casting_keys.include?(convert_key(key))
   end
 
   def to_hash
@@ -142,25 +144,24 @@ class CastedHash < Hash
   end
 
   def casted!(*keys)
-    keys.map(&:to_s).each do |key|
-      @casted_keys << key if key?(key)
+    keys.each do |key|
+      @casted_keys << convert_key(key) if key?(key)
     end
   end
 
   def casting!(*keys)
-    keys.map(&:to_s).each do |key|
-      @casting_keys << key if key?(key)
+    keys.each do |key|
+      @casting_keys << convert_key(key) if key?(key)
     end
   end
 
 protected
 
   def uncast!(*keys)
-    @casted_keys.delete *keys.map(&:to_s)
+    @casted_keys.delete *keys
   end
 
   def cast!(key)
-    key = convert_key(key)
     return unless key?(key)
     return regular_reader(key) if casted?(key)
     raise SystemStackError, "already casting #{key}" if casting?(key)
@@ -183,7 +184,7 @@ protected
 
     value
   ensure
-    @casting_keys.delete convert_key(key)
+    @casting_keys.delete key
   end
 
   def cast_all!

data/test/helper.rb

@@ -21,4 +21,5 @@ end
 require 'casted_hash'
 
 require 'minitest/autorun'
-require 'minitest/pride'
+require 'minitest/pride'
+require 'mocha/setup'

data/test/test_casted_hash.rb

@@ -99,8 +99,10 @@ describe CastedHash do
 
   it "deletes values" do
     hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+    assert_equal 12, hash[:b]
     hash.delete(:b)
     assert_equal({"a" => 11}, hash.casted_hash)
+    assert !hash.casted?(:b)
   end
 
   describe "merge" do
@@ -280,4 +282,13 @@ describe CastedHash do
     assert_equal 2, hash[:b]
     assert_equal 4, hash[:c]
   end
+
+  it "always uses the regular_writer method when merging" do
+    hash = CastedHash.new({}, lambda {|x| x + 1})
+    hash.expects(:regular_writer).twice
+    hash.merge!(:a => 1, :b => 2)
+
+    hash.expects(:regular_writer)
+    hash.merge!(CastedHash.new({:a => 1}, lambda {|x| x + 1}))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A casted hash
 email:
 - stephan@ka.ag