Skip to content
Browse files

Merge branch 'master' of git://github.com/lifo/docrails

  • Loading branch information...
2 parents 9d9adc9 + de9ea3b commit 8e93e929a171907727f7e63f7669cf1c3141abdc @dallastaylor dallastaylor committed
View
12 actionpack/lib/action_controller/base/mime_responds.rb
@@ -94,6 +94,18 @@ module InstanceMethods
# Note that you can define your own XML parameter parser which would allow you to describe multiple entities
# in a single request (i.e., by wrapping them all in a single root node), but if you just go with the flow
# and accept Rails' defaults, life will be much easier.
+ #
+ # Further more, you may call the #any method on the block's object in order to run the same code for different responses.
+ # def index
+ #
+ # respond_to do |format|
+ # format.html { @people = People.all(:limit => 10) }
+ # format.any(:xml, :atom) { @people = People.all }
+ # end
+ # end
+ #
+ # This will limit the @people variable to 10 people records if we're requesting HTML, but will list all the
+ # people for any xml or atom request.
#
# If you need to use a MIME type which isn't supported by default, you can register your own handlers in
# environment.rb as follows.
View
9 railties/guides/source/caching_with_rails.textile
@@ -83,7 +83,7 @@ class ProductsController < ActionController
end
def create
- expire_page :action => :index
+ expire_page :action => :list
end
end
@@ -275,7 +275,7 @@ h4. SQL Caching
Query caching is a Rails feature that caches the result set returned by each
query so that if Rails encounters the same query again for that request, it
-will used the cached result set as opposed to running the query against the
+will use the cached result set as opposed to running the query against the
database again.
For example:
@@ -481,7 +481,7 @@ class ProductsController < ApplicationController
def show
@product = Product.find(params[:id])
- fresh_when :last_modified => @product.published_at.utc, :etag => @article
+ fresh_when :last_modified => @product.published_at.utc, :etag => @product
end
end
</ruby>
@@ -501,7 +501,7 @@ h3. References
* "Scaling Rails Screencasts":http://railslab.newrelic.com/scaling-rails
* "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/2/28/rails-caching-tutorial
-* "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2
+* "RailsEnvy, Rails Caching Tutorial, Part 2":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2
* "ActiveSupport::Cache documentation":http://api.rubyonrails.org/classes/ActiveSupport/Cache.html
* "Rails 2.1 integrated caching tutorial":http://thewebfellas.com/blog/2008/6/9/rails-2-1-now-with-better-integrated-caching
@@ -509,6 +509,7 @@ h3. References
h3. Changelog
"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/10-guide-to-caching
+April 26, 2009: Clean up typos in submitted patch
April 1, 2009: Made a bunch of small fixes
February 22, 2009: Beefed up the section on cache_stores
December 27, 2008: Typo fixes
View
2 railties/guides/source/i18n.textile
@@ -686,7 +686,7 @@ en:
# will translate User attribute "login" as "Handle"
</ruby>
-Then +User.human_name+ will return "Dude" and +User.human_attribute_name(:login)+ will return "Handle".
+Then +User.human_name+ will return "Dude" and +User.human_attribute_name("login")+ will return "Handle".
h5. Error Message Scopes

0 comments on commit 8e93e92

Please sign in to comment.
Something went wrong with that request. Please try again.