github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix for hash merging Mashes

Browse Source
This commit is contained in:
Bryan Helmkamp 2008-11-16 23:21:29 -05:00
parent 83f3ab468d
commit 1bdead1655
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/webrat/core/form.rb
View File

@ -110,7 +110,7 @@ module Webrat
def merge(all_params, new_param) def merge(all_params, new_param)
new_param.each do |key, value| new_param.each do |key, value|
case all_params[key] case all_params[key]
when *HASH when *hash_classes
merge_hash_values(all_params[key], value) merge_hash_values(all_params[key], value)
when Array when Array
all_params[key] += value all_params[key] += value
@ -124,7 +124,7 @@ module Webrat
a.keys.each do |k| a.keys.each do |k|
if b.has_key?(k) if b.has_key?(k)
case [a[k], b[k]].map{|value| value.class} case [a[k], b[k]].map{|value| value.class}
when *HASH.zip(HASH) when *hash_classes.zip(hash_classes)
a[k] = merge_hash_values(a[k], b[k]) a[k] = merge_hash_values(a[k], b[k])
b.delete(k) b.delete(k)
when [Array, Array] when [Array, Array]
@ -136,5 +136,12 @@ module Webrat
a.merge!(b) a.merge!(b)
end end
def hash_classes
klasses = [Hash]
klasses << HashWithIndifferentAccess if defined?(HashWithIndifferentAccess) # Rails
klasses << Mash if defined?(Mash) # Merb
klasses
end
end end
end end