will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support multiple resources in :through option of load_resource, this makes polymorphic associations possible - closes #73

Browse Source
This commit is contained in:
Ryan Bates 2010-08-06 10:35:42 -07:00
parent 961b8c2477
commit 6998e8bdd1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cancan/controller_resource.rb
View File

@ -83,7 +83,7 @@ module CanCan
# The object to load this resource through. # The object to load this resource through.
def through_resource def through_resource
@options[:through] && @controller.instance_variable_get("@#{@options[:through]}") @options[:through] && [@options[:through]].flatten.map { |i| @controller.instance_variable_get("@#{i}") }.compact.first
end end
def name def name

10
spec/cancan/controller_resource_spec.rb
View File

@ -156,6 +156,16 @@ describe CanCan::ControllerResource do
@controller.instance_variable_get(:@ability).should == :some_ability @controller.instance_variable_get(:@ability).should == :some_ability
end end
it "should load through first matching if multiple are given" do
@params.merge!(:action => "show", :id => 123)
person = Object.new
@controller.instance_variable_set(:@person, person)
stub(person).abilities.stub!.find(123) { :some_ability }
resource = CanCan::ControllerResource.new(@controller, :through => [:thing, :person])
resource.load_resource
@controller.instance_variable_get(:@ability).should == :some_ability
end
it "should only authorize :read action on parent resource" do it "should only authorize :read action on parent resource" do
@params.merge!(:action => "new", :person_id => 123) @params.merge!(:action => "new", :person_id => 123)
stub(Person).find(123) { :some_person } stub(Person).find(123) { :some_person }