rails 4.1.16 → 4.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a161623794a4621a5a9494ab5a7276dc31396e7d
-  data.tar.gz: d37862afe12df5f3a83f7403f0dc8f5f4ed88802
+  metadata.gz: c417d25c9104b8bd76f1fb1a78d4fe7f8dcb42a6
+  data.tar.gz: db8ef2ff70c6cb7e1f45b910548f381c3dc947fc
 SHA512:
-  metadata.gz: 783193071931a97f089e46b314eaaba449563cc341a4426f3d191adcccf023395319dd07c7c0138aee9da9e3c6c5591069b3dc40df05ed08b7b32e0aed09b3aa
-  data.tar.gz: a002c2cb1f7b9fd555674ccb759e2ef62e5645bec0a0e57d6fdf2c25a2a19046131cec5723264f8bc5f6a2abe18103bc7bbec79c9444e90cf10d135382c0cf26
+  metadata.gz: 9f1595348d43495eddc98d230dd2317f9faa7a3d92427071cd24c4a4d4762396a7befc43c644ea66858a0d3530662dff694a5c0e24a7aa95a8119768135edce1
+  data.tar.gz: 9dd0e2984e94aececf6b4da15f438f421374d05c5082750111cfa99f2c1c94af6935f3b86613fcf7b770127e1477345e49b8bfbd3dfd7adf0ce6472a4e508e28

data/README.md

@@ -2,7 +2,7 @@
 
 Rails is a web-application framework that includes everything needed to
 create database-backed web applications according to the
