rails 4.0.13 → 4.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f6960a78da480f91ecccaec3fd9a555ea83e7b
-  data.tar.gz: a0c92a2f2a74a328c9602703c553a9208e545029
+  metadata.gz: a161623794a4621a5a9494ab5a7276dc31396e7d
+  data.tar.gz: d37862afe12df5f3a83f7403f0dc8f5f4ed88802
 SHA512:
-  metadata.gz: ecf7ce48f8a9b9606c734aeb7b68f7364d2b97bdc5145d2af911fdb1cfafe3d6e2f56d6ec783e843bf249a77ff4d14f990bd218a78f08b33e4946f874f893a63
-  data.tar.gz: dd524fa16bbf1cb9e0392857eb898f5b9babf55897729acf673f4977901f4a81a749e696238eb87e45839507b2aa14408213a5eda5d3dfabcd0a94de0d981bdc
+  metadata.gz: 783193071931a97f089e46b314eaaba449563cc341a4426f3d191adcccf023395319dd07c7c0138aee9da9e3c6c5591069b3dc40df05ed08b7b32e0aed09b3aa
+  data.tar.gz: a002c2cb1f7b9fd555674ccb759e2ef62e5645bec0a0e57d6fdf2c25a2a19046131cec5723264f8bc5f6a2abe18103bc7bbec79c9444e90cf10d135382c0cf26

data/README.md

@@ -8,11 +8,6 @@ pattern.
 Understanding the MVC pattern is key to understanding Rails. MVC divides your
 application into three layers, each with a specific responsibility.
 
-The _View layer_ is composed of "templates" that are responsible for providing
-appropriate representations of your application's resources. Templates can
-come in a variety of formats, but most view templates are HTML with embedded
-Ruby code (ERB files).
-
 The _Model layer_ represents your domain model (such as Account, Product,
 Person, Post, etc.) and encapsulates the business logic that is specific to
 your application. In Rails, database-backed model classes are derived from
@@ -24,16 +19,26 @@ as provided by the Active Model module. You can read more about Active Record
 in its [README](activerecord/README.rdoc).
 
 The _Controller layer_ is responsible for handling incoming HTTP requests and
-providing a suitable response. Usually this means returning HTML, but Rails
-controllers can also generate XML, JSON, PDFs, mobile-specific views, and
-more. Controllers manipulate models and render view templates in order to
-generate the appropriate HTTP response.
+providing a suitable response. Usually this means returning HTML, but Rails controllers
+can also generate XML, JSON, PDFs, mobile-specific views, and more. Controllers load and
+manipulate models, and render view templates in order to generate the appropriate HTTP response.
+In Rails, incoming requests are routed by Action Dispatch to an appropriate controller, and
+controller classes are derived from `ActionController::Base`. Action Dispatch and Action Controller
+are bundled together in Action Pack. You can read more about Action Pack in its
+[README](actionpack/README.rdoc).
+
+The _View layer_ is composed of "templates" that are responsible for providing
+appropriate representations of your application's resources. Templates can
+come in a variety of formats, but most view templates are HTML with embedded
+Ruby code (ERB files). Views are typically rendered to generate a controller response,
+or to generate the body of an email. In Rails, View generation is handled by Action View.
+You can read more about Action View in its [README](actionview/README.rdoc).
 
-In Rails, the Controller and View layers are handled together by Action Pack.
-These two layers are bundled in a single package due to their heavy interdependence.
-This is unlike the relationship between Active Record and Action Pack, which are
-independent. Each of these packages can be used independently outside of Rails. You
-can read more about Action Pack in its [README](actionpack/README.rdoc).
+Active Record, Action Pack, and Action View can each be used independently outside Rails.
+In addition to them, Rails also comes with Action Mailer ([README](actionmailer/README.rdoc)), a library
+to generate and send emails; and Active Support ([README](activesupport/README.rdoc)), a collection of
+utility classes and standard library extensions that are useful for Rails, and may also be used
+independently outside Rails.
 
 ## Getting Started
 
