Permalink
Browse files

adding :instance_name option to load/authorize_resource - closes #44

  • Loading branch information...
1 parent 47f0aa5 commit a157b65fbf4122bea3433d132f89090a9ef7e31c @ryanb committed Aug 6, 2010
Showing with 15 additions and 2 deletions.
  1. +6 −2 lib/cancan/controller_resource.rb
  2. +9 −0 spec/cancan/controller_resource_spec.rb
@@ -25,7 +25,7 @@ def load_and_authorize_resource
def load_resource
if !resource_instance && (parent? || member_action?)
- @controller.instance_variable_set("@#{name}", load_resource_instance)
+ @controller.instance_variable_set("@#{instance_name}", load_resource_instance)
end
end
@@ -72,7 +72,7 @@ def resource_class
end
def resource_instance
- @controller.instance_variable_get("@#{name}")
+ @controller.instance_variable_get("@#{instance_name}")
end
# The object that methods (such as "find", "new" or "build") are called on.
@@ -94,6 +94,10 @@ def name_from_controller
@params[:controller].sub("Controller", "").underscore.split('/').last.singularize
end
+ def instance_name
+ @options[:instance_name] || name
+ end
+
def collection_actions
[:index] + [@options[:collection]].flatten
end
@@ -179,6 +179,15 @@
lambda { resource.authorize_resource }.should raise_error(CanCan::AccessDenied)
end
+ it "should load and authorize using custom instance name" do
+ @params.merge!(:action => "show", :id => 123)
+ stub(Ability).find(123) { :some_ability }
+ stub(@controller).authorize!(:show, :some_ability) { raise CanCan::AccessDenied }
+ resource = CanCan::ControllerResource.new(@controller, :instance_name => :custom_ability)
+ lambda { resource.load_and_authorize_resource }.should raise_error(CanCan::AccessDenied)
+ @controller.instance_variable_get(:@custom_ability).should == :some_ability
+ end
+
it "should raise ImplementationRemoved when adding :name option" do
lambda {
CanCan::ControllerResource.new(@controller, :name => :foo)

0 comments on commit a157b65

Please sign in to comment.