Merge pull request #604 from kachick/hash-update

Hash#merge!, Hash#update
topazproject · Apr 11, 2013 · 47a3a2b · 47a3a2b
2 parents c684219 + ef92287
commit 47a3a2b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/lib-topaz/hash.rb b/lib-topaz/hash.rb
@@ -50,6 +50,7 @@ def ==(other)
   end
 
   def merge!(other, &block)
+    raise RuntimeError.new("can't modify frozen #{self.class}") if frozen?
     other = other.to_hash unless other.kind_of? Hash
     if block
       other.each do |key, val|
@@ -66,6 +67,7 @@ def merge!(other, &block)
     end
     self
   end
+  alias update merge!
 
   def merge(other, &block)
     dup.merge! other, &block

diff --git a/spec/tags/core/hash/merge_tags.txt b/spec/tags/core/hash/merge_tags.txt
@@ -1,3 +1 @@
 fails:Hash#merge returns subclass instance for subclasses
-fails:Hash#merge! checks frozen status before coercing an object with #to_hash
-fails:Hash#merge! raises a RuntimeError on a frozen instance that would not be modified
diff --git a/spec/tags/core/hash/update_tags.txt b/spec/tags/core/hash/update_tags.txt