summaryrefslogtreecommitdiff
path: root/lib/hashie/dash.rb
diff options
context:
space:
mode:
authorSpencer Rogers <spencer1248@gmail.com>2013-11-30 12:02:59 -0700
committerSpencer Rogers <spencer1248@gmail.com>2013-11-30 12:02:59 -0700
commit05e3cba9241dc82df0c22f1cd508790c2500125c (patch)
tree788eefe813386b7d4e882bbec07643b91fb45bbb /lib/hashie/dash.rb
parent3321005d0bd77e0811a2cea6dbbd302d8e86851f (diff)
downloadhashie-05e3cba9241dc82df0c22f1cd508790c2500125c.tar.gz
Fix Dash#merge
Diffstat (limited to 'lib/hashie/dash.rb')
-rw-r--r--lib/hashie/dash.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/hashie/dash.rb b/lib/hashie/dash.rb
index a1669a5..42056e7 100644
--- a/lib/hashie/dash.rb
+++ b/lib/hashie/dash.rb
@@ -127,6 +127,14 @@ module Hashie
super(property.to_s, value)
end
+ def merge(other_hash)
+ new_dash = self.dup
+ other_hash.each do |k,v|
+ new_dash[k] = block_given? ? yield(k, self[k], v) : v
+ end
+ new_dash
+ end
+
def replace(other_hash)
other_hash = self.class.defaults.merge(other_hash)
(keys - other_hash.keys).each { |key| delete(key) }