Skip to content
This repository was archived by the owner on Aug 17, 2017. It is now read-only.

Using ActiveSupport#on_load instead of send :include to boot. #144

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions lib/action_controller/parameters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def initialize(params)
class Parameters < ActiveSupport::HashWithIndifferentAccess
attr_accessor :permitted
alias :permitted? :permitted

cattr_accessor :action_on_unpermitted_parameters, :instance_accessor => false

# Never raise an UnpermittedParameters exception because of these params
Expand Down Expand Up @@ -211,23 +211,23 @@ def each_element(value)
end
end

def unpermitted_parameters!(params)
def unpermitted_parameters!(params)
return unless self.class.action_on_unpermitted_parameters

unpermitted_keys = unpermitted_keys(params)

if unpermitted_keys.any?
case self.class.action_on_unpermitted_parameters
if unpermitted_keys.any?
case self.class.action_on_unpermitted_parameters
when :log
name = "unpermitted_parameters.action_controller"
ActiveSupport::Notifications.instrument(name, :keys => unpermitted_keys)
when :raise
raise ActionController::UnpermittedParameters.new(unpermitted_keys)
end
end
end
def unpermitted_keys(params)
when :raise
raise ActionController::UnpermittedParameters.new(unpermitted_keys)
end
end
end

def unpermitted_keys(params)
self.keys - params.keys - NEVER_UNPERMITTED_PARAMS
end
end
Expand All @@ -251,4 +251,4 @@ def params=(val)
end
end

ActionController::Base.send :include, ActionController::StrongParameters
ActiveSupport.on_load(:action_controller) { include ActionController::StrongParameters }