Changeset 6993

Timestamp:

06/11/07 01:01:32 (2 years ago)

Author:

bitsweat

Message:

Deprecate pagination for Rails 1.2.4. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin. References #8157.

Files:

• branches/1-2-stable/actionpack/CHANGELOG (modified) (2 diffs)
• branches/1-2-stable/actionpack/lib/action_controller/pagination.rb (modified) (3 diffs)
• branches/1-2-stable/actionpack/test/activerecord/pagination_test.rb (modified) (2 diffs)
• branches/1-2-stable/actionpack/test/controller/addresses_render_test.rb (modified) (1 diff)
• branches/1-2-stable/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb (modified) (4 diffs)

branches/1-2-stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Deprecate pagination. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin.  #8157 [Mislav Marohnic]
-
-* Fix filtered parameter logging with nil parameter values.  #8422 [choonkeat]
@@ -466 +468 @@
-* Avoid naming collision among compiled view methods. [Jeremy Kemper]
-
-mislav@nippur.irb.hr
+Mislav Marohnic
-
-* Determine the correct template_root for deeply nested components.  #2841 [s.brink@web.de]

branches/1-2-stable/actionpack/lib/action_controller/pagination.rb

@@ -2 +2 @@
-  # === Action Pack pagination for Active Record collections
-  #
-
+
+
+
-  #
-  # The Pagination module aids in the process of paging large collections of
@@ -131 +133 @@
-    end
-
+    deprecate :paginate => 'Pagination is moving to a plugin in Rails 2.0: script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination'
+
-    # These methods become class methods on any controller 
-    module ClassMethods
@@ -149 +153 @@
-        end
-      end
+
+      deprecate :paginate => 'Pagination is moving to a plugin in Rails 2.0: script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination'
-    end
-

branches/1-2-stable/actionpack/test/activerecord/pagination_test.rb

@@ -6 +6 @@
-  class PaginationController < ActionController::Base
-    self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
+
+    around_filter :silence_deprecation_warnings
-    
-    def simple_paginate
@@ -67 +69 @@
-                                             :count => "d.id")        
-      render :nothing => true
+    end
+
+
+    def silence_deprecation_warnings
+      ActiveSupport::Deprecation.silence do
+        yield
+      end
-    end
-    

branches/1-2-stable/actionpack/test/controller/addresses_render_test.rb

@@ -40 +40 @@
-
-  def test_list
-
+
+
+
+
-    assert_equal "We only need to get this far!", @response.body.chomp
-  end

branches/1-2-stable/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb

@@ -2 +2 @@
-
-class DeprecatedBaseMethodsTest < Test::Unit::TestCase
+  # ActiveRecord model mock to test pagination deprecation
+  class DummyModel
+    def self.find(*args) [] end
+    def self.count(*args) 0 end
+  end
+
-  class Target < ActionController::Base
-    def deprecated_symbol_parameter_to_url_for
@@ -19 +25 @@
-    end
-
+    def pagination
+      paginate :dummy_models, :class_name => 'DeprecatedBaseMethodsTest::DummyModel'
+      render :nothing => true
+    end
+
-    def rescue_action(e) raise e end
-  end
@@ -28 +39 @@
-    @response   = ActionController::TestResponse.new
-    @controller = Target.new
+    @controller.logger = Logger.new(nil) unless @controller.logger
-  end
-
@@ -58 +70 @@
-    assert_not_deprecated { error.message }
-  end
+
+  def test_pagination_deprecation
+    assert_deprecated('svn://errtheblog.com/svn/plugins/classic_pagination') do
+      get :pagination
+    end
+  end
-end