Browse files

Merge pull request #670 from andhapp/fix-issue-664

Namespaced Controllers not building new resource from params(regression 1.6.8)
  • Loading branch information...
2 parents cad4db2 + 60bc9e9 commit 2db73e60c674b18621d86b51d0effd012aaf3f91 @ryanb committed Jul 2, 2012
Showing with 21 additions and 4 deletions.
  1. +14 −3 lib/cancan/controller_resource.rb
  2. +7 −1 spec/cancan/controller_resource_spec.rb
View
17 lib/cancan/controller_resource.rb
@@ -213,10 +213,15 @@ def name
def resource_params
if @options[:class]
- @params[@options[:class].to_s.underscore.gsub('/', '_')]
- else
- @params[namespaced_name.to_s.underscore.gsub("/", "_")]
+ params_key = extract_key(@options[:class])
+ return @params[params_key] if @params[params_key]
end
+
+ resource_params_by_namespaced_name
+ end
+
+ def resource_params_by_namespaced_name
+ @params[extract_key(namespaced_name)]
end
def namespace
@@ -244,5 +249,11 @@ def collection_actions
def new_actions
[:new, :create] + [@options[:new]].flatten
end
+
+ private
+
+ def extract_key(value)
+ value.to_s.underscore.gsub('/', '_')
+ end
end
end
View
8 spec/cancan/controller_resource_spec.rb
@@ -75,13 +75,19 @@ class Project < ::Project; end
end
it "should build a new resource for namespaced model with hash if params[:id] is not specified" do
- project = Sub::Project.create!
@params.merge!(:action => "create", 'sub_project' => {:name => "foobar"})
resource = CanCan::ControllerResource.new(@controller, :class => ::Sub::Project)
resource.load_resource
@controller.instance_variable_get(:@project).name.should == "foobar"
end
+ it "should build a new resource for namespaced controller and namespaced model with hash if params[:id] is not specified" do
+ @params.merge!(:controller => "Admin::SubProjectsController", :action => "create", 'sub_project' => {:name => "foobar"})
+ resource = CanCan::ControllerResource.new(@controller, :class => Project)
+ resource.load_resource
+ @controller.instance_variable_get(:@sub_project).name.should == "foobar"
+ end
+
it "should build a new resource with attributes from current ability" do
@params.merge!(:action => "new")
@ability.can(:create, Project, :name => "from conditions")

0 comments on commit 2db73e6

Please sign in to comment.