casted_hash 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1417da9dece7f7c45f0ada321d3a8323cd9d870
-  data.tar.gz: 58bf74f4889f564454b40aa08cc1904d611b4478
+  metadata.gz: 70eb29b065f3d4a69aabf9338cb8805c1873444e
+  data.tar.gz: f01d58fd7cbba6eaad7ff0ed9c472091e13386e8
 SHA512:
-  metadata.gz: 78a0cd7f8705a8b389e1ebd5e051444e34c300fceba7bbfe4b751537f68547b27b6cbbdc06c17c0f28ce7480a681d2ea9c7e2e8cae8daa56ac5b221ce70f4b30
-  data.tar.gz: 05cd9e5be0896c45a755aecb64bdb5e70778e40fcda9b191dfc314bd756c4b40a519561cb21797e6c9c1e8046e0e1ffb4d00457c8f36e4b0051ecce62f045197
+  metadata.gz: e74b73ae86ecac1b17819be1ddb49976866bb8c01ccf1f3d9047516299e1b7124e4ee2d1bc4728f8b6507f791861badac84dd4edfea66ce3385368bba72cb380
+  data.tar.gz: 25b22c49c76ca944481fc27d90dae823a70e14f9d6ca9be606728b3b286c1ce6310b585df4dcc0cd9f0cfa56ff35d374cc03b2bad777b21898ed807c7b55c336

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.1.5
+  - 2.2.2
+before_install: gem install bundler -v 1.10.3
+services:
+  - redis-server

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/stephankaag/cached_hash.png?branch=master)](https://travis-ci.org/stephankaag/cached_hash)
+[![Build Status](https://travis-ci.org/bettyblocks/casted_hash.svg)](https://travis-ci.org/bettyblocks/casted_hash)
 
 # CastedHash
 

data/lib/casted_hash.rb

@@ -1,5 +1,5 @@
 class CastedHash < Hash
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
@@ -150,22 +150,26 @@ protected
     @casted_keys.delete *keys.map(&:to_s)
   end
 
-  def cast!(key)
+  def cast!(key, do_raise = true)
     key = convert_key(key)
     return unless key?(key)
-    return regular_reader(key) if casted?(key)
-    raise SystemStackError, "already casting #{key}" if casting?(key)
 
-    casting! key
+    value = regular_reader(key)
+    return value if casted?(key)
 
-    value = if @cast_proc.arity == 1
-      @cast_proc.call regular_reader(key)
-    elsif @cast_proc.arity == 2
-      @cast_proc.call self, regular_reader(key)
-    elsif @cast_proc.arity == 3
-      @cast_proc.call self, key, regular_reader(key)
+    if casting?(key)
+      raise SystemStackError, "already casting #{key}" if do_raise
     else
-      @cast_proc.call
+      casting! key
+      value = if @cast_proc.arity == 1
+        @cast_proc.call value
+      elsif @cast_proc.arity == 2
+        @cast_proc.call self, value
+      elsif @cast_proc.arity == 3
+        @cast_proc.call self, key, value
+      else
+        @cast_proc.call
+      end
     end
 
     value = regular_writer(key, value)
@@ -178,7 +182,7 @@ protected
   end
 
   def cast_all!
-    keys.each{|key| cast! key}
+    keys.each{|key| cast!(key, false)}
   end
 
   def convert_key(key)

data/test/test_casted_hash.rb

@@ -15,6 +15,11 @@ describe CastedHash do
     assert_equal "3", hash[:bar]
   end
 
+  it "can use casted_hash in cast method" do
+    @hash = CastedHash.new({:a => 1}, lambda {|x| @hash.casted_hash; 2 })
+    assert_equal 2, @hash[:a]
+  end
+
   it "does not loop when refering to itself" do
     @hash = CastedHash.new({:a => 1}, lambda {|x| @hash[:a] + 1 })
     error = assert_raises(SystemStackError) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A casted hash