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

Fixes Nested Resource Loading

Browse Source
This commit is contained in:
Mark Sim 2011-10-05 11:45:24 -05:00 committed by Anuj Dutta
parent 7bf683d8f4
commit d5baed6281
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cancan/controller_resource.rb
View File

@ -215,8 +215,12 @@ module CanCan
end end
end end
def namespace
@params[:controller].split("::")[0..-2]
end
def namespaced_name def namespaced_name
@name || @params[:controller].sub("Controller", "").singularize.camelize.constantize [namespace, name.camelize].join('::').singularize.camelize.constantize
rescue NameError rescue NameError
name name
end end

8
spec/cancan/controller_resource_spec.rb
View File

@ -215,6 +215,14 @@ describe CanCan::ControllerResource do
resource.should_not be_parent resource.should_not be_parent
end end
it "should have the specified resource_class if 'name' is passed to load_resource" do
class Section
end
resource = CanCan::ControllerResource.new(@controller, :section)
resource.send(:resource_class).should == Section
end
it "should load parent resource through proper id parameter" do it "should load parent resource through proper id parameter" do
project = Project.create! project = Project.create!
@params.merge!(:controller => "categories", :action => "index", :project_id => project.id) @params.merge!(:controller => "categories", :action => "index", :project_id => project.id)