From 6826936335ba76e1d0c984aadfbf5006aec08357 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Wed, 4 May 2011 22:49:11 -0300 Subject: [PATCH 1/2] Improve doc styles for ActiveModel::Conversion --- activemodel/lib/active_model/conversion.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb index e3992e842a..1405b1bfe3 100644 --- a/activemodel/lib/active_model/conversion.rb +++ b/activemodel/lib/active_model/conversion.rb @@ -21,8 +21,8 @@ module ActiveModel # module Conversion # If your object is already designed to implement all of the Active Model - # you can use the default to_model implementation, which simply returns - # self. + # you can use the default :to_model implementation, which simply + # returns self. # # If your model does not act like an Active Model object, then you should # define :to_model yourself returning a proxy object that wraps @@ -35,13 +35,13 @@ def to_model # if the object is persisted or not. # # Note the default implementation uses persisted? just because all objects - # in Ruby 1.8.x responds to :id. + # in Ruby 1.8.x responds to :id. def to_key persisted? ? [id] : nil end # Returns a string representing the object's key suitable for use in URLs, - # or nil if persisted? is false + # or nil if persisted? is false. def to_param persisted? ? to_key.join('-') : nil end From 210ebd362308a6964797a898fab9a5de35da1dab Mon Sep 17 00:00:00 2001 From: Paul Morganthall Date: Thu, 5 May 2011 09:05:40 -0700 Subject: [PATCH 2/2] Rails 3 requires the "new" command to create a new project. --- railties/guides/source/testing.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index efa2bbdca6..061d597ae1 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -38,7 +38,7 @@ When you do end up destroying your testing database (and it will happen, trust m h4. Rails Sets up for Testing from the Word Go -Rails creates a +test+ folder for you as soon as you create a Rails project using +rails _application_name_+. If you list the contents of this folder then you shall see: +Rails creates a +test+ folder for you as soon as you create a Rails project using +rails new _application_name_+. If you list the contents of this folder then you shall see: $ ls -F test/