Skip to content

Commit

Permalink
rearrange logic to use positive branches
Browse files Browse the repository at this point in the history
only hashes are converted to parameter objects, so lets add a branch for
them.  This also removes a is_a? test for Parameters so we can be
abstracted from the class.
  • Loading branch information
tenderlove committed Jul 21, 2015
1 parent d333dd5 commit c75153d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions actionpack/lib/action_controller/metal/strong_parameters.rb
Expand Up @@ -562,14 +562,16 @@ def convert_hashes_to_parameters(key, value, assign_if_converted=true)
end

def convert_value_to_parameters(value)
if value.is_a?(Array) && !converted_arrays.member?(value)
case value
when Array
return value if converted_arrays.member?(value)
converted = value.map { |_| convert_value_to_parameters(_) }
converted_arrays << converted
converted
elsif value.is_a?(Parameters) || !value.is_a?(Hash)
value
else
when Hash
self.class.new(value)
else
value
end
end

Expand Down

0 comments on commit c75153d

Please sign in to comment.