RubyGems - rails - Versions diffs - 4.1.16 → 4.2.0 - Mend

rails 4.1.16 → 4.2.0

Files changed (143) hide show

checksums.yaml +4 -4
data/README.md +12 -10
data/guides/CHANGELOG.md +15 -100
data/guides/Rakefile +5 -3
data/guides/assets/javascripts/guides.js +6 -0
data/guides/assets/stylesheets/main.css +4 -1
data/guides/bug_report_templates/action_controller_master.rb +1 -0
data/guides/rails_guides/helpers.rb +1 -1
data/guides/rails_guides/levenshtein.rb +29 -21
data/guides/rails_guides/markdown/renderer.rb +1 -1
data/guides/rails_guides/markdown.rb +11 -7
data/guides/rails_guides.rb +2 -2
data/guides/source/2_2_release_notes.md +1 -1
data/guides/source/2_3_release_notes.md +4 -4
data/guides/source/3_0_release_notes.md +8 -8
data/guides/source/3_1_release_notes.md +6 -3
data/guides/source/3_2_release_notes.md +6 -3
data/guides/source/4_0_release_notes.md +6 -3
data/guides/source/4_1_release_notes.md +5 -6
data/guides/source/4_2_release_notes.md +850 -0
data/guides/source/_license.html.erb +1 -1
data/guides/source/_welcome.html.erb +2 -8
data/guides/source/action_controller_overview.md +81 -7
data/guides/source/action_mailer_basics.md +91 -28
data/guides/source/action_view_overview.md +148 -130
data/guides/source/active_job_basics.md +318 -0
data/guides/source/active_model_basics.md +371 -17
data/guides/source/active_record_basics.md +19 -18
data/guides/source/active_record_callbacks.md +12 -9
data/guides/source/{migrations.md → active_record_migrations.md} +95 -220
data/guides/source/active_record_postgresql.md +433 -0
data/guides/source/active_record_querying.md +263 -265
data/guides/source/active_record_validations.md +20 -11
data/guides/source/active_support_core_extensions.md +159 -72
data/guides/source/active_support_instrumentation.md +10 -7
data/guides/source/api_documentation_guidelines.md +62 -16
data/guides/source/asset_pipeline.md +258 -63
data/guides/source/association_basics.md +81 -74
data/guides/source/caching_with_rails.md +32 -7
data/guides/source/command_line.md +52 -30
data/guides/source/configuring.md +132 -29
data/guides/source/constant_autoloading_and_reloading.md +1297 -0
data/guides/source/contributing_to_ruby_on_rails.md +192 -112
data/guides/source/credits.html.erb +2 -2
data/guides/source/debugging_rails_applications.md +440 -286
data/guides/source/development_dependencies_install.md +47 -36
data/guides/source/documents.yaml +19 -7
data/guides/source/engines.md +182 -182
data/guides/source/form_helpers.md +79 -56
data/guides/source/generators.md +24 -11
data/guides/source/getting_started.md +337 -198
data/guides/source/i18n.md +108 -65
data/guides/source/index.html.erb +1 -0
data/guides/source/initialization.md +108 -61
data/guides/source/layout.html.erb +1 -4
data/guides/source/layouts_and_rendering.md +27 -25
data/guides/source/maintenance_policy.md +6 -3
data/guides/source/nested_model_forms.md +7 -4
data/guides/source/plugins.md +27 -27
data/guides/source/rails_application_templates.md +21 -3
data/guides/source/rails_on_rack.md +8 -4
data/guides/source/routing.md +98 -72
data/guides/source/ruby_on_rails_guides_guidelines.md +11 -12
data/guides/source/security.md +38 -32
data/guides/source/testing.md +188 -117
data/guides/source/upgrading_ruby_on_rails.md +254 -28
data/guides/source/working_with_javascript_in_rails.md +18 -16
data/guides/w3c_validator.rb +2 -0
metadata +40 -96
data/guides/bug_report_templates/generic_gem.rb +0 -15
data/guides/bug_report_templates/generic_master.rb +0 -26
data/guides/code/getting_started/Gemfile +0 -40
data/guides/code/getting_started/Gemfile.lock +0 -125
data/guides/code/getting_started/README.rdoc +0 -28
data/guides/code/getting_started/Rakefile +0 -6
data/guides/code/getting_started/app/assets/javascripts/application.js +0 -15
data/guides/code/getting_started/app/assets/javascripts/comments.js.coffee +0 -3
data/guides/code/getting_started/app/assets/javascripts/posts.js.coffee +0 -3
data/guides/code/getting_started/app/assets/javascripts/welcome.js.coffee +0 -3
data/guides/code/getting_started/app/assets/stylesheets/application.css +0 -13
data/guides/code/getting_started/app/assets/stylesheets/comments.css.scss +0 -3
data/guides/code/getting_started/app/assets/stylesheets/posts.css.scss +0 -3
data/guides/code/getting_started/app/assets/stylesheets/welcome.css.scss +0 -3
data/guides/code/getting_started/app/controllers/application_controller.rb +0 -5
data/guides/code/getting_started/app/controllers/comments_controller.rb +0 -23
data/guides/code/getting_started/app/controllers/posts_controller.rb +0 -53
data/guides/code/getting_started/app/controllers/welcome_controller.rb +0 -4
data/guides/code/getting_started/app/helpers/application_helper.rb +0 -2
data/guides/code/getting_started/app/helpers/comments_helper.rb +0 -2
data/guides/code/getting_started/app/helpers/posts_helper.rb +0 -2
data/guides/code/getting_started/app/helpers/welcome_helper.rb +0 -2
data/guides/code/getting_started/app/models/comment.rb +0 -3
data/guides/code/getting_started/app/models/post.rb +0 -7
data/guides/code/getting_started/app/views/comments/_comment.html.erb +0 -15
data/guides/code/getting_started/app/views/comments/_form.html.erb +0 -13
data/guides/code/getting_started/app/views/layouts/application.html.erb +0 -14
data/guides/code/getting_started/app/views/posts/_form.html.erb +0 -27
data/guides/code/getting_started/app/views/posts/edit.html.erb +0 -5
data/guides/code/getting_started/app/views/posts/index.html.erb +0 -21
data/guides/code/getting_started/app/views/posts/new.html.erb +0 -5
data/guides/code/getting_started/app/views/posts/show.html.erb +0 -18
data/guides/code/getting_started/app/views/welcome/index.html.erb +0 -4
data/guides/code/getting_started/bin/bundle +0 -4
data/guides/code/getting_started/bin/rails +0 -4
data/guides/code/getting_started/bin/rake +0 -4
data/guides/code/getting_started/config/application.rb +0 -18
data/guides/code/getting_started/config/boot.rb +0 -4
data/guides/code/getting_started/config/database.yml +0 -25
data/guides/code/getting_started/config/environment.rb +0 -5
data/guides/code/getting_started/config/environments/development.rb +0 -30
data/guides/code/getting_started/config/environments/production.rb +0 -80
data/guides/code/getting_started/config/environments/test.rb +0 -36
data/guides/code/getting_started/config/initializers/backtrace_silencers.rb +0 -7
data/guides/code/getting_started/config/initializers/filter_parameter_logging.rb +0 -4
data/guides/code/getting_started/config/initializers/inflections.rb +0 -16
data/guides/code/getting_started/config/initializers/locale.rb +0 -9
data/guides/code/getting_started/config/initializers/mime_types.rb +0 -5
data/guides/code/getting_started/config/initializers/secret_token.rb +0 -12
data/guides/code/getting_started/config/initializers/session_store.rb +0 -3
data/guides/code/getting_started/config/initializers/wrap_parameters.rb +0 -14
data/guides/code/getting_started/config/locales/en.yml +0 -23
data/guides/code/getting_started/config/routes.rb +0 -7
data/guides/code/getting_started/config.ru +0 -4
data/guides/code/getting_started/db/migrate/20130122042648_create_posts.rb +0 -10
data/guides/code/getting_started/db/migrate/20130122045842_create_comments.rb +0 -11
data/guides/code/getting_started/db/schema.rb +0 -33
data/guides/code/getting_started/db/seeds.rb +0 -7
data/guides/code/getting_started/public/404.html +0 -60
data/guides/code/getting_started/public/422.html +0 -60
data/guides/code/getting_started/public/500.html +0 -59
data/guides/code/getting_started/public/favicon.ico +0 -0
data/guides/code/getting_started/public/robots.txt +0 -5
data/guides/code/getting_started/test/controllers/comments_controller_test.rb +0 -7
data/guides/code/getting_started/test/controllers/posts_controller_test.rb +0 -7
data/guides/code/getting_started/test/controllers/welcome_controller_test.rb +0 -9
data/guides/code/getting_started/test/fixtures/comments.yml +0 -11
data/guides/code/getting_started/test/fixtures/posts.yml +0 -9
data/guides/code/getting_started/test/helpers/comments_helper_test.rb +0 -4
data/guides/code/getting_started/test/helpers/posts_helper_test.rb +0 -4
data/guides/code/getting_started/test/helpers/welcome_helper_test.rb +0 -4
data/guides/code/getting_started/test/models/comment_test.rb +0 -7
data/guides/code/getting_started/test/models/post_test.rb +0 -7
data/guides/code/getting_started/test/test_helper.rb +0 -12

