railties 5.0.0.beta3 → 5.0.0.beta4

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -26,10 +26,6 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
   <%- end -%>
 
@@ -44,6 +40,9 @@ Rails.application.configure do
   # Action Cable endpoint configuration
   # config.action_cable.url = 'wss://example.com/cable'
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Don't mount Action Cable in the main server process.
+  # config.action_cable.mount_path = nil
   <%- end -%>
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
@@ -56,14 +55,6 @@ Rails.application.configure do
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # Use a different logger for distributed setups.
-  # require 'syslog/logger'
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
-
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    config.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
-  end
-
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
@@ -87,6 +78,16 @@ Rails.application.configure do
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
+
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
+  end
   <%- unless options.skip_active_record? -%>
 
   # Do not dump schema after migrations.

data/lib/rails/generators/rails/app/templates/config/initializers/ssl_options.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure SSL options to enable HSTS with subdomains.
+Rails.application.config.ssl_options = { hsts: { subdomains: true } }

data/lib/rails/generators/rails/app/templates/config/initializers/to_time_preserves_timezone.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Preserve the timezone of the receiver when calling to `to_time`.
+# Ruby 2.4 will change the behavior of `to_time` to preserve the timezone
+# when converting to an instance of `Time` instead of the previous behavior
+# of converting to the local system timezone.
+#
+# Rails 5.0 introduced this config option so that apps made with earlier
+# versions of Rails are not affected when upgrading.
+ActiveSupport.to_time_preserves_timezone = true

data/lib/rails/generators/rails/app/templates/config/routes.rb

@@ -1,6 +1,3 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-
-  # Serve websocket cable requests in-process
-  # mount ActionCable.server => '/cable'
 end

data/lib/rails/generators/rails/app/templates/config/spring.rb

@@ -0,0 +1,6 @@
+%w(
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+).each { |path| Spring.watch(path) }

data/lib/rails/generators/rails/plugin/templates/Rakefile

@@ -25,5 +25,5 @@ load 'rails/tasks/statistics.rake'
 
 <% unless options[:skip_gemspec] -%>
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 <% end %>

data/lib/rails/generators/rails/plugin/templates/bin/rails.tt

@@ -1,4 +1,5 @@
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= namespaced_name -%>/engine', __FILE__)

data/lib/rails/generators/rails/plugin/templates/rails/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 <% if include_all_railties? -%>
 require 'rails/all'
@@ -6,10 +6,12 @@ require 'rails/all'
 # Pick the frameworks you want:
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
-<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
 require "action_view/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
+require "active_job/railtie"
+<%= comment_if :skip_action_cable %>require "action_cable/engine"
 <%= comment_if :skip_test %>require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <% end -%>
 
 Bundler.require(*Rails.groups)

data/lib/rails/generators/rails/plugin/templates/rails/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/lib/rails/generators/test_unit/mailer/mailer_generator.rb

@@ -19,7 +19,7 @@ module TestUnit # :nodoc:
 
       protected
         def file_name
-          @_file_name ||= super.gsub(/\_mailer/i, '')
+          @_file_name ||= super.gsub(/_mailer/i, '')
         end
     end
   end

data/lib/rails/railtie.rb

@@ -1,38 +1,37 @@
 require 'rails/initializable'
-require 'rails/configuration'
 require 'active_support/inflector'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/delegation'
 
 module Rails
-  # Railtie is the core of the Rails framework and provides several hooks to extend
-  # Rails and/or modify the initialization process.
+  # <tt>Rails::Railtie</tt> is the core of the Rails framework and provides
+  # several hooks to extend Rails and/or modify the initialization process.
   #
-  # Every major component of Rails (Action Mailer, Action Controller,
-  # Action View and Active Record) is a Railtie. Each of
-  # them is responsible for their own initialization. This makes Rails itself
-  # absent of any component hooks, allowing other components to be used in
-  # place of any of the Rails defaults.
+  # Every major component of Rails (Action Mailer, Action Controller, Active
+  # Record, etc.) implements a railtie. Each of them is responsible for their
+  # own initialization. This makes Rails itself absent of any component hooks,
+  # allowing other components to be used in place of any of the Rails defaults.
   #
-  # Developing a Rails extension does _not_ require any implementation of
-  # Railtie, but if you need to interact with the Rails framework during
-  # or after boot, then Railtie is needed.
+  # Developing a Rails extension does _not_ require implementing a railtie, but
+  # if you need to interact with the Rails framework during or after boot, then
+  # a railtie is needed.
   #
-  # For example, an extension doing any of the following would require Railtie:
+  # For example, an extension doing any of the following would need a railtie:
   #
   # * creating initializers
   # * configuring a Rails framework for the application, like setting a generator
   # * adding <tt>config.*</tt> keys to the environment
-  # * setting up a subscriber with ActiveSupport::Notifications
-  # * adding rake tasks
+  # * setting up a subscriber with <tt>ActiveSupport::Notifications</tt>
+  # * adding Rake tasks
   #
-  # == Creating your Railtie
+  # == Creating a Railtie
   #
-  # To extend Rails using Railtie, create a Railtie class which inherits
-  # from Rails::Railtie within your extension's namespace. This class must be
-  # loaded during the Rails boot process.
+  # To extend Rails using a railtie, create a subclass of <tt>Rails::Railtie</tt>.
+  # This class must be loaded during the Rails boot process, and is conventionally
+  # called <tt>MyNamespace::Railtie</tt>.
   #
-  # The following example demonstrates an extension which can be used with or without Rails.
+  # The following example demonstrates an extension which can be used with or
+  # without Rails.
   #
   #   # lib/my_gem/railtie.rb
   #   module MyGem
@@ -45,8 +44,8 @@ module Rails
   #
   # == Initializers
   #
-  # To add an initialization step from your Railtie to Rails boot process, you just need
-  # to create an initializer block:
+  # To add an initialization step to the Rails boot process from your railtie, just
+  # define the initialization code with the +initializer+ macro:
   #
   #   class MyRailtie < Rails::Railtie
   #     initializer "my_railtie.configure_rails_initialization" do
@@ -55,7 +54,7 @@ module Rails
   #   end
   #
   # If specified, the block can also receive the application object, in case you
-  # need to access some application specific configuration, like middleware:
+  # need to access some application-specific configuration, like middleware:
   #
   #   class MyRailtie < Rails::Railtie
   #     initializer "my_railtie.configure_rails_initialization" do |app|
@@ -63,56 +62,56 @@ module Rails
   #     end
   #   end
   #
-  # Finally, you can also pass <tt>:before</tt> and <tt>:after</tt> as option to initializer,
-  # in case you want to couple it with a specific step in the initialization process.
+  # Finally, you can also pass <tt>:before</tt> and <tt>:after</tt> as options to
+  # +initializer+, in case you want to couple it with a specific step in the
+  # initialization process.
   #
   # == Configuration
   #
-  # Inside the Railtie class, you can access a config object which contains configuration
-  # shared by all railties and the application:
+  # Railties can access a config object which contains configuration shared by all
+  # railties and the application:
   #
   #   class MyRailtie < Rails::Railtie
   #     # Customize the ORM
   #     config.app_generators.orm :my_railtie_orm
   #
   #     # Add a to_prepare block which is executed once in production
-  #     # and before each request in development
+  #     # and before each request in development.
   #     config.to_prepare do
   #       MyRailtie.setup!
   #     end
   #   end
   #
-  # == Loading rake tasks and generators
+  # == Loading Rake Tasks and Generators
   #
-  # If your railtie has rake tasks, you can tell Rails to load them through the method
-  # rake_tasks:
+  # If your railtie has Rake tasks, you can tell Rails to load them through the method
+  # +rake_tasks+:
   #
   #   class MyRailtie < Rails::Railtie
   #     rake_tasks do
-  #       load "path/to/my_railtie.tasks"
+  #       load 'path/to/my_railtie.tasks'
   #     end
   #   end
   #
   # By default, Rails loads generators from your load path. However, if you want to place
-  # your generators at a different location, you can specify in your Railtie a block which
+  # your generators at a different location, you can specify in your railtie a block which
   # will load them during normal generators lookup:
   #
   #   class MyRailtie < Rails::Railtie
   #     generators do
-  #       require "path/to/my_railtie_generator"
+  #       require 'path/to/my_railtie_generator'
   #     end
   #   end
   #
   # == Application and Engine
   #
-  # A Rails::Engine is nothing more than a Railtie with some initializers already set.
-  # And since Rails::Application is an engine, the same configuration described here
-  # can be used in both.
+  # An engine is nothing more than a railtie with some initializers already set. And since
+  # <tt>Rails::Application</tt> is an engine, the same configuration described here can be
+  # used in both.
   #
   # Be sure to look at the documentation of those specific classes for more information.
-  #
   class Railtie
-    autoload :Configuration, "rails/railtie/configuration"
+    autoload :Configuration, 'rails/railtie/configuration'
 
     include Initializable
 

data/lib/rails/tasks/dev.rake

@@ -1,14 +1,8 @@
+require 'rails/dev_caching'
+
 namespace :dev do
   desc 'Toggle development mode caching on/off'
   task :cache do
-    if File.exist? 'tmp/caching-dev.txt'
-      File.delete 'tmp/caching-dev.txt'
-      puts 'Development mode is no longer being cached.'
-    else
-      FileUtils.touch 'tmp/caching-dev.txt'
-      puts 'Development mode is now being cached.'
-    end
-
-    FileUtils.touch 'tmp/restart.txt'
+    Rails::DevCaching.enable_by_file
   end
 end

data/lib/rails/tasks/framework.rake

@@ -1,4 +1,6 @@
-namespace :rails do
+require 'active_support/deprecation'
+
+namespace :app do
   desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
   task update: [ "update:configs", "update:bin" ]
 
@@ -24,12 +26,12 @@ namespace :rails do
 
       default_templates.each do |type, names|
         local_template_type_dir = File.join(project_templates, type)
-        FileUtils.mkdir_p local_template_type_dir
+        mkdir_p local_template_type_dir, verbose: false
 
         names.each do |name|
           dst_name = File.join(local_template_type_dir, name)
           src_name = File.join(generators_lib, type, name, "templates")
-          FileUtils.cp_r src_name, dst_name
+          cp_r src_name, dst_name, verbose: false
         end
       end
     end
@@ -45,8 +47,9 @@ namespace :rails do
         @app_generator ||= begin
           require 'rails/generators'
           require 'rails/generators/rails/app/app_generator'
-          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true, api: !!Rails.application.config.api_only },
-            destination_root: Rails.root
+          gen = Rails::Generators::AppGenerator.new ["rails"],
+                                                    { api: !!Rails.application.config.api_only },
+                                                    destination_root: Rails.root
           File.exist?(Rails.root.join("config", "application.rb")) ?
             gen.send(:app_const) : gen.send(:valid_const?)
           gen
@@ -66,3 +69,15 @@ namespace :rails do
     end
   end
 end
+
+namespace :rails do
+  %i(update template templates:copy update:configs update:bin).each do |task_name|
+    task "#{task_name}" do
+      ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        Running #{task_name} with the rails: namespace is deprecated in favor of app: namespace.
+        Run bin/rails app:#{task_name} instead.
+      MSG
+      Rake.application.invoke_task("app:#{task_name}")
+    end
+  end
+end

data/lib/rails/tasks/misc.rake

@@ -10,29 +10,46 @@ task about: :environment do
 end
 
 namespace :time do
+  desc 'List all time zones, list by two-letter country code (`rails time:zones[US]`), or list by UTC offset (`rails time:zones[-8]`)'
+  task :zones, :country_or_offset do |t, args|
+    zones, offset = ActiveSupport::TimeZone.all, nil
+
+    if country_or_offset = args[:country_or_offset]
+      begin
+        zones = ActiveSupport::TimeZone.country_zones(country_or_offset)
+      rescue TZInfo::InvalidCountryCode
+        offset = country_or_offset
+      end
+    end
+
+    build_time_zone_list zones, offset
+  end
+
   namespace :zones do
-    desc 'Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6'
+    # desc 'Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6'
     task :all do
-      build_time_zone_list(:all)
+      build_time_zone_list ActiveSupport::TimeZone.all
     end
 
     # desc 'Displays names of US time zones recognized by the Rails TimeZone class, grouped by offset. Results can be filtered with optional OFFSET parameter, e.g., OFFSET=-6'
     task :us do
-      build_time_zone_list(:us_zones)
+      build_time_zone_list ActiveSupport::TimeZone.us_zones
     end
 
     # desc 'Displays names of time zones recognized by the Rails TimeZone class with the same offset as the system local time'
     task :local do
       require 'active_support'
       require 'active_support/time'
+
       jan_offset = Time.now.beginning_of_year.utc_offset
       jul_offset = Time.now.beginning_of_year.change(month: 7).utc_offset
       offset = jan_offset < jul_offset ? jan_offset : jul_offset
-      build_time_zone_list(:all, offset)
+
+      build_time_zone_list(ActiveSupport::TimeZone.all, offset)
     end
 
     # to find UTC -06:00 zones, OFFSET can be set to either -6, -6:00 or 21600
-    def build_time_zone_list(method, offset = ENV['OFFSET'])
+    def build_time_zone_list(zones, offset = ENV['OFFSET'])
       require 'active_support'
       require 'active_support/time'
       if offset
@@ -47,7 +64,7 @@ namespace :time do
         end
       end
       previous_offset = nil
-      ActiveSupport::TimeZone.__send__(method).each do |zone|
+      zones.each do |zone|
         if offset.nil? || offset == zone.utc_offset
           puts "\n* UTC #{zone.formatted_offset} *" unless zone.utc_offset == previous_offset
           puts zone.name

data/lib/rails/tasks/restart.rake

@@ -1,5 +1,8 @@
-desc "Restart app by touching tmp/restart.txt"
+desc 'Restart app by touching tmp/restart.txt'
 task :restart do
-  FileUtils.mkdir_p('tmp')
-  FileUtils.touch('tmp/restart.txt')
+  verbose(false) do
+    mkdir_p 'tmp'
+    touch 'tmp/restart.txt'
+    rm_f 'tmp/pids/server.pid'
+  end
 end

data/lib/rails/tasks/routes.rake

@@ -19,6 +19,9 @@ task routes: :environment do
 
   OptionParser.new do |opts|
     opts.banner = "Usage: rails routes [options]"
+
+    Rake.application.standard_rake_options.each { |args| opts.on(*args) }
+
     opts.on("-c CONTROLLER") do |controller|
       routes_filter = { controller: controller }
     end

data/lib/rails/tasks/statistics.rake

@@ -7,6 +7,7 @@ STATS_DIRECTORIES = [
   %w(Jobs               app/jobs),
   %w(Models             app/models),
   %w(Mailers            app/mailers),
+  %w(Channels           app/channels),
   %w(Javascripts        app/assets/javascripts),
   %w(Libraries          lib/),
   %w(Tasks              lib/tasks),