railties 3.2.0 → 3.2.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes.
+
+*   Migration generation understands decimal{1.2} and decimal{1-2}, in
+    addition to decimal{1,2}. *José Valim*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Rails 2.3-style plugins in vendor/plugins are deprecated and will be removed in Rails 4.0. Move them out of vendor/plugins and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb.  *Santiago Pastorino*

data/guides/source/active_record_querying.textile

@@ -1400,6 +1400,9 @@ A threshold of +nil+ disables automatic EXPLAINs.
 The default threshold in development mode is 0.5 seconds, and +nil+ in test and
 production modes.
 
+INFO. Automatic EXPLAIN gets disabled if Active Record has no logger, regardless
+of the value of the threshold.
+
 h5. Disabling Automatic EXPLAIN
 
 Automatic EXPLAIN can be selectively silenced with +ActiveRecord::Base.silence_auto_explain+:

data/guides/source/active_record_validations_callbacks.textile

@@ -614,7 +614,7 @@ As shown in the example, you can also combine standard validations with your own
 
 h4. Custom Methods
 
-You can also create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using one or more of the +validate+, +validate_on_create+ or +validate_on_update+ class methods, passing in the symbols for the validation methods' names.
+You can also create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using the +validate+ class method, passing in the symbols for the validation methods' names.
 
 You can pass more than one symbol for each class method and the respective validations will be run in the same order as they were registered.
 
@@ -637,12 +637,24 @@ class Invoice < ActiveRecord::Base
 end
 </ruby>
 
+By default such validations will run every time you call +valid?+. It is also possible to control when to run these custom validations by giving an +:on+ option to the +validate+ method, with either: +:create+ or +:update+.
+
+<ruby>
+class Invoice < ActiveRecord::Base
+  validate :active_customer, :on => :create
+
+  def active_customer
+    errors.add(:customer_id, "is not active") unless customer.active?
+  end
+end
+</ruby>
+
 You can even create your own validation helpers and reuse them in several different models. For example, an application that manages surveys may find it useful to express that a certain field corresponds to a set of choices:
 
 <ruby>
 ActiveRecord::Base.class_eval do
   def self.validates_as_choice(attr_name, n, options={})
-    validates attr_name, :inclusion => { {:in => 1..n}.merge(options) }
+    validates attr_name, :inclusion => { { :in => 1..n }.merge!(options) }
   end
 end
 </ruby>
@@ -659,7 +671,7 @@ h3. Working with Validation Errors
 
 In addition to the +valid?+ and +invalid?+ methods covered earlier, Rails provides a number of methods for working with the +errors+ collection and inquiring about the validity of objects.
 