data/guides/source/layout.html.erb CHANGED Viewed

@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -36,7 +35,6 @@
         <li class="more-info"><a href="https://github.com/rails/rails">Code</a></li>
         <li class="more-info"><a href="http://rubyonrails.org/screencasts">Screencasts</a></li>
         <li class="more-info"><a href="http://rubyonrails.org/documentation">Documentation</a></li>
-        <li class="more-info"><a href="http://rubyonrails.org/ecosystem">Ecosystem</a></li>
         <li class="more-info"><a href="http://rubyonrails.org/community">Community</a></li>
         <li class="more-info"><a href="http://weblog.rubyonrails.org/">Blog</a></li>
       </ul>
@@ -78,7 +76,6 @@
           </select>
         </li>
       </ul>
-      </div>
     </div>
   </div>
   <hr class="hide" />

data/guides/source/layouts_and_rendering.md CHANGED Viewed

@@ -175,22 +175,23 @@ render template: "products/show"
 #### Rendering an Arbitrary File
-The `render` method can also use a view that's entirely outside of your application:
+The `render` method can also use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications):
 ```ruby
-render file: "/u/apps/warehouse_app/current/app/views/products/show"
+render "/u/apps/warehouse_app/current/app/views/products/show"
 ```
-The `:file` option takes an absolute file-system path. Of course, you need to have rights
-to the view that you're using to render the content.
+Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the `:file` option (which was required on Rails 2.2 and earlier):
+```ruby
+render file: "/u/apps/warehouse_app/current/app/views/products/show"
+```
-NOTE: Using the `:file` option in combination with users input can lead to security problems
-since an attacker could use this action to access security sensitive files in your file system.
+The `:file` option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
-NOTE: By default, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the `layout: true` option.
+NOTE: By default, the file is rendered using the current layout.
-TIP: If you're running Rails on Microsoft Windows, you should use the `:file` option to
-render a file, because Windows filenames do not have the same format as Unix filenames.
+TIP: If you're running Rails on Microsoft Windows, you should use the `:file` option to render a file, because Windows filenames do not have the same format as Unix filenames.
 #### Wrapping it up
