From d77b306b63e20aabec5daf7159d31c8ee31492c9 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Sun, 15 May 2011 14:25:00 -0400
Subject: [PATCH] Make ParamsWrapper calling newly introduced
 `Model.attribute_names` instead of `.column_names`

---
 actionpack/CHANGELOG                           |  2 +-
 .../action_controller/metal/params_wrapper.rb  |  6 +++---
 .../test/controller/params_wrapper_test.rb     | 18 ++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 68076b794e..15abfb8369 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -17,7 +17,7 @@
     class PostsController < ActionController::Base
       stream :only => :index
     end
-  
+
   Please read the docs at `ActionController::Streaming` for more information.
 
 * Added `ActionDispatch::Request.ignore_accept_header` to ignore accept headers and only consider the format given as parameter [José Valim]
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index b18be60201..aa7c1e09c2 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -145,7 +145,7 @@ def _default_wrap_model #:nodoc:
         begin
           model_klass = model_name.constantize
         rescue NameError, ArgumentError => e
-          if e.message =~ /is not missing constant|uninitialized constant #{model_name}/ 
+          if e.message =~ /is not missing constant|uninitialized constant #{model_name}/
             namespaces = model_name.split("::")
             namespaces.delete_at(-2)
             break if namespaces.last == model_name
@@ -163,8 +163,8 @@ def _set_wrapper_defaults(options, model=nil)
 
         unless options[:only] || options[:except]
           model ||= _default_wrap_model
-          if !(model.respond_to?(:abstract_class?) && model.abstract_class?) && model.respond_to?(:column_names)
-            options[:only] = model.column_names
+          if model.respond_to?(:attribute_names) && model.attribute_names.present?
+            options[:only] = model.attribute_names
           end
         end
 
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index bed4a6a553..ae4ad8eb9c 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -133,9 +133,8 @@ def test_nested_params
   end
 
   def test_derived_wrapped_keys_from_matching_model
-    User.expects(:respond_to?).with(:abstract_class?).returns(false)
-    User.expects(:respond_to?).with(:column_names).returns(true)
-    User.expects(:column_names).returns(["username"])
+    User.expects(:respond_to?).with(:attribute_names).returns(true)
+    User.expects(:attribute_names).twice.returns(["username"])
 
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
@@ -146,9 +145,8 @@ def test_derived_wrapped_keys_from_matching_model
 
   def test_derived_wrapped_keys_from_specified_model
     with_default_wrapper_options do
-      Person.expects(:respond_to?).with(:abstract_class?).returns(false)
-      Person.expects(:respond_to?).with(:column_names).returns(true)
-      Person.expects(:column_names).returns(["username"])
+      Person.expects(:respond_to?).with(:attribute_names).returns(true)
+      Person.expects(:attribute_names).twice.returns(["username"])
 
       UsersController.wrap_parameters Person
 
@@ -159,8 +157,8 @@ def test_derived_wrapped_keys_from_specified_model
   end
 
   def test_not_wrapping_abstract_model
-    User.expects(:respond_to?).with(:abstract_class?).returns(true)
-    User.expects(:abstract_class?).returns(true)
+    User.expects(:respond_to?).with(:attribute_names).returns(true)
+    User.expects(:attribute_names).returns([])
 
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
@@ -198,13 +196,13 @@ def parse
   end
 
   class SampleOne
-    def self.column_names
+    def self.attribute_names
       ["username"]
     end
   end
 
   class SampleTwo
-    def self.column_names
+    def self.attribute_names
       ["title"]
     end
   end
-- 
GitLab