diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-12 22:45:33 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-12 22:45:33 +0200 |
| commit | 3366479a9a6db3101ffe3827a86be0e5b50f7a5a (patch) | |
| tree | a9b4e813f32a99fa626152947862bb57edd23ed0 /actionpack/lib | |
| parent | b53ffb35e085362bb2690577ae123a1f4872c12a (diff) | |
| parent | 40d156955c82c19b14494c1bf60ad48980e29a4e (diff) | |
| download | rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.tar.gz rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.tar.bz2 rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 95992c2698..f7b2b7ff53 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -29,7 +29,7 @@ module AbstractController # # ==== Options # * <tt>only</tt> - The callback should be run only for this action - # * <tt>except<tt> - The callback should be run for all actions except this action + # * <tt>except</tt> - The callback should be run for all actions except this action def _normalize_callback_options(options) if only = options[:only] only = Array(only).map {|o| "action_name == '#{o}'"}.join(" || ") diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 9885110d5d..618a6cdb7d 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/object/inclusion' module ActionController #:nodoc: - module MimeResponds #:nodoc: + module MimeResponds extend ActiveSupport::Concern included do @@ -261,7 +261,7 @@ module ActionController #:nodoc: # Collects mimes and return the response for the negotiated format. Returns # nil if :not_acceptable was sent to the client. # - def retrieve_response_from_mimes(mimes=nil, &block) + def retrieve_response_from_mimes(mimes=nil, &block) #:nodoc: mimes ||= collect_mimes_from_class_level collector = Collector.new(mimes) { |options| default_render(options || {}) } block.call(collector) if block_given? diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 65b002ebad..de75488e72 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -81,9 +81,12 @@ module ActionView # # => /workshops # # <%= url_for(@workshop) %> - # # calls @workshop.to_s + # # calls @workshop.to_param which by default returns the id # # => /workshops/5 # + # # to_param can be re-defined in a model to provide different URL names: + # # => /workshops/1-workshop-name + # # <%= url_for("http://www.example.com") %> # # => http://www.example.com # |