-The following is a list of the most commonly used methods. Please refer to the +ActiveRecord::Errors+ documentation for a list of all the available methods.
+The following is a list of the most commonly used methods. Please refer to the +ActiveModel::Errors+ documentation for a list of all the available methods.
 
 h4(#working_with_validation_errors-errors). +errors+
 
@@ -889,13 +901,8 @@ Below is a simple example where we change the Rails behavior to always display t
 
 <ruby>
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  if instance.error_message.kind_of?(Array)
-    %(#{html_tag}<span class="validation-error">&nbsp;
-      #{instance.error_message.join(',')}</span>).html_safe
-  else
-    %(#{html_tag}<span class="validation-error">&nbsp;
-      #{instance.error_message}</span>).html_safe
-  end
+  errors = Array(instance.error_message).join(',')
+  %(#{html_tag}<span class="validation-error">&nbsp;#{errors}</span>).html_safe
 end
 </ruby>
 
@@ -949,6 +956,7 @@ h4. Creating an Object
 * +before_validation+
 * +after_validation+
 * +before_save+
+* +around_save+
 * +before_create+
 * +around_create+
 * +after_create+
@@ -959,6 +967,7 @@ h4. Updating an Object
 * +before_validation+
 * +after_validation+
 * +before_save+
+* +around_save+
 * +before_update+
 * +around_update+
 * +after_update+
@@ -967,8 +976,8 @@ h4. Updating an Object
 h4. Destroying an Object
 
 * +before_destroy+
-* +after_destroy+
 * +around_destroy+
+* +after_destroy+
 
 WARNING. +after_save+ runs both on create and update, but always _after_ the more specific callbacks +after_create+ and +after_update+, no matter the order in which the macro calls were executed.
 
@@ -1013,7 +1022,7 @@ The following methods trigger callbacks:
 * +increment!+
 * +save+
 * +save!+
-* +save(false)+
+* +save(:validate => false)+
 * +toggle!+
 * +update+
 * +update_attribute+

data/guides/source/active_resource_basics.textile

@@ -71,7 +71,7 @@ person.destroy
 
 h3. Validations
 
-Module to support validation and errors with Active Resource objects. The module overrides Base#save to rescue ActiveResource::ResourceInvalid exceptions and parse the errors returned in the web service response. The module also adds an errors collection that mimics the interface of the errors provided by ActiveRecord::Errors.
+Module to support validation and errors with Active Resource objects. The module overrides Base#save to rescue ActiveResource::ResourceInvalid exceptions and parse the errors returned in the web service response. The module also adds an errors collection that mimics the interface of the errors provided by ActiveModel::Errors.
 
 h4. Validating client side resources by overriding validation methods in base class
 

data/guides/source/contributing_to_ruby_on_rails.textile

@@ -309,7 +309,7 @@ Rails follows a simple set of coding style conventions.
 
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.
-* Indent after private/protected.
+* Do not indent after private/protected. Private/protected should have the same indentation as the methods around.
 * Prefer +&&+/+||+ over +and+/+or+.
 * Prefer class << self block over self.method for class methods.
 * +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.

data/guides/source/i18n.textile

@@ -819,13 +819,13 @@ h5. Action View Helper Methods
 
 * The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+, and +number_to_human_size+ helpers use the number format settings located in the "number":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope.
 
-h5. Active Record Methods
+h5. Active Model Methods
 
 * +model_name.human+ and +human_attribute_name+ use translations for model names and attribute names if available in the "activerecord.models":https://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L29 scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
 
-* +ActiveRecord::Errors#generate_message+ (which is used by Active Record validations but may also be used manually) uses +model_name.human+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
+* +ActiveModel::Errors#generate_message+ (which is used by Active Model validations but may also be used manually) uses +model_name.human+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
 
-* +ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and which defaults to +' '+).
+* +ActiveModel::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "errors.format":https://github.com/rails/rails/blob/master/activemodel/lib/active_model/locale/en.yml#L4 (and which defaults to +"%{attribute} %{message}"+).
 
 h5. Active Support Methods
 

data/lib/rails/application/finisher.rb

@@ -2,7 +2,6 @@ module Rails
   class Application
     module Finisher
       include Initializable
-      $rails_rake_task = nil
 
       initializer :add_generator_templates do
         config.generators.templates.unshift(*paths["lib/templates"].existent)
@@ -49,7 +48,7 @@ module Rails
       end
 
       initializer :eager_load! do
-        if config.cache_classes && !$rails_rake_task
+        if config.cache_classes && !(defined?($rails_rake_task) && $rails_rake_task)
           ActiveSupport.run_load_hooks(:before_eager_load, self)
           eager_load!
         end

data/lib/rails/generators/actions.rb

@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'rbconfig'
+require 'active_support/core_ext/array/wrap'
 
 module Rails
   module Generators

data/lib/rails/generators/generated_attribute.rb

@@ -29,8 +29,8 @@ module Rails
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
             return $1, :limit => $2.to_i
-          when /decimal\{(\d+),(\d+)\}/
-            return :decimal, :precision => $1.to_i, :scale => $2.to_i
+          when /decimal\{(\d+)(,|\.|\-)(\d+)\}/
+            return :decimal, :precision => $1.to_i, :scale => $3.to_i
           else
             return type, {}
           end

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,606 +1,655 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: railties
-version: !ruby/object:Gem::Version
-  version: 3.2.0
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 3
+  - 2
+  - 1
+  version: 3.2.1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-26 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70264961786840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961786840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &70264961786300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961786300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rack-ssl
-  requirement: &70264961806680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961806680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70264961805900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.4'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 4
+        version: "3.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961805900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70264961805460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961805460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &70264961804940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70264961804940
-description: ! 'Rails internals: application bootup, plugins, generators, and rake
-  tasks.'
+  version_requirements: *id006
+description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
-executables:
+executables: 
 - rails
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG.md
 - README.rdoc
 - bin/rails
-- guides/assets/images/belongs_to.png
-- guides/assets/images/book_icon.gif
-- guides/assets/images/bullet.gif
-- guides/assets/images/challenge.png
-- guides/assets/images/chapters_icon.gif
-- guides/assets/images/check_bullet.gif
-- guides/assets/images/credits_pic_blank.gif
-- guides/assets/images/csrf.png
-- guides/assets/images/customized_error_messages.png
-- guides/assets/images/edge_badge.png
-- guides/assets/images/error_messages.png
-- guides/assets/images/feature_tile.gif
-- guides/assets/images/footer_tile.gif
-- guides/assets/images/fxn.png
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
+- guides/assets/stylesheets/syntaxhighlighter/shCore.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
+- guides/assets/stylesheets/reset.css
+- guides/assets/stylesheets/main.css
+- guides/assets/stylesheets/print.css
+- guides/assets/stylesheets/fixes.css
+- guides/assets/stylesheets/style.css
+- guides/assets/stylesheets/kindle.css
 - guides/assets/images/grey_bullet.gif
+- guides/assets/images/vijaydev.jpg
+- guides/assets/images/error_messages.png
+- guides/assets/images/customized_error_messages.png
 - guides/assets/images/habtm.png
-- guides/assets/images/has_many.png
-- guides/assets/images/has_many_through.png
-- guides/assets/images/has_one.png
-- guides/assets/images/has_one_through.png
-- guides/assets/images/header_backdrop.png
-- guides/assets/images/header_tile.gif
-- guides/assets/images/i18n/demo_html_safe.png
-- guides/assets/images/i18n/demo_localized_pirate.png
-- guides/assets/images/i18n/demo_translated_en.png
-- guides/assets/images/i18n/demo_translated_pirate.png
-- guides/assets/images/i18n/demo_translation_missing.png
-- guides/assets/images/i18n/demo_untranslated.png
-- guides/assets/images/icons/callouts/1.png
-- guides/assets/images/icons/callouts/10.png
-- guides/assets/images/icons/callouts/11.png
-- guides/assets/images/icons/callouts/12.png
-- guides/assets/images/icons/callouts/13.png
-- guides/assets/images/icons/callouts/14.png
+- guides/assets/images/polymorphic.png
+- guides/assets/images/icons/README
+- guides/assets/images/icons/prev.png
+- guides/assets/images/icons/tip.png
+- guides/assets/images/icons/note.png
 - guides/assets/images/icons/callouts/15.png
+- guides/assets/images/icons/callouts/5.png
 - guides/assets/images/icons/callouts/2.png
+- guides/assets/images/icons/callouts/11.png
+- guides/assets/images/icons/callouts/14.png
 - guides/assets/images/icons/callouts/3.png
-- guides/assets/images/icons/callouts/4.png
-- guides/assets/images/icons/callouts/5.png
+- guides/assets/images/icons/callouts/1.png
 - guides/assets/images/icons/callouts/6.png
+- guides/assets/images/icons/callouts/10.png
+- guides/assets/images/icons/callouts/13.png
 - guides/assets/images/icons/callouts/7.png
+- guides/assets/images/icons/callouts/12.png
 - guides/assets/images/icons/callouts/8.png
+- guides/assets/images/icons/callouts/4.png
 - guides/assets/images/icons/callouts/9.png
+- guides/assets/images/icons/up.png
+- guides/assets/images/icons/warning.png
+- guides/assets/images/icons/home.png
+- guides/assets/images/icons/next.png
 - guides/assets/images/icons/caution.png
 - guides/assets/images/icons/example.png
-- guides/assets/images/icons/home.png
 - guides/assets/images/icons/important.png
-- guides/assets/images/icons/next.png
-- guides/assets/images/icons/note.png
-- guides/assets/images/icons/prev.png
-- guides/assets/images/icons/README
-- guides/assets/images/icons/tip.png
-- guides/assets/images/icons/up.png
-- guides/assets/images/icons/warning.png
-- guides/assets/images/jaimeiniesta.jpg
+- guides/assets/images/has_one_through.png
+- guides/assets/images/rails_welcome.png
+- guides/assets/images/footer_tile.gif
+- guides/assets/images/bullet.gif
+- guides/assets/images/chapters_icon.gif
+- guides/assets/images/csrf.png
+- guides/assets/images/tab_note.gif
 - guides/assets/images/nav_arrow.gif
-- guides/assets/images/polymorphic.png
+- guides/assets/images/has_many_through.png
+- guides/assets/images/feature_tile.gif
+- guides/assets/images/tab_yellow.gif
+- guides/assets/images/session_fixation.png
+- guides/assets/images/has_many.png
+- guides/assets/images/jaimeiniesta.jpg
+- guides/assets/images/tab_info.gif
+- guides/assets/images/challenge.png
+- guides/assets/images/credits_pic_blank.gif
 - guides/assets/images/posts_index.png
-- guides/assets/images/radar.png
+- guides/assets/images/check_bullet.gif
+- guides/assets/images/validation_error_messages.png
+- guides/assets/images/edge_badge.png
+- guides/assets/images/fxn.png
+- guides/assets/images/rails_logo_remix.gif
+- guides/assets/images/belongs_to.png
+- guides/assets/images/tab_yellow.png
+- guides/assets/images/header_tile.gif
 - guides/assets/images/rails_guides_kindle_cover.jpg
+- guides/assets/images/i18n/demo_untranslated.png
+- guides/assets/images/i18n/demo_translation_missing.png
+- guides/assets/images/i18n/demo_localized_pirate.png
+- guides/assets/images/i18n/demo_translated_en.png
+- guides/assets/images/i18n/demo_html_safe.png
+- guides/assets/images/i18n/demo_translated_pirate.png
+- guides/assets/images/has_one.png
+- guides/assets/images/header_backdrop.png
 - guides/assets/images/rails_guides_logo.gif
-- guides/assets/images/rails_logo_remix.gif
-- guides/assets/images/rails_welcome.png
-- guides/assets/images/session_fixation.png
+- guides/assets/images/book_icon.gif
 - guides/assets/images/tab_grey.gif
-- guides/assets/images/tab_info.gif
-- guides/assets/images/tab_note.gif
+- guides/assets/images/radar.png
 - guides/assets/images/tab_red.gif
-- guides/assets/images/tab_yellow.gif
-- guides/assets/images/tab_yellow.png
-- guides/assets/images/validation_error_messages.png
-- guides/assets/images/vijaydev.jpg
-- guides/assets/javascripts/guides.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
+- guides/assets/javascripts/syntaxhighlighter/shCore.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
-- guides/assets/javascripts/syntaxhighlighter/shCore.js
-- guides/assets/stylesheets/fixes.css
-- guides/assets/stylesheets/kindle.css
-- guides/assets/stylesheets/main.css
-- guides/assets/stylesheets/print.css
-- guides/assets/stylesheets/reset.css
-- guides/assets/stylesheets/style.css
-- guides/assets/stylesheets/syntaxhighlighter/shCore.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
-- guides/code/getting_started/app/assets/images/rails.png
-- guides/code/getting_started/app/assets/javascripts/application.js
-- guides/code/getting_started/app/assets/javascripts/comments.js.coffee
-- guides/code/getting_started/app/assets/javascripts/home.js.coffee
-- guides/code/getting_started/app/assets/javascripts/posts.js.coffee
-- guides/code/getting_started/app/assets/stylesheets/application.css
-- guides/code/getting_started/app/assets/stylesheets/comments.css.scss
-- guides/code/getting_started/app/assets/stylesheets/home.css.scss
-- guides/code/getting_started/app/assets/stylesheets/posts.css.scss
-- guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
-- guides/code/getting_started/app/controllers/application_controller.rb
-- guides/code/getting_started/app/controllers/comments_controller.rb
-- guides/code/getting_started/app/controllers/home_controller.rb
-- guides/code/getting_started/app/controllers/posts_controller.rb
-- guides/code/getting_started/app/helpers/application_helper.rb
-- guides/code/getting_started/app/helpers/comments_helper.rb
-- guides/code/getting_started/app/helpers/home_helper.rb
-- guides/code/getting_started/app/helpers/posts_helper.rb
-- guides/code/getting_started/app/models/comment.rb
-- guides/code/getting_started/app/models/post.rb
-- guides/code/getting_started/app/models/tag.rb
-- guides/code/getting_started/app/views/comments/_comment.html.erb
-- guides/code/getting_started/app/views/comments/_form.html.erb
-- guides/code/getting_started/app/views/home/index.html.erb
-- guides/code/getting_started/app/views/layouts/application.html.erb
-- guides/code/getting_started/app/views/posts/_form.html.erb
-- guides/code/getting_started/app/views/posts/edit.html.erb
-- guides/code/getting_started/app/views/posts/index.html.erb
-- guides/code/getting_started/app/views/posts/new.html.erb
-- guides/code/getting_started/app/views/posts/show.html.erb
-- guides/code/getting_started/app/views/tags/_form.html.erb
-- guides/code/getting_started/config/application.rb
-- guides/code/getting_started/config/boot.rb
-- guides/code/getting_started/config/database.yml
-- guides/code/getting_started/config/environment.rb
-- guides/code/getting_started/config/environments/development.rb
-- guides/code/getting_started/config/environments/production.rb
-- guides/code/getting_started/config/environments/test.rb
-- guides/code/getting_started/config/initializers/backtrace_silencers.rb
-- guides/code/getting_started/config/initializers/inflections.rb
-- guides/code/getting_started/config/initializers/mime_types.rb
-- guides/code/getting_started/config/initializers/secret_token.rb
-- guides/code/getting_started/config/initializers/session_store.rb
-- guides/code/getting_started/config/initializers/wrap_parameters.rb
-- guides/code/getting_started/config/locales/en.yml
-- guides/code/getting_started/config/routes.rb
-- guides/code/getting_started/config.ru
-- guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
-- guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
-- guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
-- guides/code/getting_started/db/schema.rb
-- guides/code/getting_started/db/seeds.rb
-- guides/code/getting_started/doc/README_FOR_APP
-- guides/code/getting_started/Gemfile
-- guides/code/getting_started/public/404.html
-- guides/code/getting_started/public/422.html
-- guides/code/getting_started/public/500.html
-- guides/code/getting_started/public/favicon.ico
-- guides/code/getting_started/public/robots.txt
-- guides/code/getting_started/Rakefile
-- guides/code/getting_started/README.rdoc
-- guides/code/getting_started/script/rails
-- guides/code/getting_started/test/fixtures/comments.yml
-- guides/code/getting_started/test/fixtures/posts.yml
-- guides/code/getting_started/test/fixtures/tags.yml
-- guides/code/getting_started/test/functional/comments_controller_test.rb
-- guides/code/getting_started/test/functional/home_controller_test.rb
-- guides/code/getting_started/test/functional/posts_controller_test.rb
-- guides/code/getting_started/test/performance/browsing_test.rb
-- guides/code/getting_started/test/test_helper.rb
-- guides/code/getting_started/test/unit/comment_test.rb
-- guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
-- guides/code/getting_started/test/unit/helpers/home_helper_test.rb
-- guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
-- guides/code/getting_started/test/unit/post_test.rb
-- guides/code/getting_started/test/unit/tag_test.rb
+- guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+- guides/assets/javascripts/guides.js
 - guides/rails_guides/generator.rb
-- guides/rails_guides/helpers.rb
 - guides/rails_guides/indexer.rb
-- guides/rails_guides/levenshtein.rb
 - guides/rails_guides/textile_extensions.rb
-- guides/rails_guides.rb
-- guides/source/2_2_release_notes.textile
-- guides/source/2_3_release_notes.textile
-- guides/source/3_0_release_notes.textile
-- guides/source/3_1_release_notes.textile
-- guides/source/3_2_release_notes.textile
-- guides/source/_license.html.erb
-- guides/source/_welcome.html.erb
-- guides/source/action_controller_overview.textile
-- guides/source/action_mailer_basics.textile
+- guides/rails_guides/helpers.rb
+- guides/rails_guides/levenshtein.rb
+- guides/w3c_validator.rb
 - guides/source/action_view_overview.textile
-- guides/source/active_model_basics.textile
-- guides/source/active_record_basics.textile
-- guides/source/active_record_querying.textile
-- guides/source/active_record_validations_callbacks.textile
+- guides/source/kindle/welcome.html.erb
+- guides/source/kindle/rails_guides.opf.erb
+- guides/source/kindle/KINDLE.md
+- guides/source/kindle/toc.ncx.erb
+- guides/source/kindle/layout.html.erb
+- guides/source/kindle/toc.html.erb
+- guides/source/kindle/copyright.html.erb
 - guides/source/active_resource_basics.textile
-- guides/source/active_support_core_extensions.textile
-- guides/source/ajax_on_rails.textile
-- guides/source/api_documentation_guidelines.textile
-- guides/source/asset_pipeline.textile
-- guides/source/association_basics.textile
-- guides/source/caching_with_rails.textile
+- guides/source/index.html.erb
+- guides/source/i18n.textile
+- guides/source/getting_started.textile
 - guides/source/command_line.textile
 - guides/source/configuring.textile
-- guides/source/contributing_to_ruby_on_rails.textile
-- guides/source/credits.html.erb
-- guides/source/debugging_rails_applications.textile
+- guides/source/action_mailer_basics.textile
+- guides/source/layouts_and_rendering.textile
+- guides/source/2_3_release_notes.textile
+- guides/source/security.textile
+- guides/source/api_documentation_guidelines.textile
+- guides/source/initialization.textile
+- guides/source/form_helpers.textile
+- guides/source/nested_model_forms.textile
+- guides/source/_welcome.html.erb
 - guides/source/documents.yaml
+- guides/source/ajax_on_rails.textile
+- guides/source/active_model_basics.textile
 - guides/source/engines.textile
-- guides/source/form_helpers.textile
+- guides/source/action_controller_overview.textile
+- guides/source/rails_application_templates.textile
+- guides/source/plugins.textile
+- guides/source/3_1_release_notes.textile
+- guides/source/routing.textile
 - guides/source/generators.textile
-- guides/source/getting_started.textile
-- guides/source/i18n.textile
-- guides/source/index.html.erb
-- guides/source/initialization.textile
-- guides/source/kindle/copyright.html.erb
-- guides/source/kindle/KINDLE.md
-- guides/source/kindle/layout.html.erb
-- guides/source/kindle/rails_guides.opf.erb
-- guides/source/kindle/toc.html.erb
-- guides/source/kindle/toc.ncx.erb
-- guides/source/kindle/welcome.html.erb
-- guides/source/layout.html.erb
-- guides/source/layouts_and_rendering.textile
+- guides/source/2_2_release_notes.textile
+- guides/source/association_basics.textile
+- guides/source/active_record_validations_callbacks.textile
+- guides/source/testing.textile
+- guides/source/asset_pipeline.textile
+- guides/source/_license.html.erb
+- guides/source/active_support_core_extensions.textile
+- guides/source/rails_on_rack.textile
+- guides/source/credits.html.erb
+- guides/source/3_2_release_notes.textile
 - guides/source/migrations.textile
-- guides/source/nested_model_forms.textile
+- guides/source/active_record_basics.textile
+- guides/source/layout.html.erb
+- guides/source/active_record_querying.textile
+- guides/source/3_0_release_notes.textile
+- guides/source/contributing_to_ruby_on_rails.textile
 - guides/source/performance_testing.textile
-- guides/source/plugins.textile
-- guides/source/rails_application_templates.textile
-- guides/source/rails_on_rack.textile
-- guides/source/routing.textile
 - guides/source/ruby_on_rails_guides_guidelines.textile
-- guides/source/security.textile
-- guides/source/testing.textile
-- guides/w3c_validator.rb
-- lib/rails/all.rb
-- lib/rails/application/bootstrap.rb
-- lib/rails/application/configuration.rb
-- lib/rails/application/finisher.rb
-- lib/rails/application/railties.rb
-- lib/rails/application/route_inspector.rb
-- lib/rails/application/routes_reloader.rb
-- lib/rails/application.rb
-- lib/rails/backtrace_cleaner.rb
-- lib/rails/cli.rb
-- lib/rails/code_statistics.rb
-- lib/rails/commands/application.rb
+- guides/source/caching_with_rails.textile
+- guides/source/debugging_rails_applications.textile
+- guides/code/getting_started/db/seeds.rb
+- guides/code/getting_started/db/schema.rb
+- guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
+- guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
+- guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
+- guides/code/getting_started/script/rails
+- guides/code/getting_started/doc/README_FOR_APP
+- guides/code/getting_started/test/performance/browsing_test.rb
+- guides/code/getting_started/test/test_helper.rb
+- guides/code/getting_started/test/unit/tag_test.rb
+- guides/code/getting_started/test/unit/comment_test.rb
+- guides/code/getting_started/test/unit/post_test.rb
+- guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
+- guides/code/getting_started/test/unit/helpers/home_helper_test.rb
+- guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
+- guides/code/getting_started/test/functional/comments_controller_test.rb
+- guides/code/getting_started/test/functional/posts_controller_test.rb
+- guides/code/getting_started/test/functional/home_controller_test.rb
+- guides/code/getting_started/test/fixtures/tags.yml
+- guides/code/getting_started/test/fixtures/comments.yml
+- guides/code/getting_started/test/fixtures/posts.yml
+- guides/code/getting_started/Rakefile
+- guides/code/getting_started/app/assets/stylesheets/posts.css.scss
+- guides/code/getting_started/app/assets/stylesheets/application.css
+- guides/code/getting_started/app/assets/stylesheets/home.css.scss
+- guides/code/getting_started/app/assets/stylesheets/comments.css.scss
+- guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
+- guides/code/getting_started/app/assets/images/rails.png
+- guides/code/getting_started/app/assets/javascripts/posts.js.coffee
+- guides/code/getting_started/app/assets/javascripts/application.js
+- guides/code/getting_started/app/assets/javascripts/comments.js.coffee
+- guides/code/getting_started/app/assets/javascripts/home.js.coffee
+- guides/code/getting_started/app/controllers/home_controller.rb
+- guides/code/getting_started/app/controllers/application_controller.rb
+- guides/code/getting_started/app/controllers/posts_controller.rb
+- guides/code/getting_started/app/controllers/comments_controller.rb
+- guides/code/getting_started/app/views/layouts/application.html.erb
+- guides/code/getting_started/app/views/home/index.html.erb
+- guides/code/getting_started/app/views/comments/_comment.html.erb
+- guides/code/getting_started/app/views/comments/_form.html.erb
+- guides/code/getting_started/app/views/tags/_form.html.erb
+- guides/code/getting_started/app/views/posts/index.html.erb
+- guides/code/getting_started/app/views/posts/edit.html.erb
+- guides/code/getting_started/app/views/posts/show.html.erb
+- guides/code/getting_started/app/views/posts/new.html.erb
+- guides/code/getting_started/app/views/posts/_form.html.erb
+- guides/code/getting_started/app/models/comment.rb
+- guides/code/getting_started/app/models/tag.rb
+- guides/code/getting_started/app/models/post.rb
+- guides/code/getting_started/app/helpers/application_helper.rb
+- guides/code/getting_started/app/helpers/comments_helper.rb
+- guides/code/getting_started/app/helpers/posts_helper.rb
+- guides/code/getting_started/app/helpers/home_helper.rb
+- guides/code/getting_started/README.rdoc
+- guides/code/getting_started/public/favicon.ico
+- guides/code/getting_started/public/500.html
+- guides/code/getting_started/public/422.html
+- guides/code/getting_started/public/robots.txt
+- guides/code/getting_started/public/404.html
+- guides/code/getting_started/config/initializers/mime_types.rb
+- guides/code/getting_started/config/initializers/session_store.rb
+- guides/code/getting_started/config/initializers/secret_token.rb
+- guides/code/getting_started/config/initializers/inflections.rb
+- guides/code/getting_started/config/initializers/backtrace_silencers.rb
+- guides/code/getting_started/config/initializers/wrap_parameters.rb
+- guides/code/getting_started/config/environments/production.rb
+- guides/code/getting_started/config/environments/test.rb
+- guides/code/getting_started/config/environments/development.rb
+- guides/code/getting_started/config/routes.rb
+- guides/code/getting_started/config/application.rb
+- guides/code/getting_started/config/locales/en.yml
+- guides/code/getting_started/config/boot.rb
+- guides/code/getting_started/config/database.yml
+- guides/code/getting_started/config/environment.rb
+- guides/code/getting_started/Gemfile
+- guides/code/getting_started/config.ru
+- guides/rails_guides.rb
+- lib/rails.rb
+- lib/rails/engine/railties.rb
+- lib/rails/engine/configuration.rb
+- lib/rails/engine/commands.rb
+- lib/rails/engine.rb
+- lib/rails/railtie.rb
+- lib/rails/console/app.rb
+- lib/rails/console/helpers.rb
 - lib/rails/commands/benchmarker.rb
-- lib/rails/commands/console.rb
-- lib/rails/commands/dbconsole.rb
-- lib/rails/commands/destroy.rb
-- lib/rails/commands/generate.rb
-- lib/rails/commands/plugin.rb
+- lib/rails/commands/server.rb
 - lib/rails/commands/plugin_new.rb
+- lib/rails/commands/application.rb
+- lib/rails/commands/generate.rb
 - lib/rails/commands/profiler.rb
 - lib/rails/commands/runner.rb
-- lib/rails/commands/server.rb
+- lib/rails/commands/dbconsole.rb
 - lib/rails/commands/update.rb
-- lib/rails/commands.rb
+- lib/rails/commands/plugin.rb
+- lib/rails/commands/console.rb
+- lib/rails/commands/destroy.rb
+- lib/rails/initializable.rb
+- lib/rails/tasks.rb
+- lib/rails/code_statistics.rb
+- lib/rails/all.rb
 - lib/rails/configuration.rb
-- lib/rails/console/app.rb
-- lib/rails/console/helpers.rb
-- lib/rails/engine/commands.rb
-- lib/rails/engine/configuration.rb
-- lib/rails/engine/railties.rb
-- lib/rails/engine.rb
-- lib/rails/generators/actions.rb
-- lib/rails/generators/active_model.rb
-- lib/rails/generators/app_base.rb
-- lib/rails/generators/base.rb
-- lib/rails/generators/css/assets/assets_generator.rb
-- lib/rails/generators/css/assets/templates/stylesheet.css
-- lib/rails/generators/css/scaffold/scaffold_generator.rb
-- lib/rails/generators/erb/controller/controller_generator.rb
-- lib/rails/generators/erb/controller/templates/view.html.erb
+- lib/rails/info.rb
+- lib/rails/backtrace_cleaner.rb
 - lib/rails/generators/erb/mailer/mailer_generator.rb
 - lib/rails/generators/erb/mailer/templates/view.text.erb
 - lib/rails/generators/erb/scaffold/scaffold_generator.rb
-- lib/rails/generators/erb/scaffold/templates/_form.html.erb
-- lib/rails/generators/erb/scaffold/templates/edit.html.erb
 - lib/rails/generators/erb/scaffold/templates/index.html.erb
-- lib/rails/generators/erb/scaffold/templates/new.html.erb
+- lib/rails/generators/erb/scaffold/templates/edit.html.erb
 - lib/rails/generators/erb/scaffold/templates/show.html.erb
+- lib/rails/generators/erb/scaffold/templates/new.html.erb
+- lib/rails/generators/erb/scaffold/templates/_form.html.erb
+- lib/rails/generators/erb/controller/controller_generator.rb
+- lib/rails/generators/erb/controller/templates/view.html.erb
+- lib/rails/generators/resource_helpers.rb
+- lib/rails/generators/test_case.rb
 - lib/rails/generators/erb.rb
-- lib/rails/generators/generated_attribute.rb
 - lib/rails/generators/js/assets/assets_generator.rb
 - lib/rails/generators/js/assets/templates/javascript.js
-- lib/rails/generators/migration.rb
+- lib/rails/generators/base.rb
+- lib/rails/generators/app_base.rb
+- lib/rails/generators/test_unit/observer/observer_generator.rb
+- lib/rails/generators/test_unit/observer/templates/unit_test.rb
+- lib/rails/generators/test_unit/performance/performance_generator.rb
+- lib/rails/generators/test_unit/performance/templates/performance_test.rb
+- lib/rails/generators/test_unit/mailer/mailer_generator.rb
+- lib/rails/generators/test_unit/mailer/templates/functional_test.rb
+- lib/rails/generators/test_unit/helper/helper_generator.rb
+- lib/rails/generators/test_unit/helper/templates/helper_test.rb
+- lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+- lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+- lib/rails/generators/test_unit/plugin/plugin_generator.rb
+- lib/rails/generators/test_unit/plugin/templates/test_helper.rb
+- lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
+- lib/rails/generators/test_unit/integration/integration_generator.rb
+- lib/rails/generators/test_unit/integration/templates/integration_test.rb
+- lib/rails/generators/test_unit/model/model_generator.rb
+- lib/rails/generators/test_unit/model/templates/unit_test.rb
+- lib/rails/generators/test_unit/model/templates/fixtures.yml
+- lib/rails/generators/test_unit/controller/controller_generator.rb
+- lib/rails/generators/test_unit/controller/templates/functional_test.rb
+- lib/rails/generators/generated_attribute.rb
+- lib/rails/generators/active_model.rb
 - lib/rails/generators/named_base.rb
+- lib/rails/generators/rails/observer/observer_generator.rb
+- lib/rails/generators/rails/observer/USAGE
+- lib/rails/generators/rails/integration_test/integration_test_generator.rb
+- lib/rails/generators/rails/integration_test/USAGE
+- lib/rails/generators/rails/performance_test/USAGE
+- lib/rails/generators/rails/performance_test/performance_test_generator.rb
+- lib/rails/generators/rails/assets/assets_generator.rb
+- lib/rails/generators/rails/assets/USAGE
+- lib/rails/generators/rails/assets/templates/javascript.js
+- lib/rails/generators/rails/assets/templates/stylesheet.css
+- lib/rails/generators/rails/resource/USAGE
+- lib/rails/generators/rails/resource/resource_generator.rb
+- lib/rails/generators/rails/helper/helper_generator.rb
+- lib/rails/generators/rails/helper/USAGE
+- lib/rails/generators/rails/helper/templates/helper.rb
+- lib/rails/generators/rails/scaffold/USAGE
+- lib/rails/generators/rails/scaffold/scaffold_generator.rb
+- lib/rails/generators/rails/scaffold/templates/scaffold.css
+- lib/rails/generators/rails/task/USAGE
+- lib/rails/generators/rails/task/task_generator.rb
+- lib/rails/generators/rails/task/templates/task.rb
+- lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+- lib/rails/generators/rails/scaffold_controller/USAGE
+- lib/rails/generators/rails/scaffold_controller/templates/controller.rb
 - lib/rails/generators/rails/app/app_generator.rb
+- lib/rails/generators/rails/app/USAGE
+- lib/rails/generators/rails/app/templates/README
+- lib/rails/generators/rails/app/templates/db/seeds.rb.tt
+- lib/rails/generators/rails/app/templates/script/rails
+- lib/rails/generators/rails/app/templates/doc/README_FOR_APP
+- lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
+- lib/rails/generators/rails/app/templates/test/test_helper.rb
+- lib/rails/generators/rails/app/templates/gitignore
+- lib/rails/generators/rails/app/templates/Rakefile
+- lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/assets/images/rails.png
 - lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
-- lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
-- lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb
 - lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+- lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb
+- lib/rails/generators/rails/app/templates/public/favicon.ico
+- lib/rails/generators/rails/app/templates/public/500.html
+- lib/rails/generators/rails/app/templates/public/422.html
+- lib/rails/generators/rails/app/templates/public/index.html
+- lib/rails/generators/rails/app/templates/public/robots.txt
+- lib/rails/generators/rails/app/templates/public/404.html
+- lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
+- lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
+- lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
+- lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
+- lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+- lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+- lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+- lib/rails/generators/rails/app/templates/config/routes.rb
 - lib/rails/generators/rails/app/templates/config/application.rb
+- lib/rails/generators/rails/app/templates/config/locales/en.yml
 - lib/rails/generators/rails/app/templates/config/boot.rb
-- lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
+- lib/rails/generators/rails/app/templates/config/environment.rb
 - lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
-- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
-- lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
-- lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
-- lib/rails/generators/rails/app/templates/config/databases/mysql.yml
-- lib/rails/generators/rails/app/templates/config/databases/oracle.yml
 - lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
+- lib/rails/generators/rails/app/templates/config/databases/oracle.yml
 - lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
-- lib/rails/generators/rails/app/templates/config/environment.rb
-- lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
-- lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
-- lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
-- lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
-- lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
-- lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
-- lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
-- lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
-- lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
-- lib/rails/generators/rails/app/templates/config/locales/en.yml
-- lib/rails/generators/rails/app/templates/config/routes.rb
-- lib/rails/generators/rails/app/templates/config.ru
-- lib/rails/generators/rails/app/templates/db/seeds.rb.tt
-- lib/rails/generators/rails/app/templates/doc/README_FOR_APP
+- lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+- lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
 - lib/rails/generators/rails/app/templates/Gemfile
-- lib/rails/generators/rails/app/templates/gitignore
-- lib/rails/generators/rails/app/templates/public/404.html
-- lib/rails/generators/rails/app/templates/public/422.html
-- lib/rails/generators/rails/app/templates/public/500.html
-- lib/rails/generators/rails/app/templates/public/favicon.ico
-- lib/rails/generators/rails/app/templates/public/index.html
-- lib/rails/generators/rails/app/templates/public/robots.txt
-- lib/rails/generators/rails/app/templates/Rakefile
-- lib/rails/generators/rails/app/templates/README
-- lib/rails/generators/rails/app/templates/script/rails
-- lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
-- lib/rails/generators/rails/app/templates/test/test_helper.rb
-- lib/rails/generators/rails/app/USAGE
-- lib/rails/generators/rails/assets/assets_generator.rb
-- lib/rails/generators/rails/assets/templates/javascript.js
-- lib/rails/generators/rails/assets/templates/stylesheet.css
-- lib/rails/generators/rails/assets/USAGE
-- lib/rails/generators/rails/controller/controller_generator.rb
-- lib/rails/generators/rails/controller/templates/controller.rb
-- lib/rails/generators/rails/controller/USAGE
+- lib/rails/generators/rails/app/templates/config.ru
+- lib/rails/generators/rails/model/model_generator.rb
+- lib/rails/generators/rails/model/USAGE
+- lib/rails/generators/rails/session_migration/session_migration_generator.rb
+- lib/rails/generators/rails/session_migration/USAGE
 - lib/rails/generators/rails/generator/generator_generator.rb
-- lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
-- lib/rails/generators/rails/generator/templates/USAGE.tt
 - lib/rails/generators/rails/generator/USAGE
-- lib/rails/generators/rails/helper/helper_generator.rb
-- lib/rails/generators/rails/helper/templates/helper.rb
-- lib/rails/generators/rails/helper/USAGE
-- lib/rails/generators/rails/integration_test/integration_test_generator.rb
-- lib/rails/generators/rails/integration_test/USAGE
+- lib/rails/generators/rails/generator/templates/USAGE.tt
+- lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
+- lib/rails/generators/rails/controller/controller_generator.rb
+- lib/rails/generators/rails/controller/USAGE
+- lib/rails/generators/rails/controller/templates/controller.rb
 - lib/rails/generators/rails/migration/migration_generator.rb
 - lib/rails/generators/rails/migration/USAGE
-- lib/rails/generators/rails/model/model_generator.rb
-- lib/rails/generators/rails/model/USAGE
-- lib/rails/generators/rails/observer/observer_generator.rb
-- lib/rails/generators/rails/observer/USAGE
-- lib/rails/generators/rails/performance_test/performance_test_generator.rb
-- lib/rails/generators/rails/performance_test/USAGE
 - lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
-- lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
-- lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
-- lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
-- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
-- lib/rails/generators/rails/plugin_new/templates/config/routes.rb
-- lib/rails/generators/rails/plugin_new/templates/Gemfile
-- lib/rails/generators/rails/plugin_new/templates/gitignore
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
+- lib/rails/generators/rails/plugin_new/USAGE
 - lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb
 - lib/rails/generators/rails/plugin_new/templates/lib/tasks/%name%_tasks.rake
-- lib/rails/generators/rails/plugin_new/templates/MIT-LICENSE
-- lib/rails/generators/rails/plugin_new/templates/rails/application.rb
-- lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
-- lib/rails/generators/rails/plugin_new/templates/rails/routes.rb
-- lib/rails/generators/rails/plugin_new/templates/Rakefile
-- lib/rails/generators/rails/plugin_new/templates/README.rdoc
+- lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
+- lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
 - lib/rails/generators/rails/plugin_new/templates/script/rails.tt
+- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
 - lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
 - lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
-- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
-- lib/rails/generators/rails/plugin_new/USAGE
-- lib/rails/generators/rails/resource/resource_generator.rb
-- lib/rails/generators/rails/resource/USAGE
-- lib/rails/generators/rails/scaffold/scaffold_generator.rb
-- lib/rails/generators/rails/scaffold/templates/scaffold.css
-- lib/rails/generators/rails/scaffold/USAGE
-- lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
-- lib/rails/generators/rails/scaffold_controller/templates/controller.rb
-- lib/rails/generators/rails/scaffold_controller/USAGE
-- lib/rails/generators/rails/session_migration/session_migration_generator.rb
-- lib/rails/generators/rails/session_migration/USAGE
-- lib/rails/generators/rails/task/task_generator.rb
-- lib/rails/generators/rails/task/templates/task.rb
-- lib/rails/generators/rails/task/USAGE
-- lib/rails/generators/resource_helpers.rb
-- lib/rails/generators/test_case.rb
-- lib/rails/generators/test_unit/controller/controller_generator.rb
-- lib/rails/generators/test_unit/controller/templates/functional_test.rb
-- lib/rails/generators/test_unit/helper/helper_generator.rb
-- lib/rails/generators/test_unit/helper/templates/helper_test.rb
-- lib/rails/generators/test_unit/integration/integration_generator.rb
-- lib/rails/generators/test_unit/integration/templates/integration_test.rb
-- lib/rails/generators/test_unit/mailer/mailer_generator.rb
-- lib/rails/generators/test_unit/mailer/templates/functional_test.rb
-- lib/rails/generators/test_unit/model/model_generator.rb
-- lib/rails/generators/test_unit/model/templates/fixtures.yml
-- lib/rails/generators/test_unit/model/templates/unit_test.rb
-- lib/rails/generators/test_unit/observer/observer_generator.rb
-- lib/rails/generators/test_unit/observer/templates/unit_test.rb
-- lib/rails/generators/test_unit/performance/performance_generator.rb
-- lib/rails/generators/test_unit/performance/templates/performance_test.rb
-- lib/rails/generators/test_unit/plugin/plugin_generator.rb
-- lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
-- lib/rails/generators/test_unit/plugin/templates/test_helper.rb
-- lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
-- lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+- lib/rails/generators/rails/plugin_new/templates/MIT-LICENSE
+- lib/rails/generators/rails/plugin_new/templates/gitignore
+- lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+- lib/rails/generators/rails/plugin_new/templates/Rakefile
+- lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
+- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+- lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
+- lib/rails/generators/rails/plugin_new/templates/README.rdoc
+- lib/rails/generators/rails/plugin_new/templates/rails/routes.rb
+- lib/rails/generators/rails/plugin_new/templates/rails/application.rb
+- lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
+- lib/rails/generators/rails/plugin_new/templates/config/routes.rb
+- lib/rails/generators/rails/plugin_new/templates/Gemfile
+- lib/rails/generators/css/assets/assets_generator.rb
+- lib/rails/generators/css/assets/templates/stylesheet.css
+- lib/rails/generators/css/scaffold/scaffold_generator.rb
+- lib/rails/generators/actions.rb
 - lib/rails/generators/test_unit.rb
+- lib/rails/generators/migration.rb
+- lib/rails/application.rb
+- lib/rails/rubyprof_ext.rb
 - lib/rails/generators.rb
-- lib/rails/info.rb
-- lib/rails/info_controller.rb
-- lib/rails/initializable.rb
+- lib/rails/test_unit/railtie.rb
+- lib/rails/test_unit/sub_test_task.rb
+- lib/rails/test_unit/testing.rake
+- lib/rails/tasks/engine.rake
+- lib/rails/tasks/documentation.rake
+- lib/rails/tasks/routes.rake
+- lib/rails/tasks/misc.rake
+- lib/rails/tasks/tmp.rake
+- lib/rails/tasks/log.rake
+- lib/rails/tasks/annotations.rake
+- lib/rails/tasks/statistics.rake
+- lib/rails/tasks/middleware.rake
+- lib/rails/tasks/framework.rake
+- lib/rails/application/finisher.rb
+- lib/rails/application/railties.rb
+- lib/rails/application/configuration.rb
+- lib/rails/application/route_inspector.rb
+- lib/rails/application/routes_reloader.rb
+- lib/rails/application/bootstrap.rb
 - lib/rails/paths.rb
-- lib/rails/performance_test_help.rb
-- lib/rails/plugin.rb
-- lib/rails/rack/debugger.rb
-- lib/rails/rack/log_tailer.rb
-- lib/rails/rack/logger.rb
+- lib/rails/info_controller.rb
 - lib/rails/rack.rb
-- lib/rails/railtie/configurable.rb
-- lib/rails/railtie/configuration.rb
-- lib/rails/railtie.rb
+- lib/rails/version.rb
 - lib/rails/ruby_version_check.rb
-- lib/rails/rubyprof_ext.rb
-- lib/rails/script_rails_loader.rb
+- lib/rails/rack/logger.rb
+- lib/rails/rack/log_tailer.rb
+- lib/rails/rack/debugger.rb
+- lib/rails/railtie/configuration.rb
+- lib/rails/railtie/configurable.rb
+- lib/rails/cli.rb
 - lib/rails/source_annotation_extractor.rb
-- lib/rails/tasks/annotations.rake
-- lib/rails/tasks/documentation.rake
-- lib/rails/tasks/engine.rake
-- lib/rails/tasks/framework.rake
-- lib/rails/tasks/log.rake
-- lib/rails/tasks/middleware.rake
-- lib/rails/tasks/misc.rake
-- lib/rails/tasks/routes.rake
-- lib/rails/tasks/statistics.rake
-- lib/rails/tasks/tmp.rake
-- lib/rails/tasks.rb
+- lib/rails/performance_test_help.rb
+- lib/rails/commands.rb
+- lib/rails/plugin.rb
 - lib/rails/test_help.rb
-- lib/rails/test_unit/railtie.rb
-- lib/rails/test_unit/sub_test_task.rb
-- lib/rails/test_unit/testing.rake
-- lib/rails/version.rb
-- lib/rails.rb
+- lib/rails/script_rails_loader.rb
+- lib/rails/generators/rails/app/templates/test/unit/.empty_directory
+- lib/rails/generators/rails/app/templates/test/functional/.empty_directory
+- lib/rails/generators/rails/app/templates/test/integration/.empty_directory
+- lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory
 - lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
 - lib/rails/generators/rails/app/templates/app/models/.empty_directory
 - lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory
-- lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory
-- lib/rails/generators/rails/app/templates/test/functional/.empty_directory
-- lib/rails/generators/rails/app/templates/test/integration/.empty_directory
-- lib/rails/generators/rails/app/templates/test/unit/.empty_directory
 - lib/rails/generators/rails/generator/templates/templates/.empty_directory
 - lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
 - lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --exclude
 - .
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
+