diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 7669271d37..c5e79c2de3 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
PKG_NAME = 'actionmailer'
-PKG_VERSION = '0.7.1' + PKG_BUILD
+PKG_VERSION = '0.8.0' + PKG_BUILD
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
desc "Default Task"
@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "actionmailer"
s.homepage = "http://www.rubyonrails.org"
- s.add_dependency('actionpack', '= 1.5.1' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 1.6.0' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index a8157824ef..3b507f63d1 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -28,7 +28,7 @@ rescue LoadError
require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller'
rescue LoadError
require 'rubygems'
- require_gem 'actionpack', '>= 0.9.0'
+ require_gem 'actionpack', '>= 1.6.0'
end
end
diff --git a/actionpack/README b/actionpack/README
index 7c7526a9e9..10992280ea 100755
--- a/actionpack/README
+++ b/actionpack/README
@@ -177,6 +177,21 @@ A short rundown of the major features:
{Learn more}[link:classes/ActionView/Helpers/JavascriptHelper.html]
+* Pagination for navigating lists of results.
+
+ # controller
+ def list
+ @pages, @people =
+ paginate :people, :order_by => 'last_name, first_name'
+ end
+
+ # view
+ <%= link_to "Previous page", { :page => @pages.current.previous } if @pages.current.previous %>
+ <%= link_to "Next page", { :page => @pages.current.next } of @pages.current.next =%>
+
+ {Learn more}[link:classes/ActionController/Pagination.html]
+
+
* Easy testing of both controller and template result through TestRequest/Response
class LoginControllerTest < Test::Unit::TestCase
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 7c40e530dc..e5de66a0b7 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
PKG_NAME = 'actionpack'
-PKG_VERSION = '1.5.1' + PKG_BUILD
+PKG_VERSION = '1.6.0' + PKG_BUILD
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
desc "Default Task"
@@ -57,7 +57,7 @@ spec = Gem::Specification.new do |s|
s.has_rdoc = true
s.requirements << 'none'
- s.add_dependency('activesupport', '= 1.0.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD)
s.require_path = 'lib'
s.autorequire = 'action_controller'
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 0d4143fa87..6d5f108484 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -324,7 +324,7 @@ module ActionController
end
end
- def self.extract_parameter_value(parameter)
+ def self.extract_parameter_value(parameter) #:nodoc:
value = (parameter.respond_to?(:to_param) ? parameter.to_param : parameter).to_s
CGI.escape(value)
end
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 079ec736a1..d5630bcdfe 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -7,9 +7,9 @@ module ActionView
# actions in your controllers without reloading the page, but still update certain parts of it using injections into the
# DOM. The common use case is having a form that adds a new element to a list without reloading the page.
#
- # To be able to use the Javascript helpers, you must either call <%= define_javascript_functions %> (which returns all
+ # To be able to use the Javascript helpers, you must either call <%= define_javascript_functions %> (which returns all
# the Javascript support functions in a