railties 5.0.7.2 → 5.1.0.beta1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 David Heinemeier Hansson
+Copyright (c) 2004-2017 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/RDOC_MAIN.rdoc

@@ -35,17 +35,17 @@ can read more about Action Pack in its {README}[link:files/actionpack/README_rdo
 
 1. Install \Rails at the command prompt if you haven't yet:
 
-    gem install rails
+    $ gem install rails
 
 2. At the command prompt, create a new \Rails application:
 
-    rails new myapp
+    $ rails new myapp
 
    where "myapp" is the application name.
 
 3. Change directory to +myapp+ and start the web server:
 
-    cd myapp; rails server
+    $ cd myapp; rails server
 
    Run with <tt>--help</tt> or <tt>-h</tt> for options.
 

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/5-0-stable/railties
+* https://github.com/rails/rails/tree/master/railties
 
 == License
 

data/exe/rails

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-git_path = File.expand_path('../../../.git', __FILE__)
+git_path = File.expand_path("../../../.git", __FILE__)
 
 if File.exist?(git_path)
-  railties_path = File.expand_path('../../lib', __FILE__)
+  railties_path = File.expand_path("../../lib", __FILE__)
   $:.unshift(railties_path)
 end
 require "rails/cli"

data/lib/rails.rb

@@ -1,19 +1,19 @@
-require 'rails/ruby_version_check'
+require "rails/ruby_version_check"
 
-require 'pathname'
+require "pathname"
 
-require 'active_support'
-require 'active_support/dependencies/autoload'
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/object/blank'
+require "active_support"
+require "active_support/dependencies/autoload"
+require "active_support/core_ext/kernel/reporting"
+require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/array/extract_options"
+require "active_support/core_ext/object/blank"
 
-require 'rails/application'
-require 'rails/version'
+require "rails/application"
+require "rails/version"
 
-require 'active_support/railtie'
-require 'action_dispatch/railtie'
+require "active_support/railtie"
+require "action_dispatch/railtie"
 
 # UTF-8 is the default internal and external encoding.
 silence_warnings do
@@ -47,14 +47,14 @@ module Rails
 
     def backtrace_cleaner
       @backtrace_cleaner ||= begin
-        # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
-        require 'rails/backtrace_cleaner'
+        # Relies on Active Support, so we have to lazy load to postpone definition until Active Support has been loaded
+        require "rails/backtrace_cleaner"
         Rails::BacktraceCleaner.new
       end
     end
 
-    # Returns a Pathname object of the current rails project,
-    # otherwise it returns nil if there is no project:
+    # Returns a Pathname object of the current Rails project,
+    # otherwise it returns +nil+ if there is no project:
     #
     #   Rails.root
     #     # => #<Pathname:/Users/someuser/some/path/project>
@@ -78,7 +78,7 @@ module Rails
       @_env = ActiveSupport::StringInquirer.new(environment)
     end
 
-    # Returns all rails groups for loading based on:
+    # Returns all Rails groups for loading based on:
     #
     # * The Rails environment;
     # * The environment variable RAILS_GROUPS;
@@ -101,7 +101,7 @@ module Rails
     end
 
     # Returns a Pathname object of the public folder of the current
-    # rails project, otherwise it returns nil if there is no project:
+    # Rails project, otherwise it returns +nil+ if there is no project:
     #
     #   Rails.public_path
     #     # => #<Pathname:/Users/someuser/some/path/project/public>

data/lib/rails/all.rb

@@ -1,4 +1,4 @@
-require 'rails'
+require "rails"
 
 %w(
   active_record/railtie

data/lib/rails/api/generator.rb

@@ -0,0 +1,28 @@
+require "sdoc"
+
+class RDoc::Generator::API < RDoc::Generator::SDoc # :nodoc:
+  RDoc::RDoc.add_generator self
+
+  def generate_class_tree_level(classes, visited = {})
+    # Only process core extensions on the first visit.
+    if visited.empty?
+      core_exts, classes = classes.partition { |klass| core_extension?(klass) }
+
+      super.unshift([ "Core extensions", "", "", build_core_ext_subtree(core_exts, visited) ])
+    else
+      super
+    end
+  end
+
+  private
+    def build_core_ext_subtree(classes, visited)
+      classes.map do |klass|
+        [ klass.name, klass.document_self_or_methods ? klass.path : "", "",
+            generate_class_tree_level(klass.classes_and_modules, visited) ]
+      end
+    end
+
+    def core_extension?(klass)
+      klass.name != "ActiveSupport" && klass.in_files.any? { |file| file.absolute_name.include?("core_ext") }
+    end
+end

data/lib/rails/api/task.rb

@@ -1,33 +1,33 @@
-require 'rdoc/task'
+require "rdoc/task"
+require_relative "generator"
 
 module Rails
   module API
     class Task < RDoc::Task
       RDOC_FILES = {
-        'activesupport' => {
-          :include => %w(
+        "activesupport" => {
+          include: %w(
             README.rdoc
             lib/active_support/**/*.rb
-          ),
-          :exclude => 'lib/active_support/vendor/*'
+          )
         },
 
-        'activerecord' => {
-          :include => %w(
+        "activerecord" => {
+          include: %w(
             README.rdoc
             lib/active_record/**/*.rb
           )
         },
 
-        'activemodel' => {
-          :include => %w(
+        "activemodel" => {
+          include: %w(
             README.rdoc
             lib/active_model/**/*.rb
           )
         },
 
-        'actionpack' => {
-          :include => %w(
+        "actionpack" => {
+          include: %w(
             README.rdoc
             lib/abstract_controller/**/*.rb
             lib/action_controller/**/*.rb
@@ -35,41 +35,45 @@ module Rails
           )
         },
 
-        'actionview' => {
-          :include => %w(
+        "actionview" => {
+          include: %w(
             README.rdoc
             lib/action_view/**/*.rb
           ),
-          :exclude => 'lib/action_view/vendor/*'
+          exclude: "lib/action_view/vendor/*"
         },
 
-        'actionmailer' => {
-          :include => %w(
+        "actionmailer" => {
+          include: %w(
             README.rdoc
             lib/action_mailer/**/*.rb
           )
         },
 
-        'activejob' => {
-          :include => %w(
+        "activejob" => {
+          include: %w(
             README.md
             lib/active_job/**/*.rb
           )
         },
 
-        'actioncable' => {
-          :include => %w(
+        "actioncable" => {
+          include: %w(
             README.md
             lib/action_cable/**/*.rb
           )
         },
 
-        'railties' => {
-          :include => %w(
+        "railties" => {
+          include: %w(
             README.rdoc
             lib/**/*.rb
           ),
-          :exclude => 'lib/rails/generators/rails/**/templates/**/*.rb'
+          exclude: %w(
+            lib/rails/generators/**/templates/**/*.rb
+            lib/rails/test_unit/*
+            lib/rails/api/generator.rb
+          )
         }
       }
 
@@ -80,7 +84,7 @@ module Rails
         # Be lazy computing stuff to have as light impact as possible to
         # the rest of tasks.
         before_running_rdoc do
-          load_and_configure_sdoc
+          configure_sdoc
           configure_rdoc_files
           setup_horo_variables
         end
@@ -91,20 +95,15 @@ module Rails
         # no-op
       end
 
-      def load_and_configure_sdoc
-        require 'sdoc'
-
-        self.title    = 'Ruby on Rails API'
+      def configure_sdoc
+        self.title    = "Ruby on Rails API"
         self.rdoc_dir = api_dir
 
-        options << '-m'  << api_main
-        options << '-e'  << 'UTF-8'
+        options << "-m"  << api_main
+        options << "-e"  << "UTF-8"
 
-        options << '-f'  << 'sdoc'
-        options << '-T'  << 'rails'
-      rescue LoadError
-        $stderr.puts %(Unable to load SDoc, please add\n\n    gem 'sdoc', require: false\n\nto the Gemfile.)
-        exit 1
+        options << "-f"  << "api"
+        options << "-T"  << "rails"
       end
 
       def configure_rdoc_files
@@ -121,22 +120,35 @@ module Rails
             rdoc_files.exclude("#{cdr}/#{pattern}")
           end
         end
+
+        # Only generate documentation for files that have been
+        # changed since the API was generated.
+        if Dir.exist?("doc/rdoc") && !ENV["ALL"]
+          last_generation = DateTime.rfc2822(File.open("doc/rdoc/created.rid", &:readline))
+
+          rdoc_files.keep_if do |file|
+            File.mtime(file).to_datetime > last_generation
+          end
+
+          # Nothing to do
+          exit(0) if rdoc_files.empty?
+        end
       end
 
       def setup_horo_variables
-        ENV['HORO_PROJECT_NAME']    = 'Ruby on Rails'
-        ENV['HORO_PROJECT_VERSION'] = rails_version
+        ENV["HORO_PROJECT_NAME"]    = "Ruby on Rails"
+        ENV["HORO_PROJECT_VERSION"] = rails_version
       end
 
       def api_main
-        component_root_dir('railties') + '/RDOC_MAIN.rdoc'
+        component_root_dir("railties") + "/RDOC_MAIN.rdoc"
       end
     end
 
     class RepoTask < Task
-      def load_and_configure_sdoc
+      def configure_sdoc
         super
-        options << '-g' # link to GitHub, SDoc flag
+        options << "-g" # link to GitHub, SDoc flag
       end
 
       def component_root_dir(component)
@@ -144,7 +156,7 @@ module Rails
       end
 
       def api_dir
-        'doc/rdoc'
+        "doc/rdoc"
       end
     end
 
@@ -156,7 +168,7 @@ module Rails
 
     class StableTask < RepoTask
       def rails_version
-        File.read('RAILS_VERSION').strip
+        File.read("RAILS_VERSION").strip
       end
     end
   end

data/lib/rails/app_loader.rb

@@ -1,12 +1,12 @@
-require 'pathname'
-require 'rails/version'
+require "pathname"
+require "rails/version"
 
 module Rails
   module AppLoader # :nodoc:
     extend self
 
     RUBY = Gem.ruby
-    EXECUTABLES = ['bin/rails', 'script/rails']
+    EXECUTABLES = ["bin/rails", "script/rails"]
     BUNDLER_WARNING = <<EOS
 Looks like your app's ./bin/rails is a stub that was generated by Bundler.
 
@@ -39,21 +39,21 @@ EOS
           if contents =~ /(APP|ENGINE)_PATH/
             exec RUBY, exe, *ARGV
             break # non reachable, hack to be able to stub exec in the test suite
-          elsif exe.end_with?('bin/rails') && contents.include?('This file was generated by Bundler')
+          elsif exe.end_with?("bin/rails") && contents.include?("This file was generated by Bundler")
             $stderr.puts(BUNDLER_WARNING)
-            Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
-            require File.expand_path('../boot', APP_PATH)
-            require 'rails/commands'
+            Object.const_set(:APP_PATH, File.expand_path("config/application", Dir.pwd))
+            require File.expand_path("../boot", APP_PATH)
+            require "rails/commands"
             break
           end
         end
 
         # If we exhaust the search there is no executable, this could be a
         # call to generate a new application, so restore the original cwd.
-        Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
+        Dir.chdir(original_cwd) && return if Pathname.new(Dir.pwd).root?
 
         # Otherwise keep moving upwards in search of an executable.
-        Dir.chdir('..')
+        Dir.chdir("..")
       end
     end
 

data/lib/rails/application.rb

@@ -1,9 +1,10 @@
-require 'yaml'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
-require 'active_support/key_generator'
-require 'active_support/message_verifier'
-require 'rails/engine'
+require "yaml"
+require "active_support/core_ext/hash/keys"
+require "active_support/core_ext/object/blank"
+require "active_support/key_generator"
+require "active_support/message_verifier"
+require "rails/engine"
+require "rails/secrets"
 
 module Rails
   # An Engine with the responsibility of coordinating the whole boot process.
@@ -72,15 +73,15 @@ module Rails
   # on one of the applications to create a copy of the application which shares
   # the configuration.
   #
-  # If you decide to define rake tasks, runners, or initializers in an
+  # If you decide to define Rake tasks, runners, or initializers in an
   # application other than +Rails.application+, then you must run them manually.
   class Application < Engine
-    autoload :Bootstrap,              'rails/application/bootstrap'
-    autoload :Configuration,          'rails/application/configuration'
-    autoload :DefaultMiddlewareStack, 'rails/application/default_middleware_stack'
-    autoload :Finisher,               'rails/application/finisher'
-    autoload :Railties,               'rails/engine/railties'
-    autoload :RoutesReloader,         'rails/application/routes_reloader'
+    autoload :Bootstrap,              "rails/application/bootstrap"
+    autoload :Configuration,          "rails/application/configuration"
+    autoload :DefaultMiddlewareStack, "rails/application/default_middleware_stack"
+    autoload :Finisher,               "rails/application/finisher"
+    autoload :Railties,               "rails/engine/railties"
+    autoload :RoutesReloader,         "rails/application/routes_reloader"
 
     class << self
       def inherited(base)
@@ -265,8 +266,8 @@ module Rails
       end
     end
 
-    # If you try to define a set of rake tasks on the instance, these will get
-    # passed up to the rake tasks defined on the application's class.
+    # If you try to define a set of Rake tasks on the instance, these will get
+    # passed up to the Rake tasks defined on the application's class.
     def rake_tasks(&block)
       self.class.rake_tasks(&block)
     end
@@ -274,7 +275,7 @@ module Rails
     # Sends the initializers to the +initializer+ method defined in the
     # Rails::Initializable module. Each Rails::Application class has its own
     # set of initializers, as defined by the Initializable module.
-    def initializer(name, opts={}, &block)
+    def initializer(name, opts = {}, &block)
       self.class.initializer(name, opts, &block)
     end
 
@@ -317,7 +318,7 @@ module Rails
     # Rails application, you will need to add lib to $LOAD_PATH on your own in case
     # you need to load files in lib/ during the application configuration as well.
     def self.add_lib_to_load_path!(root) #:nodoc:
-      path = File.join root, 'lib'
+      path = File.join root, "lib"
       if File.exist?(path) && !$LOAD_PATH.include?(path)
         $LOAD_PATH.unshift(path)
       end
@@ -347,7 +348,7 @@ module Rails
 
     # Initialize the application passing the given group. By default, the
     # group is :default
-    def initialize!(group=:default) #:nodoc:
+    def initialize!(group = :default) #:nodoc:
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
       @initialized = true
@@ -385,13 +386,7 @@ module Rails
     def secrets
       @secrets ||= begin
         secrets = ActiveSupport::OrderedOptions.new
-        yaml = config.paths["config/secrets"].first
-        if File.exist?(yaml)
-          require "erb"
-          all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {}
-          env_secrets = all_secrets[Rails.env]
-          secrets.merge!(env_secrets.symbolize_keys) if env_secrets
-        end
+        secrets.merge! Rails::Secrets.parse(config.paths["config/secrets"].existent, env: Rails.env)
 
         # Fallback to config.secret_key_base if secrets.secret_key_base isn't set
         secrets.secret_key_base ||= config.secret_key_base
@@ -506,7 +501,7 @@ module Rails
 
     def validate_secret_key_config! #:nodoc:
       if secrets.secret_key_base.blank?
-        ActiveSupport::Deprecation.warn "You didn't set `secret_key_base`. " +
+        ActiveSupport::Deprecation.warn "You didn't set `secret_key_base`. " \
           "Read the upgrade documentation to learn more about this new config option."
 
         if secrets.secret_token.blank?
@@ -517,15 +512,15 @@ module Rails
 
     private
 
-    def build_request(env)
-      req = super
-      env["ORIGINAL_FULLPATH"] = req.fullpath
-      env["ORIGINAL_SCRIPT_NAME"] = req.script_name
-      req
-    end
+      def build_request(env)
+        req = super
+        env["ORIGINAL_FULLPATH"] = req.fullpath
+        env["ORIGINAL_SCRIPT_NAME"] = req.script_name
+        req
+      end
 
-    def build_middleware
-      config.app_middleware + super
-    end
+      def build_middleware
+        config.app_middleware + super
+      end
   end
 end