diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-22 13:09:44 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-22 13:09:44 +0000 |
commit | daaa5251c9634ec18d720adc0e5daee8bc4d9a13 (patch) | |
tree | 0ab31b3d47c33dde9e4af9a714194a166777f10d | |
parent | 6ad1b895f4a7a113ad372ce485ac20c762cc3c2c (diff) | |
download | rails-daaa5251c9634ec18d720adc0e5daee8bc4d9a13.tar.gz rails-daaa5251c9634ec18d720adc0e5daee8bc4d9a13.tar.bz2 rails-daaa5251c9634ec18d720adc0e5daee8bc4d9a13.zip |
Fixed documentation and prepared for 0.11.0 release
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@976 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rwxr-xr-x | actionmailer/Rakefile | 4 | ||||
-rwxr-xr-x | actionmailer/lib/action_mailer.rb | 2 | ||||
-rwxr-xr-x | actionpack/README | 15 | ||||
-rwxr-xr-x | actionpack/Rakefile | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/routing.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/pagination_helper.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 22 | ||||
-rw-r--r-- | actionwebservice/Rakefile | 8 | ||||
-rw-r--r-- | actionwebservice/lib/action_web_service/test_invoke.rb | 4 | ||||
-rwxr-xr-x | activerecord/Rakefile | 4 | ||||
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 6 | ||||
-rw-r--r-- | activesupport/Rakefile | 2 | ||||
-rw-r--r-- | railties/Rakefile | 12 |
14 files changed, 42 insertions, 49 deletions
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 <tt><%= define_javascript_functions %></tt> (which returns all # the Javascript support functions in a <script> block) or reference the Javascript library using - # <%= javascript_include_tag "prototype" %> (which looks for the library in /javascripts/prototype.js). The latter is + # <tt><%= javascript_include_tag "prototype" %></tt> (which looks for the library in /javascripts/prototype.js). The latter is # recommended as the browser can then cache the library instead of fetching all the functions anew on every request. # # If you're the visual type, there's an Ajax movie[http://www.rubyonrails.com/media/video/rails-ajax.mov] demonstrating diff --git a/actionpack/lib/action_view/helpers/pagination_helper.rb b/actionpack/lib/action_view/helpers/pagination_helper.rb index f34359583b..06feb274fb 100644 --- a/actionpack/lib/action_view/helpers/pagination_helper.rb +++ b/actionpack/lib/action_view/helpers/pagination_helper.rb @@ -7,8 +7,6 @@ module ActionView # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %> # # <%= link_to "Next page", { :page => paginator.current.next } of paginator.current.next =%> - # - # module PaginationHelper unless const_defined?(:DEFAULT_OPTIONS) DEFAULT_OPTIONS = { diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 9156e6325a..4aaab2d3a5 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -33,27 +33,7 @@ module ActionView end end - # Creates a link tag on the image residing at the +src+ using an URL created by the set of +options+. This takes the same options - # as url_for. For a list, see the url_for documentation in link:classes/ActionController/Base.html#M000079. - # It's also possible to pass a string instead of an options hash to get a link tag that just points without consideration. - # The <tt>html_options</tt> works jointly for the image and ahref tag by letting the following special values enter the options on - # the image and the rest goes to the ahref: - # - # * <tt>:alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension) - # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45" - # * <tt>:border</tt> - Draws a border around the link - # * <tt>:align</tt> - Sets the alignment, no special features - # - # The +src+ can be supplied as a... - # * full path, like "/my_images/image.gif" - # * file name, like "rss.gif", that gets expanded to "/images/rss.gif" - # * file name without extension, like "logo", that gets expanded to "/images/logo.png" - # - # Examples: - # link_image_to "logo", { :controller => "home" }, :alt => "Homepage", :size => "45x80" - # link_image_to "delete", { :action => "destroy" }, :size => "10x10", :confirm => "Are you sure?", "class" => "admin" - # - # NOTE: This tag is deprecated. Combine the link_to and image_tag yourself instead, like: + # This tag is deprecated. Combine the link_to and AssetTagHelper::image_tag yourself instead, like: # link_to(image_tag("rss", :size => "30x45", :border => 0), "http://www.example.com") def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference) image_options = { "src" => src.include?("/") ? src : "/images/#{src}" } diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile index f713636047..a3e45490d9 100644 --- a/actionwebservice/Rakefile +++ b/actionwebservice/Rakefile @@ -9,7 +9,7 @@ require 'fileutils' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionwebservice' -PKG_VERSION = '0.6.0' + PKG_BUILD +PKG_VERSION = '0.6.1' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -56,9 +56,9 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "aws" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '>= 1.5.1' + PKG_BUILD) - s.add_dependency('activerecord', '>= 1.8.0' + PKG_BUILD) - s.add_dependency('activesupport', '>= 1.0.1' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.6.0' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.9.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionwebservice/lib/action_web_service/test_invoke.rb b/actionwebservice/lib/action_web_service/test_invoke.rb index 44601c1c11..aaa03cdb30 100644 --- a/actionwebservice/lib/action_web_service/test_invoke.rb +++ b/actionwebservice/lib/action_web_service/test_invoke.rb @@ -1,7 +1,7 @@ require 'test/unit' -module Test - module Unit +module Test # :nodoc: + module Unit # :nodoc: class TestCase # :nodoc: private # invoke the specified API method diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 0eea613d11..d2dc65c7a5 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'activerecord' -PKG_VERSION = '1.8.0' + PKG_BUILD +PKG_VERSION = '1.9.0' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_FILES = FileList[ @@ -117,7 +117,7 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 1.0.1' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD) s.files.delete "test/fixtures/fixture_database.sqlite" s.files.delete "test/fixtures/fixture_database_2.sqlite" diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 63ff46b014..a19381ea64 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,8 +1,8 @@ module ActiveRecord - class IrreversibleMigration < ActiveRecordError + class IrreversibleMigration < ActiveRecordError#:nodoc: end - class Migration + class Migration #:nodoc: class << self def up() end def down() end @@ -14,7 +14,7 @@ module ActiveRecord end end - class Migrator + class Migrator#:nodoc: class << self def up(migrations_path, target_version = nil) new(:up, migrations_path, target_version).migrate diff --git a/activesupport/Rakefile b/activesupport/Rakefile index e3d2a81fd5..617a4dbcb7 100644 --- a/activesupport/Rakefile +++ b/activesupport/Rakefile @@ -5,7 +5,7 @@ require 'rake/contrib/rubyforgepublisher' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'activesupport' -PKG_VERSION = '1.0.1' + PKG_BUILD +PKG_VERSION = '1.0.2' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" task :default => :test diff --git a/railties/Rakefile b/railties/Rakefile index 167c6bcdf5..df5af97353 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -9,7 +9,7 @@ require 'rbconfig' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'rails' -PKG_VERSION = '0.10.1' + PKG_BUILD +PKG_VERSION = '0.11.0' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -235,11 +235,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.4.15') - s.add_dependency('activesupport', '= 1.0.1' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.8.0' + PKG_BUILD) - s.add_dependency('actionpack', '= 1.5.1' + PKG_BUILD) - s.add_dependency('actionmailer', '= 0.7.1' + PKG_BUILD) - s.add_dependency('actionwebservice', '= 0.6.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.9.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.7.0' + PKG_BUILD) + s.add_dependency('actionmailer', '= 0.8.0' + PKG_BUILD) + s.add_dependency('actionwebservice', '= 0.6.1' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false |