Merge pull request #1090 from dchelimsky/issue-1089

3.1: params_wrapper raises error on anynomous controllers

3 files changed, 54 insertions, 21 deletions

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index aa7c1e09c2..b7c37ce1c1 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -140,6 +140,8 @@ module ActionController
       # This method also does namespace lookup. Foo::Bar::UsersController will
       # try to find Foo::Bar::User, Foo::User and finally User.
       def _default_wrap_model #:nodoc:
+        return nil if self.name.nil?
+
         model_name = self.name.sub(/Controller$/, '').singularize
 
         begin
@@ -168,7 +170,7 @@ module ActionController
           end
         end
 
-        unless options[:name]
+        unless options[:name] || self.name.nil?
           model ||= _default_wrap_model
           options[:name] = model ? model.to_s.demodulize.underscore :
             controller_name.singularize
@@ -226,7 +228,7 @@ module ActionController
       # Checks if we should perform parameters wrapping.
       def _wrapper_enabled?
         ref = request.content_mime_type.try(:ref)
-        _wrapper_formats.include?(ref) && !request.request_parameters[_wrapper_key]
+        _wrapper_formats.include?(ref) && _wrapper_key && !request.request_parameters[_wrapper_key]
       end
   end
 end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 0085f542aa..5e4b48a531 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -413,7 +413,11 @@ module ActionController
         @request.env['REQUEST_METHOD'] = http_method
 
         parameters ||= {}
-        @request.assign_parameters(@routes, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
+        controller_class_name = @controller.class.name ?
+          @controller.class.name.underscore.sub(/_controller$/, '') :
+          "anonymous_controller"
+
+        @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)
 
         @request.session = ActionController::TestSession.new(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index ae4ad8eb9c..a50065bcc7 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -2,7 +2,21 @@ require 'abstract_unit'
 
 module Admin; class User; end; end
 
+module ParamsWrapperTestHelp
+  def with_default_wrapper_options(&block)
+    @controller.class._wrapper_options = {:format => [:json]}
+    @controller.class.inherited(@controller.class)
+    yield
+  end
+
+  def assert_parameters(expected)
+    assert_equal expected, self.class.controller_class.last_parameters
+  end
+end
+
 class ParamsWrapperTest < ActionController::TestCase
+  include ParamsWrapperTestHelp
+
   class UsersController < ActionController::Base
     class << self
       attr_accessor :last_parameters
@@ -166,20 +180,11 @@ class ParamsWrapperTest < ActionController::TestCase
       assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
     end
   end
-
-  private
-    def with_default_wrapper_options(&block)
-      @controller.class._wrapper_options = {:format => [:json]}
-      @controller.class.inherited(@controller.class)
-      yield
-    end
-
-    def assert_parameters(expected)
-      assert_equal expected, UsersController.last_parameters
-    end
 end
 
 class NamespacedParamsWrapperTest < ActionController::TestCase
+  include ParamsWrapperTestHelp
+
   module Admin
     module Users
       class UsersController < ActionController::Base;
@@ -247,14 +252,36 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
     end
   end
 
-  private
-    def with_default_wrapper_options(&block)
-      @controller.class._wrapper_options = {:format => [:json]}
-      @controller.class.inherited(@controller.class)
-      yield
+end
+
+class AnonymousControllerParamsWrapperTest < ActionController::TestCase
+  include ParamsWrapperTestHelp
+
+  tests(Class.new(ActionController::Base) do
+    class << self
+      attr_accessor :last_parameters
     end
 
-    def assert_parameters(expected)
-      assert_equal expected, Admin::Users::UsersController.last_parameters
+    def parse
+      self.class.last_parameters = request.params.except(:controller, :action)
+      head :ok
+    end
+  end)
+
+  def test_does_not_implicitly_wrap_params
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu' })
     end
+  end
+
+  def test_does_wrap_params_if_name_provided
+    with_default_wrapper_options do
+      @controller.class.wrap_parameters(:name => "guest")
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'guest' => { 'username' => 'sikachu' }})
+    end
+  end
 end