@@ -247,7 +248,8 @@ service requests that are expecting something other than proper HTML.
 NOTE: By default, if you use the `:plain` option, the text is rendered without
 using the current layout. If you want Rails to put the text into the current
-layout, you need to add the `layout: true` option.
+layout, you need to add the `layout: true` option and use the `.txt.erb`
+extension for the layout file.
 #### Rendering HTML
@@ -262,7 +264,7 @@ TIP: This is useful when you're rendering a small snippet of HTML code.
 However, you might want to consider moving it to a template file if the markup
 is complex.
-NOTE: This option will escape HTML entities if the string is not html safe.
+NOTE: This option will escape HTML entities if the string is not HTML safe.
 #### Rendering JSON
@@ -307,7 +309,7 @@ TIP: This option should be used only if you don't care about the content type of
 the response. Using `:plain` or `:html` might be more appropriate in most of the
 time.
-NOTE: Unless overriden, your response returned from this render option will be
+NOTE: Unless overridden, your response returned from this render option will be
 `text/html`, as that is the default content type of Action Dispatch response.
 #### Options for `render`
@@ -505,33 +507,33 @@ Layout declarations cascade downward in the hierarchy, and more specific layout
     end
     ```
-* `posts_controller.rb`
+* `articles_controller.rb`
     ```ruby
-    class PostsController < ApplicationController
+    class ArticlesController < ApplicationController
     end
     ```
-* `special_posts_controller.rb`
+* `special_articles_controller.rb`
     ```ruby
-    class SpecialPostsController < PostsController
+    class SpecialArticlesController < ArticlesController
       layout "special"
     end
     ```
-* `old_posts_controller.rb`
+* `old_articles_controller.rb`
     ```ruby
