Commit e31bc384 by silviu-simeria Committed by ifool

Managed Rails 5 ActionController::Parameters as Hash

Also fixes failing specs on master for rails 5
parent 563b1d33
...@@ -26,7 +26,7 @@ module RailsParam ...@@ -26,7 +26,7 @@ module RailsParam
if block_given? if block_given?
if type == Array if type == Array
params[name].each_with_index do |element, i| params[name].each_with_index do |element, i|
if element.is_a?(Hash) if element.is_a?(Hash) || element.is_a?(ActionController::Parameters)
recurse element, &block recurse element, &block
else else
params[name][i] = recurse({ i => element }, i, &block) # supply index as key unless value is hash params[name][i] = recurse({ i => element }, i, &block) # supply index as key unless value is hash
...@@ -80,6 +80,7 @@ module RailsParam ...@@ -80,6 +80,7 @@ module RailsParam
begin begin
return nil if param.nil? return nil if param.nil?
return param if (param.is_a?(type) rescue false) return param if (param.is_a?(type) rescue false)
return param if (param.is_a?(ActionController::Parameters) && type == Hash rescue false)
return Integer(param) if type == Integer return Integer(param) if type == Integer
return Float(param) if type == Float return Float(param) if type == Float
return String(param) if type == String return String(param) if type == String
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment