support multiple resources in :through option of load_resource, this makes polymorphic associations possible - closes #73
This commit is contained in:
parent
961b8c2477
commit
6998e8bdd1
@ -83,7 +83,7 @@ module CanCan
|
||||
|
||||
# The object to load this resource through.
|
||||
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
|
||||
|
||||
def name
|
||||
|
@ -156,6 +156,16 @@ describe CanCan::ControllerResource do
|
||||
@controller.instance_variable_get(:@ability).should == :some_ability
|
||||
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
|
||||
@params.merge!(:action => "new", :person_id => 123)
|
||||
stub(Person).find(123) { :some_person }
|
||||
|
Loading…
x
Reference in New Issue
Block a user