-    class OldPostsController < SpecialPostsController
+    class OldArticlesController < SpecialArticlesController
       layout false
       def show
-        @post = Post.find(params[:id])
+        @article = Article.find(params[:id])
       end
       def index
-        @old_posts = Post.older
+        @old_articles = Article.older
         render layout: "old"
       end
       # ...
@@ -541,10 +543,10 @@ Layout declarations cascade downward in the hierarchy, and more specific layout
 In this application:
 * In general, views will be rendered in the `main` layout
-* `PostsController#index` will use the `main` layout
-* `SpecialPostsController#index` will use the `special` layout
-* `OldPostsController#show` will use no layout at all
-* `OldPostsController#index` will use the `old` layout
+* `ArticlesController#index` will use the `main` layout
+* `SpecialArticlesController#index` will use the `special` layout
+* `OldArticlesController#show` will use no layout at all
+* `OldArticlesController#index` will use the `old` layout
 #### Avoiding Double Render Errors
@@ -902,7 +904,7 @@ You can also specify multiple videos to play by passing an array of videos to th
 This will produce:
 ```erb
-<video><source src="trailer.ogg" /><source src="movie.ogg" /></video>
+<video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
 ```
 #### Linking to Audio Files with the `audio_tag`

data/guides/source/maintenance_policy.md CHANGED Viewed

@@ -39,7 +39,10 @@ Only the latest release series will receive bug fixes. When enough bugs are
 fixed and its deemed worthy to release a new gem, this is the branch it happens
 from.
-**Currently included series:** `4.1.Z`, `4.0.Z`.
+In special situations, where someone from the Core Team agrees to support more series,
+they are included in the list of supported series.
+**Currently included series:** `4.2.Z`, `4.1.Z` (Supported by Rafael França).
 Security Issues
 ---------------
@@ -54,7 +57,7 @@ be built from 1.2.2, and then added to the end of 1-2-stable. This means that
 security releases are easy to upgrade to if you're running the latest version
 of Rails.
-**Currently included series:** `4.1.Z`, `4.0.Z`.
+**Currently included series:** `4.2.Z`, `4.1.Z`.
 Severe Security Issues
 ----------------------
@@ -63,7 +66,7 @@ For severe security issues we will provide new versions as above, and also the
 last major release series will receive patches and new versions. The
 classification of the security issue is judged by the core team.
-**Currently included series:** `4.1.Z`, `4.0.Z`, `3.2.Z`.
+**Currently included series:** `4.2.Z`, `4.1.Z`, `3.2.Z`.
 Unsupported Release Series
 --------------------------

data/guides/source/nested_model_forms.md CHANGED Viewed

@@ -1,4 +1,4 @@
-Rails nested model forms
+Rails Nested Model Forms
 ========================
 Creating a form for a model _and_ its associations can become quite tedious. Therefore Rails provides helpers to assist in dealing with the complexities of generating these forms _and_ the required CRUD operations to create, update, and destroy associations.
@@ -17,9 +17,9 @@ Model setup
 To be able to use the nested model functionality in your forms, the model will need to support some basic operations.
-First of all, it needs to define a writer method for the attribute that corresponds to the association you are building a nested model form for. The `fields_for` form helper will look for this method to decide whether or not a nested model form should be build.
+First of all, it needs to define a writer method for the attribute that corresponds to the association you are building a nested model form for. The `fields_for` form helper will look for this method to decide whether or not a nested model form should be built.
-If the associated object is an array a form builder will be yielded for each object, else only a single form builder will be yielded.
+If the associated object is an array, a form builder will be yielded for each object, else only a single form builder will be yielded.
 Consider a Person model with an associated Address. When asked to yield a nested FormBuilder for the `:address` attribute, the `fields_for` form helper will look for a method on the Person instance named `address_attributes=`.
@@ -54,6 +54,9 @@ class Person < ActiveRecord::Base
 end
 ```
+NOTE: For greater detail on associations see [Active Record Associations](association_basics.html).
+For a complete reference on associations please visit the API documentation for [ActiveRecord::Associations::ClassMethods](http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html).
 ### Custom model
 As you might have inflected from this explanation, you _don't_ necessarily need an ActiveRecord::Base model to use this functionality. The following examples are sufficient to enable the nested model form behavior:
@@ -220,6 +223,6 @@ As you can see it has generated 2 `project name` inputs, one for each new `proje
 You can basically see the `projects_attributes` hash as an array of attribute hashes, one for each model instance.
