lib/scoped_from/query.rb in scoped_from-1.0.0 vs lib/scoped_from/query.rb in scoped_from-1.0.1

- old
+ new

@@ -72,10 +72,10 @@ order.present? ? { order[:column] => order[:direction].downcase.to_sym } : {} end def params=(params) params = params.params if params.is_a?(self.class) - params = CGI.parse(params.to_s) unless params.is_a?(Hash) + params = CGI.parse(params.to_s) unless params.is_a?(Hash) || defined?(ActionController::Parameters) && params.is_a?(ActionController::Parameters) @params = ActiveSupport::HashWithIndifferentAccess.new params.each do |name, value| values = [value].flatten next if values.empty? if name.to_s == 'order'