@@ -54,7 +59,8 @@ can read more about Action Pack in its [README](actionpack/README.rdoc).
 
    Run with `--help` or `-h` for options.
 
-4. Go to http://localhost:3000 and you'll see: "Welcome aboard: You're riding Ruby on Rails!"
+4. Using a browser, go to `http://localhost:3000` and you'll see:
+"Welcome aboard: You're riding Ruby on Rails!"
 
 5. Follow the guidelines to start developing your application. You may find
    the following resources handy:
@@ -70,8 +76,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the
 
 ## Code Status
 
-* [![Build Status](https://api.travis-ci.org/rails/rails.png)](https://travis-ci.org/rails/rails)
-* [![Dependencies](https://gemnasium.com/rails/rails.png?travis)](https://gemnasium.com/rails/rails)
+* [![Build Status](https://travis-ci.org/rails/rails.png?branch=master)](https://travis-ci.org/rails/rails)
 
 ## License
 

data/guides/CHANGELOG.md

@@ -1,82 +1,116 @@
-## Rails 4.0.13 (January 6, 2015) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.12 (November 16, 2014) ##
+## Rails 4.1.15 (March 07, 2016) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.11.1 (November 19, 2014) ##
+## Rails 4.1.14.2 (February 26, 2016) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.11 (September 11, 2014) ##
+## Rails 4.1.14.1 (January 25, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.10 (September 11, 2014) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.9 (August 18, 2014) ##
+## Rails 4.1.13 (August 24, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.8 (July 2, 2014) ##
+## Rails 4.1.12 (June 25, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.7 (July 2, 2014) ##
+## Rails 4.1.11 (June 16, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.6 (June 26, 2014) ##
+## Rails 4.1.10 (March 19, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.5 (May 6, 2014) ##
+## Rails 4.1.9 (January 6, 2015) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.4 (March 14, 2014) ##
+## Rails 4.1.8 (November 16, 2014) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.3 (February 18, 2014) ##
+## Rails 4.1.7.1 (November 19, 2014) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.2 (December 02, 2013) ##
+## Rails 4.1.7 (October 29, 2014) ##
 
-*No changes*
+*   No changes.
 
 
-## Rails 4.0.1 (November 01, 2013) ##
+## Rails 4.1.6 (September 11, 2014) ##
 
-*   Added the Rails maintenance policy to the guides.
+*   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) ##
+
+* 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*
 
-## Rails 4.0.0 (June 25, 2013) ##
 
-*   Change Service pages(404, etc). *Stanislav Sobolev*
+## Rails 4.1.1 (May 6, 2014) ##
+
+*   No changes.
+
+
+## Rails 4.1.0 (April 8, 2014) ##
 
-*   Split Validations and Callbacks guide into two. *Steve Klabnik*
+*   Fixed missing line and shadow on service pages(404, 422, 500).
 
-*   New guide _Working with JavaScript in Rails_. *Steve Klabnik*
+    *Dmitry Korotkov*
 
-*   Guides updated to reflect new test locations. *Mike Moore*
+*   Removed repetitive th tags. Instead of them added one th tag with a colspan attribute.
+
+    *Sıtkı Bağdat*
+
+*   Added the Rails maintenance policy to the guides.
+
+    *Matias Korhonen*
 
-*   Guides have a responsive design. *Joe Fiorini*
+Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/guides/CHANGELOG.md) for previous changes.

data/guides/assets/images/icons/README

@@ -1,5 +1,5 @@
 Replaced the plain DocBook XSL admonition icons with Jimmac's DocBook
 icons (http://jimmac.musichall.cz/ikony.php3). I dropped transparency
-from the Jimmac icons to get round MS IE and FOP PNG incompatibilies.
+from the Jimmac icons to get round MS IE and FOP PNG incompatibilities.
 
 Stuart Rackham

data/guides/assets/javascripts/guides.js

@@ -1,57 +1,53 @@
-function guideMenu(){
-  if (document.getElementById('guides').style.display == "none") {
-    document.getElementById('guides').style.display = "block";
-  } else {
-    document.getElementById('guides').style.display = "none";
-  }
-}
-
-$.fn.selectGuide = function(guide){
+$.fn.selectGuide = function(guide) {
   $("select", this).val(guide);
-}
+};
 
-guidesIndex = {
-  bind: function(){
+var guidesIndex = {
+  bind: function() {
     var currentGuidePath = window.location.pathname;
     var currentGuide = currentGuidePath.substring(currentGuidePath.lastIndexOf("/")+1);
     $(".guides-index-small").
       on("change", "select", guidesIndex.navigate).
       selectGuide(currentGuide);
-    $(".more-info-button:visible").click(function(e){
+    $(document).on("click", ".more-info-button", function(e){
       e.stopPropagation();
-      if($(".more-info-links").is(":visible")){
+      if ($(".more-info-links").is(":visible")) {
         $(".more-info-links").addClass("s-hidden").unwrap();
       } else {
         $(".more-info-links").wrap("<div class='more-info-container'></div>").removeClass("s-hidden");
       }
-      $(document).on("click", function(e){
-        var $button = $(".more-info-button");
-        var element;
+    });
+    $("#guidesMenu").on("click", function(e) {
+      $("#guides").toggle();
+      return false;
+    });
+    $(document).on("click", function(e){
+      e.stopPropagation();
+      var $button = $(".more-info-button");
+      var element;
 
-        // Cross browser find the element that had the event
-        if (e.target) element = e.target;
-        else if (e.srcElement) element = e.srcElement;
+      // Cross browser find the element that had the event
+      if (e.target) element = e.target;
+      else if (e.srcElement) element = e.srcElement;
 
-        // Defeat the older Safari bug:
-        // http://www.quirksmode.org/js/events_properties.html
-        if (element.nodeType == 3) element = element.parentNode;
+      // Defeat the older Safari bug:
+      // http://www.quirksmode.org/js/events_properties.html
+      if (element.nodeType === 3) element = element.parentNode;
 
-        var $element = $(element);
+      var $element = $(element);
 
-        var $container = $element.parents(".more-info-container");
+      var $container = $element.parents(".more-info-container");
 
-        // We've captured a click outside the popup
-        if($container.length == 0){
-          $container = $button.next(".more-info-container");
-          $container.find(".more-info-links").addClass("s-hidden").unwrap();
-          $(document).off("click");
-        }
-      });
+      // We've captured a click outside the popup
+      if($container.length === 0){
+        $container = $button.next(".more-info-container");
+        $container.find(".more-info-links").addClass("s-hidden").unwrap();
+      }
     });
   },
   navigate: function(e){
     var $list = $(e.target);
-    url = $list.val();
+    var url = $list.val();
     window.location = url;
   }
-}
+};

data/guides/assets/stylesheets/main.css

@@ -129,6 +129,7 @@ body {
   font-family: Helvetica, Arial, Sans-Serif;
   text-decoration: none;
   vertical-align: middle;
+  cursor: pointer;
 }
 .red-button:active {
   border-top: none;
@@ -244,7 +245,7 @@ body {
 #subCol {
   position: absolute;
   z-index: 0;
-  top: 0;
+  top: 21px;
   right: 0;
   background: #FFF;
   padding: 1em 1.5em 1em 1.25em;

data/guides/assets/stylesheets/print.css

@@ -36,7 +36,7 @@ hr {
 }
 
 h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
-code { font:.9em "Courier New", Monaco, Courier, monospace; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; display:inline}
 
 img { float:left; margin:1.5em 1.5em 1.5em 0; }
 a img { border:none; }

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'
-  config.secret_token    = 'secret_token'
-  config.secret_key_base = 'secret_key_base'
+  secrets.secret_token    = 'secret_token'
+  secrets.secret_key_base = 'secret_key_base'
 
   config.logger = Logger.new($stdout)
   Rails.logger  = config.logger
@@ -19,6 +19,8 @@ class TestApp < Rails::Application
 end
 
 class TestController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
   def index
     render text: 'Home'
   end
@@ -27,7 +29,10 @@ end
 require 'minitest/autorun'
 require 'rack/test'
 
-class BugTest < MiniTest::Unit::TestCase
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class BugTest < Minitest::Test
   include Rack::Test::Methods
 
   def test_returns_success
@@ -39,4 +44,4 @@ class BugTest < MiniTest::Unit::TestCase
     def app
       Rails.application
     end
-end
+end

data/guides/bug_report_templates/action_controller_master.rb

@@ -16,8 +16,8 @@ require 'action_controller/railtie'
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'cookie_store_key'
-  config.secret_token    = 'secret_token'
-  config.secret_key_base = 'secret_key_base'
+  secrets.secret_token    = 'secret_token'
+  secrets.secret_key_base = 'secret_key_base'
 
   config.logger = Logger.new($stdout)
   Rails.logger  = config.logger
@@ -28,6 +28,8 @@ class TestApp < Rails::Application
 end
 
 class TestController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
   def index
     render text: 'Home'
   end

data/guides/bug_report_templates/active_record_gem.rb

@@ -1,9 +1,12 @@
 # Activate the gem you are reporting the issue against.
-gem 'activerecord', '3.2.13'
+gem 'activerecord', '4.0.0'
 require 'active_record'
 require 'minitest/autorun'
 require 'logger'
 
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
 # This connection will do for database-independent bug reports.
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Base.logger = Logger.new(STDOUT)
@@ -25,7 +28,7 @@ class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
-class BugTest < MiniTest::Unit::TestCase
+class BugTest < Minitest::Test
   def test_association_stuff
     post = Post.create!
     post.comments << Comment.create!

data/guides/bug_report_templates/active_record_master.rb

@@ -2,6 +2,7 @@ unless File.exist?('Gemfile')
   File.write('Gemfile', <<-GEMFILE)
     source 'https://rubygems.org'
     gem 'rails', github: 'rails/rails'
+    gem 'arel', github: 'rails/arel'
     gem 'sqlite3'
   GEMFILE
 
@@ -36,7 +37,7 @@ class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
-class BugTest < MiniTest::Unit::TestCase
+class BugTest < Minitest::Test
   def test_association_stuff
     post = Post.create!
     post.comments << Comment.create!

data/guides/bug_report_templates/generic_gem.rb

@@ -0,0 +1,15 @@
+# Activate the gems you are reporting the issue against.
+gem 'activesupport', '4.0.0'
+require 'active_support'
+require 'active_support/core_ext/object/blank'
+require 'minitest/autorun'
+
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class BugTest < Minitest::Test
+  def test_stuff
+    assert "zomg".present?
+    refute "".present?
+  end
+end

data/guides/bug_report_templates/generic_master.rb

@@ -0,0 +1,26 @@
+unless File.exist?('Gemfile')
+  File.write('Gemfile', <<-GEMFILE)
+    source 'https://rubygems.org'
+    gem 'rails', github: 'rails/rails'
+    gem 'arel', github: 'rails/arel'
+  GEMFILE
+
+  system 'bundle'
+end
+
+require 'bundler'
+Bundler.setup(:default)
+
+require 'active_support'
+require 'active_support/core_ext/object/blank'
+require 'minitest/autorun'
+
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class BugTest < Minitest::Test
+  def test_stuff
+    assert "zomg".present?
+    refute "".present?
+  end
+end

data/guides/code/getting_started/Gemfile

@@ -1,43 +1,40 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.0'
 
-# Use sqlite3 as the database for Active Record
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.1'
+# Use SQLite3 as the database for Active Record
 gem 'sqlite3'
-
 # Use SCSS for stylesheets
-gem 'sass-rails'
-
+gem 'sass-rails', '~> 4.0.3'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails'
-
+gem 'coffee-rails', '~> 4.0.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.0.3'
+# gem 'therubyracer',  platforms: :ruby
 
+# Use jquery as the JavaScript library
 gem 'jquery-rails'
-
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
-
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
-
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0',          group: :doc
 
-# To use ActiveModel has_secure_password
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring',        group: :development
+
+# Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
 # gem 'unicorn'
 
-# Deploy with Capistrano
-# gem 'capistrano', group: :development
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
 
-# To use debugger
-# gem 'debugger'