-NOTE: The reason that `fields_for` constructed a form which would result in a hash instead of an array is that it won't work for any forms nested deeper than one level deep.
+NOTE: The reason that `fields_for` constructed a hash instead of an array is that it won't work for any form nested deeper than one level deep.
 TIP: You _can_ however pass an array to the writer method generated by `accepts_nested_attributes_for` if you're using plain Ruby or some other API access. See (TODO) for more info and example.

data/guides/source/plugins.md CHANGED Viewed

@@ -39,13 +39,13 @@ to run integration tests using a dummy Rails application. Create your
 plugin with the command:
 ```bash
-$ bin/rails plugin new yaffle
+$ rails plugin new yaffle
 ```
 See usage and options by asking for help:
 ```bash
-$ bin/rails plugin --help
+$ rails plugin new --help
 ```
 Testing Your Newly Generated Plugin
@@ -57,7 +57,7 @@ You can navigate to the directory that contains the plugin, run the `bundle inst
 You should see:
 ```bash
-  2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
+  1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
 ```
 This will tell you that everything got generated properly and you are ready to start adding functionality.
@@ -85,19 +85,19 @@ Run `rake` to run the test. This test should fail because we haven't implemented
 ```bash
     1) Error:
-  test_to_squawk_prepends_the_word_squawk(CoreExtTest):
-  NoMethodError: undefined method `to_squawk' for [Hello World](String)
-      test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
+  CoreExtTest#test_to_squawk_prepends_the_word_squawk:
+  NoMethodError: undefined method `to_squawk' for "Hello World":String
+    /path/to/yaffle/test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
 ```
 Great - now you are ready to start development.
-In `lib/yaffle.rb`, add `require "yaffle/core_ext"`:
+In `lib/yaffle.rb`, add `require 'yaffle/core_ext'`:
 ```ruby
 # yaffle/lib/yaffle.rb
-require "yaffle/core_ext"
+require 'yaffle/core_ext'
 module Yaffle
 end
@@ -118,7 +118,7 @@ end
 To test that your method does what it says it does, run the unit tests with `rake` from your plugin directory.
 ```bash
-  3 tests, 3 assertions, 0 failures, 0 errors, 0 skips
+  2 runs, 2 assertions, 0 failures, 0 errors, 0 skips
 ```
 To see this in action, change to the test/dummy directory, fire up a console and start squawking:
@@ -149,7 +149,7 @@ end
 ```ruby
 # yaffle/lib/yaffle.rb
-require "yaffle/core_ext"
+require 'yaffle/core_ext'
 require 'yaffle/acts_as_yaffle'
 module Yaffle
@@ -196,16 +196,16 @@ When you run `rake`, you should see the following:
 ```
     1) Error:
-  test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
+  ActsAsYaffleTest#test_a_hickwalls_yaffle_text_field_should_be_last_squawk:
   NameError: uninitialized constant ActsAsYaffleTest::Hickwall
-      test/acts_as_yaffle_test.rb:6:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
+    /path/to/yaffle/test/acts_as_yaffle_test.rb:6:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
     2) Error:
-  test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
+  ActsAsYaffleTest#test_a_wickwalls_yaffle_text_field_should_be_last_tweet:
   NameError: uninitialized constant ActsAsYaffleTest::Wickwall
-      test/acts_as_yaffle_test.rb:10:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
+    /path/to/yaffle/test/acts_as_yaffle_test.rb:10:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
-  5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
+  4 runs, 2 assertions, 0 failures, 2 errors, 0 skips
 ```
 This tells us that we don't have the necessary models (Hickwall and Wickwall) that we are trying to test.
@@ -270,18 +270,18 @@ You can then return to the root directory (`cd ../..`) of your plugin and rerun
 ```
     1) Error:
-  test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
-  NoMethodError: undefined method `yaffle_text_field' for #<Class:0x000001016661b8>
-      /Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
-      test/acts_as_yaffle_test.rb:5:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
+  ActsAsYaffleTest#test_a_hickwalls_yaffle_text_field_should_be_last_squawk:
+  NoMethodError: undefined method `yaffle_text_field' for #<Class:0x007fd105e3b218>
+    activerecord (4.1.5) lib/active_record/dynamic_matchers.rb:26:in `method_missing'
+    /path/to/yaffle/test/acts_as_yaffle_test.rb:6:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
     2) Error:
-  test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
-  NoMethodError: undefined method `yaffle_text_field' for #<Class:0x00000101653748>
-      Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
-      test/acts_as_yaffle_test.rb:9:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
+  ActsAsYaffleTest#test_a_wickwalls_yaffle_text_field_should_be_last_tweet:
+  NoMethodError: undefined method `yaffle_text_field' for #<Class:0x007fd105e409c0>
+    activerecord (4.1.5) lib/active_record/dynamic_matchers.rb:26:in `method_missing'
+    /path/to/yaffle/test/acts_as_yaffle_test.rb:10:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
-  5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
+  4 runs, 2 assertions, 0 failures, 2 errors, 0 skips
 ```
@@ -312,7 +312,7 @@ ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
 When you run `rake`, you should see the tests all pass:
 ```bash
-  5 tests, 5 assertions, 0 failures, 0 errors, 0 skips
+  4 runs, 4 assertions, 0 failures, 0 errors, 0 skips
 ```
 ### Add an Instance Method
@@ -386,7 +386,7 @@ ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
 Run `rake` one final time and you should see:
 ```
-  7 tests, 7 assertions, 0 failures, 0 errors, 0 skips
+  6 runs, 6 assertions, 0 failures, 0 errors, 0 skips
 ```
 NOTE: The use of `write_attribute` to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use. For example, you could also use:
@@ -440,5 +440,5 @@ $ bin/rake rdoc
 * [Developing a RubyGem using Bundler](https://github.com/radar/guides/blob/master/gem-development.md)
 * [Using .gemspecs as Intended](http://yehudakatz.com/2010/04/02/using-gemspecs-as-intended/)
-* [Gemspec Reference](http://docs.rubygems.org/read/chapter/20)
+* [Gemspec Reference](http://guides.rubygems.org/specification-reference/)
 * [GemPlugins: A Brief Introduction to the Future of Rails Plugins](http://www.intridea.com/blog/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins)

data/guides/source/rails_application_templates.md CHANGED Viewed

@@ -38,9 +38,11 @@ generate(:scaffold, "person name:string")
 route "root to: 'people#index'"
 rake("db:migrate")
-git :init
-git add: "."
-git commit: %Q{ -m 'Initial commit' }
+after_bundle do
+  git :init
+  git add: "."
+  git commit: %Q{ -m 'Initial commit' }
+end
 ```
 The following sections outline the primary methods provided by the API:
@@ -228,6 +230,22 @@ git add: "."
 git commit: "-a -m 'Initial commit'"
 ```
+### after_bundle(&block)
+Registers a callback to be executed after the gems are bundled and binstubs
+are generated. Useful for all generated files to version control:
+```ruby
+after_bundle do
+  git :init
+  git add: '.'
+  git commit: "-a -m 'Initial commit'"
+end
+```
+The callbacks gets executed even if `--skip-bundle` and/or `--skip-spring` has
+been passed.
 Advanced Usage
 --------------

data/guides/source/rails_on_rack.md CHANGED Viewed

@@ -18,7 +18,7 @@ Introduction to Rack
 Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.
-- [Rack API Documentation](http://rack.rubyforge.org/doc/)
+* [Rack API Documentation](http://rack.github.io/)
 Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack's basics, you should check out the [Resources](#resources) section below.
@@ -99,6 +99,10 @@ To find out more about different `rackup` options:
 $ rackup --help
 ```
+### Development and auto-reloading
+Middlewares are loaded once and are not monitored for changes. You will have to restart the server for changes to be reflected in the running application.
 Action Dispatcher Middleware Stack
 ----------------------------------
@@ -229,7 +233,7 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
 **`ActionDispatch::Static`**
-* Used to serve static assets. Disabled if `config.serve_static_assets` is `false`.
+* Used to serve static files. Disabled if `config.serve_static_files` is `false`.
 **`Rack::Lock`**
@@ -273,7 +277,7 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
 **`ActionDispatch::Callbacks`**
-* Runs the prepare callbacks before serving the request.
+* Provides callbacks to be executed before and after dispatching the request.
 **`ActiveRecord::Migration::CheckPending`**
@@ -303,7 +307,7 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
 * Parses out parameters from the request into `params`.
-**`ActionDispatch::Head`**
+**`Rack::Head`**
 * Converts HEAD requests to `GET` requests and serves them as so.