-[Model-View-Controller (MVC)](http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller)
+[Model-View-Controller (MVC)](http://en.wikipedia.org/wiki/Model-view-controller)
 pattern.
 
 Understanding the MVC pattern is key to understanding Rails. MVC divides your
@@ -67,7 +67,7 @@ independently outside Rails.
     * [Getting Started with Rails](http://guides.rubyonrails.org/getting_started.html)
     * [Ruby on Rails Guides](http://guides.rubyonrails.org)
     * [The API Documentation](http://api.rubyonrails.org)
-    * [Ruby on Rails Tutorial](http://ruby.railstutorial.org/ruby-on-rails-tutorial-book)
+    * [Ruby on Rails Tutorial](http://www.railstutorial.org/book)
 
 ## Contributing
 
@@ -76,7 +76,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the
 
 ## Code Status
 
-* [![Build Status](https://travis-ci.org/rails/rails.png?branch=master)](https://travis-ci.org/rails/rails)
+* [![Build Status](https://travis-ci.org/rails/rails.svg?branch=master)](https://travis-ci.org/rails/rails)
 
 ## License
 

data/guides/CHANGELOG.md

@@ -1,116 +1,27 @@
-## Rails 4.1.16 (July 12, 2016) ##
+* Change Posts to Articles in Getting Started sample application in order to
+better align with the actual guides.
 
-*   No changes.
-
-
-## Rails 4.1.15 (March 07, 2016) ##
-
-*   No changes.
-
-
-## Rails 4.1.14.2 (February 26, 2016) ##
-
-*   No changes.
-
-
-## Rails 4.1.14.1 (January 25, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.14 (November 12, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.13 (August 24, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.12 (June 25, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.11 (June 16, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.10 (March 19, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.9 (January 6, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.8 (November 16, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.7.1 (November 19, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.7 (October 29, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.6 (September 11, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.5 (August 18, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.4 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.3 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.2 (June 26, 2014) ##
+    *John Kelly Ferguson*
 
 * Update all Rails 4.1.0 references to 4.1.1 within the guides and code.
 
     *John Kelly Ferguson*
 
-*   Updates the maintenance policy to match the latest versions of Rails.
-
-    *Matias Korhonen*
-
+* Split up rows in the Explain Queries table of the ActiveRecord Querying section
+in order to improve readability.
 
-## Rails 4.1.1 (May 6, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.0 (April 8, 2014) ##
+    *John Kelly Ferguson*
 
-*   Fixed missing line and shadow on service pages(404, 422, 500).
+*   Change all non-HTTP method 'post' references to 'article'.
 
-    *Dmitry Korotkov*
+    *John Kelly Ferguson*
 
-*   Removed repetitive th tags. Instead of them added one th tag with a colspan attribute.
+*   Updates the maintenance policy to match the latest versions of Rails
 
-    *Sıtkı Bağdat*
+    *Matias Korhonen*
 
-*   Added the Rails maintenance policy to the guides.
+*   Switched the order of `Applying a default scope` and `Merging of scopes` subsections so default scopes are introduced first.
 
-    *Matias Korhonen*
+    *Alex Riabov*
 
-Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/guides/CHANGELOG.md) for previous changes.
+Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/guides/CHANGELOG.md) for previous changes.

data/guides/Rakefile

@@ -13,8 +13,8 @@ namespace :guides do
 
     desc "Generate .mobi file. The kindlegen executable must be in your PATH. You can get it for free from http://www.amazon.com/kindlepublishing"
     task :kindle do
-      unless `kindlerb -v 2> /dev/null` =~ /kindlerb 0.1.1/  
-        abort "Please `gem install kindlerb`"
+      unless `kindlerb -v 2> /dev/null` =~ /kindlerb 0.1.1/
+        abort "Please `gem install kindlerb` and make sure you have `kindlegen` in your PATH"
       end
       unless `convert` =~ /convert/  
         abort "Please install ImageMagick`"

data/guides/assets/javascripts/guides.js

@@ -51,3 +51,9 @@ var guidesIndex = {
     window.location = url;
   }
 };
+
+// Disable autolink inside example code blocks of guides.
+$(document).ready(function() {
+  SyntaxHighlighter.defaults['auto-links'] = false;
+  SyntaxHighlighter.all();
+});

data/guides/assets/stylesheets/main.css

@@ -381,9 +381,12 @@ a, a:link, a:visited {
     font: inherit;
     padding-left: .75em;
     font-size: .95em;
-    background-position: 96% -65px;
+    background-position: 96% 16px;
     -webkit-appearance: none;
   }
+  .guides-index-small .guides-index-item:hover{
+    background-position: 96% -65px;
+  }
 }
 
 #guides {

data/guides/bug_report_templates/action_controller_gem.rb

@@ -7,8 +7,8 @@ require 'action_controller/railtie'
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'cookie_store_key'
-  secrets.secret_token    = 'secret_token'
-  secrets.secret_key_base = 'secret_key_base'
+  config.secret_token    = 'secret_token'
+  config.secret_key_base = 'secret_key_base'
 
   config.logger = Logger.new($stdout)
   Rails.logger  = config.logger

data/guides/bug_report_templates/action_controller_master.rb

@@ -2,6 +2,9 @@ unless File.exist?('Gemfile')
   File.write('Gemfile', <<-GEMFILE)
     source 'https://rubygems.org'
     gem 'rails', github: 'rails/rails'
+    gem 'arel', github: 'rails/arel'
+    gem 'rack', github: 'rack/rack'
+    gem 'i18n', github: 'svenfuchs/i18n'
   GEMFILE
 
   system 'bundle'
@@ -16,8 +19,8 @@ require 'action_controller/railtie'
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'cookie_store_key'
-  secrets.secret_token    = 'secret_token'
-  secrets.secret_key_base = 'secret_key_base'
+  config.secret_token    = 'secret_token'
+  config.secret_key_base = 'secret_key_base'
 
   config.logger = Logger.new($stdout)
   Rails.logger  = config.logger

data/guides/bug_report_templates/active_record_master.rb

@@ -3,6 +3,8 @@ unless File.exist?('Gemfile')
     source 'https://rubygems.org'
     gem 'rails', github: 'rails/rails'
     gem 'arel', github: 'rails/arel'
+    gem 'rack', github: 'rack/rack'
+    gem 'i18n', github: 'svenfuchs/i18n'
     gem 'sqlite3'
   GEMFILE
 

data/guides/rails_guides.rb

@@ -24,11 +24,11 @@ begin
   require 'redcarpet'
 rescue LoadError
   # This can happen if doc:guides is executed in an application.
-  $stderr.puts('Generating guides requires Redcarpet 2.1.1+.')
+  $stderr.puts('Generating guides requires Redcarpet 3.1.2+.')
   $stderr.puts(<<ERROR) if bundler?
 Please add
 
-  gem 'redcarpet', '~> 2.1.1'
+  gem 'redcarpet', '~> 3.1.2'
 
 to the Gemfile, run
 

data/guides/rails_guides/helpers.rb

@@ -39,7 +39,7 @@ module RailsGuides
     def author(name, nick, image = 'credits_pic_blank.gif', &block)
       image = "images/#{image}"
 
-      result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name, :width => 91, :height => 91)
+      result = tag(:img, :src => image, :class => 'left pic', :alt => name, :width => 91, :height => 91)
       result << content_tag(:h3, name)
       result << content_tag(:p, capture(&block))
       content_tag(:div, result, :class => 'clearfix', :id => nick)

data/guides/rails_guides/levenshtein.rb

@@ -1,31 +1,39 @@
 module RailsGuides
   module Levenshtein
-    # Based on the pseudocode in http://en.wikipedia.org/wiki/Levenshtein_distance
-    def self.distance(s1, s2)
-      s = s1.unpack('U*')
-      t = s2.unpack('U*')
-      m = s.length
-      n = t.length
+    # This code is based directly on the Text gem implementation
+    # Returns a value representing the "cost" of transforming str1 into str2
+    def self.distance str1, str2
+      s = str1
+      t = str2
+      n = s.length
+      m = t.length
+      max = n/2
 
-      # matrix initialization
-      d = []
-      0.upto(m) { |i| d << [i] }
-      0.upto(n) { |j| d[0][j] = j }
+      return m if (0 == n)
+      return n if (0 == m)
+      return n if (n - m).abs > max
 
-      # distance computation
-      1.upto(m) do |i|
-        1.upto(n) do |j|
-          cost = s[i] == t[j] ? 0 : 1
-          d[i][j] = [
-            d[i-1][j] + 1,      # deletion
-            d[i][j-1] + 1,      # insertion
-            d[i-1][j-1] + cost, # substitution
-          ].min
+      d = (0..m).to_a
+      x = nil
+
+      str1.each_char.each_with_index do |char1,i|
+        e = i+1
+
+        str2.each_char.each_with_index do |char2,j|
+          cost = (char1 == char2) ? 0 : 1
+          x = [
+               d[j+1] + 1, # insertion
+               e + 1,      # deletion
+               d[j] + cost # substitution
+              ].min
+          d[j] = e
+          e = x
         end
+
+        d[m] = x
       end
 
-      # all done
-      return d[m][n]
+      return x
     end
   end
 end

data/guides/rails_guides/markdown.rb

@@ -47,8 +47,7 @@ module RailsGuides
       end
 
       def dom_id_text(text)
-        text.downcase.gsub(/\?/, '-questionmark').gsub(/!/, '-bang').gsub(/[^a-z0-9]+/, ' ')
-          .strip.gsub(/\s+/, '-')
+        text.downcase.gsub(/\?/, '-questionmark').gsub(/!/, '-bang').gsub(/\s+/, '-')
       end
 
       def engine
@@ -79,10 +78,10 @@ module RailsGuides
       def generate_structure
         @headings_for_index = []
         if @body.present?
-          @body = Nokogiri::HTML(@body).tap do |doc|
+          @body = Nokogiri::HTML.fragment(@body).tap do |doc|
             hierarchy = []
 
-            doc.at('body').children.each do |node|
+            doc.children.each do |node|
               if node.name =~ /^h[3-6]$/
                 case node.name
                 when 'h3'
@@ -116,7 +115,7 @@ module RailsGuides
             end
           end
 
-          @index = Nokogiri::HTML(engine.render(raw_index)).tap do |doc|
+          @index = Nokogiri::HTML.fragment(engine.render(raw_index)).tap do |doc|
             doc.at('ol')[:class] = 'chapters'
           end.to_html
 
@@ -130,8 +129,8 @@ module RailsGuides
       end
 
       def generate_title
-        if heading = Nokogiri::HTML(@header).at(:h2)
-          @title = "#{heading.text} — Ruby on Rails Guides".html_safe
+        if heading = Nokogiri::HTML.fragment(@header).at(:h2)
+          @title = "#{heading.text} — Ruby on Rails Guides"
         else
           @title = "Ruby on Rails Guides"
         end

data/guides/rails_guides/markdown/renderer.rb

@@ -50,7 +50,7 @@ HTML
             when 'erb'
               'ruby; html-script: true'
             when 'html'
-              'xml' # html is understood, but there are .xml rules in the CSS
+              'xml' # HTML is understood, but there are .xml rules in the CSS
             else
               'plain'
           end

data/guides/source/2_3_release_notes.md

@@ -8,7 +8,7 @@ Rails 2.3 delivers a variety of new and improved features, including pervasive R
 Application Architecture
 ------------------------
 
-There are two major changes in the architecture of Rails applications: complete integration of the [Rack](http://rack.rubyforge.org/) modular web server interface, and renewed support for Rails Engines.
+There are two major changes in the architecture of Rails applications: complete integration of the [Rack](http://rack.github.io/) modular web server interface, and renewed support for Rails Engines.
 
 ### Rack Integration
 
@@ -594,7 +594,7 @@ The internals of the various <code>rake gem</code> tasks have been substantially
 * Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding `--with-dispatchers` when you run the `rails` command, or add them later with `rake rails:update:generate_dispatchers`).
 * Rails Guides have been converted from AsciiDoc to Textile markup.
 * Scaffolded views and controllers have been cleaned up a bit.
-* `script/server` now accepts a <tt>--path</tt> argument to mount a Rails application from a specific path.
+* `script/server` now accepts a `--path` argument to mount a Rails application from a specific path.
 * If any configured gems are missing, the gem rake tasks will skip loading much of the environment. This should solve many of the "chicken-and-egg" problems where rake gems:install couldn't run because gems were missing.
 * Gems are now unpacked exactly once. This fixes issues with gems (hoe, for instance) which are packed with read-only permissions on the files.
 
@@ -618,4 +618,4 @@ A few pieces of older code are deprecated in this release:
 Credits
 -------
 
-Release notes compiled by [Mike Gunderloy](http://afreshcup.com.) This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.
+Release notes compiled by [Mike Gunderloy](http://afreshcup.com). This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.

data/guides/source/3_0_release_notes.md

@@ -294,7 +294,7 @@ NOTE. The old style `map` commands still work as before with a backwards compati
 Deprecations
 
 * The catch all route for non-REST applications (`/:controller/:action/:id`) is now commented out.
-* Routes :path\_prefix no longer exists and :name\_prefix now automatically adds "\_" at the end of the given value.
+* Routes `:path_prefix` no longer exists and `:name_prefix` now automatically adds "_" at the end of the given value.
 
 More Information:
 * [The Rails 3 Router: Rack it Up](http://yehudakatz.com/2009/12/26/the-rails-3-router-rack-it-up/)
@@ -308,7 +308,7 @@ More Information:
 
 Major re-write was done in the Action View helpers, implementing Unobtrusive JavaScript (UJS) hooks and removing the old inline AJAX commands. This enables Rails to use any compliant UJS driver to implement the UJS hooks in the helpers.
 
-What this means is that all previous `remote_<method>` helpers have been removed from Rails core and put into the [Prototype Legacy Helper](http://github.com/rails/prototype_legacy_helper.) To get UJS hooks into your HTML, you now pass `:remote => true` instead. For example:
+What this means is that all previous `remote_<method>` helpers have been removed from Rails core and put into the [Prototype Legacy Helper](http://github.com/rails/prototype_legacy_helper). To get UJS hooks into your HTML, you now pass `:remote => true` instead. For example:
 
 ```ruby
 form_for @post, :remote => true
@@ -521,7 +521,7 @@ A large effort was made in Active Support to make it cherry pickable, that is, y
 These are the main changes in Active Support:
 
 * Large clean up of the library removing unused methods throughout.
-* Active Support no longer provides vendored versions of [TZInfo](http://tzinfo.rubyforge.org/), [Memcache Client](http://deveiate.org/projects/RMemCache/) and [Builder](http://builder.rubyforge.org/,) these are all included as dependencies and installed via the `bundle install` command.
+* Active Support no longer provides vendored versions of TZInfo, Memcache Client and Builder. These are all included as dependencies and installed via the `bundle install` command.
 * Safe buffers are implemented in `ActiveSupport::SafeBuffer`.
 * Added `Array.uniq_by` and `Array.uniq_by!`.
 * Removed `Array#rand` and backported `Array#sample` from Ruby 1.9.
@@ -608,4 +608,4 @@ Credits
 
 See the [full list of contributors to Rails](http://contributors.rubyonrails.org/) for the many people who spent many hours making Rails 3. Kudos to all of them.
 
-Rails 3.0 Release Notes were compiled by [Mikel Lindsaar](http://lindsaar.net.)
+Rails 3.0 Release Notes were compiled by [Mikel Lindsaar](http://lindsaar.net).

data/guides/source/3_1_release_notes.md

@@ -169,11 +169,11 @@ Rails Architectural Changes
 
 The major change in Rails 3.1 is the Assets Pipeline. It makes CSS and JavaScript first-class code citizens and enables proper organization, including use in plugins and engines.
 
-The assets pipeline is powered by [Sprockets](https://github.com/rails/sprockets) and is covered in the [Asset Pipeline](asset_pipeline.html) guide.
+The assets pipeline is powered by [Sprockets](https://github.com/sstephenson/sprockets) and is covered in the [Asset Pipeline](asset_pipeline.html) guide.
 
 ### HTTP Streaming
 
-HTTP Streaming is another change that is new in Rails 3.1. This lets the browser download your stylesheets and JavaScript files while the server is still generating the response. This requires Ruby 1.9.2, is opt-in and requires support from the web server as well, but the popular combo of nginx and unicorn is ready to take advantage of it.
+HTTP Streaming is another change that is new in Rails 3.1. This lets the browser download your stylesheets and JavaScript files while the server is still generating the response. This requires Ruby 1.9.2, is opt-in and requires support from the web server as well, but the popular combo of NGINX and Unicorn is ready to take advantage of it.
 
 ### Default JS library is now jQuery