Permalink
Browse files

renaming skip_authorization to skip_authorization_check - closes #169

  • Loading branch information...
1 parent 92995d7 commit 787511a2085fd7489cb0385d95a130a57122afae @ryanb committed Nov 12, 2010
Showing with 10 additions and 6 deletions.
  1. +8 −4 lib/cancan/controller_additions.rb
  2. +2 −2 spec/cancan/controller_additions_spec.rb
@@ -176,28 +176,32 @@ def authorize_resource(*args)
#
# Any arguments are passed to the +after_filter+ it triggers.
#
- # See skip_authorization to bypass this check on specific controller actions.
+ # See skip_authorization_check to bypass this check on specific controller actions.
def check_authorization(*args)
self.after_filter(*args) do |controller|
unless controller.instance_variable_defined?(:@_authorized)
- raise AuthorizationNotPerformed, "This action failed the check_authorization because it does not authorize_resource. Add skip_authorization to bypass this check."
+ raise AuthorizationNotPerformed, "This action failed the check_authorization because it does not authorize_resource. Add skip_authorization_check to bypass this check."
end
end
end
# Call this in the class of a controller to skip the check_authorization behavior on the actions.
#
# class HomeController < ApplicationController
- # skip_authorization :only => :index
+ # skip_authorization_check :only => :index
# end
#
# Any arguments are passed to the +before_filter+ it triggers.
- def skip_authorization(*args)
+ def skip_authorization_check(*args)
self.before_filter(*args) do |controller|
controller.instance_variable_set(:@_authorized, true)
end
end
+ def skip_authorization(*args)
+ raise ImplementationRemoved, "The CanCan skip_authorization method has been renamed to skip_authorization_check. Please update your code."
+ end
+
def cancan_resource_class
if ancestors.map(&:to_s).include? "InheritedResources::Actions"
InheritedResource
@@ -54,9 +54,9 @@
@controller_class.load_resource :foo => :bar, :only => [:show, :index]
end
- it "skip_authorization should set up a before filter which sets @_authorized to true" do
+ it "skip_authorization_check should set up a before filter which sets @_authorized to true" do
mock(@controller_class).before_filter(:filter_options) { |options, block| block.call(@controller) }
- @controller_class.skip_authorization(:filter_options)
+ @controller_class.skip_authorization_check(:filter_options)
@controller.instance_variable_get(:@_authorized).should be_true
end

0 comments on commit 787511a

Please sign in to comment.