railties 5.0.0.beta3 → 5.0.0.beta4

data/lib/rails/code_statistics.rb

@@ -1,4 +1,5 @@
 require 'rails/code_statistics_calculator'
+require 'active_support/core_ext/enumerable'
 
 class CodeStatistics #:nodoc:
 

data/lib/rails/commands.rb

@@ -13,6 +13,6 @@ aliases = {
 command = ARGV.shift
 command = aliases[command] || command
 
-require 'rails/command'
+require 'rails/commands/commands_tasks'
 
-Rails::Command.run(command, ARGV)
+Rails::CommandsTasks.new(ARGV).run_command!(command)

data/lib/rails/commands/runner.rb

@@ -2,6 +2,7 @@ require 'optparse'
 
 options = { environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup }
 code_or_file = nil
+command = 'bin/rails runner'
 
 if ARGV.first.nil?
   ARGV.push "-h"
@@ -34,7 +35,7 @@ ARGV.clone.options do |opts|
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your executables:"
     opts.separator "    -------------------------------------------------------------"
-    opts.separator "    #!/usr/bin/env #{File.expand_path($0)} runner"
+    opts.separator "    #!/usr/bin/env #{File.expand_path(command)}"
     opts.separator ""
     opts.separator "    Product.all.each { |p| p.price *= 2 ; p.save! }"
     opts.separator "    -------------------------------------------------------------"
@@ -52,7 +53,7 @@ Rails.application.require_environment!
 Rails.application.load_runner
 
 if code_or_file.nil?
-  $stderr.puts "Run '#{$0} -h' for help."
+  $stderr.puts "Run '#{command} -h' for help."
   exit 1
 elsif File.exist?(code_or_file)
   $0 = code_or_file
@@ -62,7 +63,7 @@ else
     eval(code_or_file, binding, __FILE__, __LINE__)
   rescue SyntaxError, NameError
     $stderr.puts "Please specify a valid ruby command or the path of a script to run."
-    $stderr.puts "Run '#{$0} -h' for help."
+    $stderr.puts "Run '#{command} -h' for help."
     exit 1
   end
 end

data/lib/rails/commands/server.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'optparse'
 require 'action_dispatch'
 require 'rails'
+require 'rails/dev_caching'
 
 module Rails
   class Server < ::Rack::Server
@@ -92,20 +93,17 @@ module Rails
         DoNotReverseLookup: true,
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
-        caching:            false,
-        pid:                Options::DEFAULT_PID_PATH
+        caching:            nil,
+        pid:                Options::DEFAULT_PID_PATH,
+        restart_cmd:        restart_command
       })
     end
 
     private
 
       def setup_dev_caching
-        return unless options[:environment] == "development"
-
-        if options[:caching] == false
-          delete_cache_file
-        elsif options[:caching]
-          create_cache_file
+        if options[:environment] == "development"
+          Rails::DevCaching.enable_by_argument(options[:caching])
         end
       end
 
@@ -114,16 +112,6 @@ module Rails
         puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
         puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
         puts "=> Run `rails server -h` for more startup options"
-
-        puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
-      end
-
-      def create_cache_file
-        FileUtils.touch("tmp/caching-dev.txt")
-      end
-
-      def delete_cache_file
-        FileUtils.rm("tmp/caching-dev.txt") if File.exist?("tmp/caching-dev.txt")
       end
 
       def create_tmp_directories
@@ -143,5 +131,9 @@ module Rails
           Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
         end
       end
+
+      def restart_command
+        "bin/rails server #{ARGV.join(' ')}"
+      end
   end
 end

data/lib/rails/console/app.rb

@@ -29,8 +29,7 @@ module Rails
     # reloads the environment
     def reload!(print=true)
       puts "Reloading..." if print
-      ActionDispatch::Reloader.cleanup!
-      ActionDispatch::Reloader.prepare!
+      Rails.application.reloader.reload!
       true
     end
   end

data/lib/rails/dev_caching.rb

@@ -0,0 +1,43 @@
+require 'fileutils'
+
+module Rails
+  module DevCaching # :nodoc:
+    class << self
+      FILE = 'tmp/caching-dev.txt'
+
+      def enable_by_file
+        FileUtils.mkdir_p('tmp')
+
+        if File.exist?(FILE)
+          delete_cache_file
+          puts 'Development mode is no longer being cached.'
+        else
+          create_cache_file
+          puts 'Development mode is now being cached.'
+        end
+
+        FileUtils.touch 'tmp/restart.txt'
+        FileUtils.rm_f('tmp/pids/server.pid')
+      end
+
+      def enable_by_argument(caching)
+        FileUtils.mkdir_p('tmp')
+
+        if caching
+          create_cache_file
+        elsif caching == false && File.exist?(FILE)
+          delete_cache_file
+        end
+      end
+
+      private
+        def create_cache_file
+          FileUtils.touch FILE
+        end
+
+        def delete_cache_file
+          File.delete FILE
+        end
+    end
+  end
+end

data/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -1,5 +1,3 @@
-require 'open-uri'
-
 module Rails
   module Generators
     module Actions
@@ -207,18 +205,23 @@ module Rails
         in_root { run_ruby_script("bin/rails generate #{what} #{argument}", verbose: false) }
       end
 
-      # Runs the supplied rake task
+      # Runs the supplied rake task (invoked with 'rake ...')
       #
       #   rake("db:migrate")
       #   rake("db:migrate", env: "production")
       #   rake("gems:install", sudo: true)
       def rake(command, options={})
-        log :rake, command
-        env  = options[:env] || ENV["RAILS_ENV"] || 'development'
-        sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
-        in_root { run("#{sudo}#{extify(:rails)} #{command} RAILS_ENV=#{env}", verbose: false) }
+        execute_command :rake, command, options
+      end
+
+      # Runs the supplied rake task (invoked with 'rails ...')
+      #
+      #   rails("db:migrate")
+      #   rails("db:migrate", env: "production")
+      #   rails("gems:install", sudo: true)
+      def rails_command(command, options={})
+        execute_command :rails, command, options
       end
-      alias :rails_command :rake
 
       # Just run the capify command in root
       #
@@ -271,6 +274,16 @@ module Rails
           end
         end
 
+
+        # Runs the supplied command using either "rake ..." or "rails ..."
+        # based on the executor parameter provided.
+        def execute_command(executor, command, options={})
+          log executor, command
+          env  = options[:env] || ENV["RAILS_ENV"] || 'development'
+          sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
+          in_root { run("#{sudo}#{extify(executor)} #{command} RAILS_ENV=#{env}", verbose: false) }
+        end
+
         # Add an extension to the given name based on the platform.
         def extify(name)
           if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/

data/lib/rails/generators/actions/create_migration.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'thor/actions'
 
 module Rails

data/lib/rails/generators/app_base.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'digest/md5'
 require 'active_support/core_ext/string/strip'
 require 'rails/version' unless defined?(Rails::VERSION)
@@ -181,7 +182,7 @@ module Rails
       def webserver_gemfile_entry
         return [] if options[:skip_puma]
         comment = 'Use Puma as the app server'
-        GemfileEntry.new('puma', nil, comment)
+        GemfileEntry.new('puma', '~> 3.0', comment)
       end
 
       def include_all_railties?

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

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

data/lib/rails/generators/rails/app/app_generator.rb

@@ -80,6 +80,7 @@ module Rails
         template "secrets.yml"
         template "cable.yml" unless options[:skip_action_cable]
         template "puma.rb"   unless options[:skip_puma]
+        template "spring.rb" if spring_install?
 
         directory "environments"
         directory "initializers"
@@ -91,25 +92,42 @@ module Rails
       cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
       callback_terminator_config_exist = File.exist?('config/initializers/callback_terminator.rb')
       active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/active_record_belongs_to_required_by_default.rb')
+      to_time_preserves_timezone_config_exist = File.exist?('config/initializers/to_time_preserves_timezone.rb')
       action_cable_config_exist = File.exist?('config/cable.yml')
+      ssl_options_exist = File.exist?('config/initializers/ssl_options.rb')
+      rack_cors_config_exist = File.exist?('config/initializers/cors.rb')
 
       config
 
+      gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
+
       unless callback_terminator_config_exist
         remove_file 'config/initializers/callback_terminator.rb'
       end
 
       unless cookie_serializer_config_exist
-        gsub_file 'config/initializers/cookies_serializer.rb', /json/, 'marshal'
+        gsub_file 'config/initializers/cookies_serializer.rb', /json(?!,)/, 'marshal'
       end
 
       unless active_record_belongs_to_required_by_default_config_exist
         remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
       end
 
+      unless to_time_preserves_timezone_config_exist
+        remove_file 'config/initializers/to_time_preserves_timezone.rb'
+      end
+
       unless action_cable_config_exist
         template 'config/cable.yml'
       end
+
+      unless ssl_options_exist
+        remove_file 'config/initializers/ssl_options.rb'
+      end
+
+      unless rack_cors_config_exist
+        remove_file 'config/initializers/cors.rb'
+      end
     end
 
     def database_yml
@@ -322,7 +340,7 @@ module Rails
       def delete_action_cable_files_skipping_action_cable
         if options[:skip_action_cable]
           remove_file 'config/cable.yml'
-          remove_file 'app/assets/javascripts/cable.coffee'
+          remove_file 'app/assets/javascripts/cable.js'
           remove_dir 'app/channels'
         end
       end

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -26,16 +26,16 @@ source 'https://rubygems.org'
 <% if RUBY_ENGINE == 'ruby' -%>
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
+  gem 'byebug', platform: :mri
 end
 
 group :development do
 <%- unless options.api? -%>
-  # Access an IRB console on exception pages or by using <%%= console %> in views
+  # Access an IRB console on exception pages or by using <%%= console %> anywhere in the code.
   <%- if options.dev? || options.edge? -%>
   gem 'web-console', github: 'rails/web-console'
   <%- else -%>
-  gem 'web-console', '~> 3.0'
+  gem 'web-console'
   <%- end -%>
 <%- end -%>
 <% if depend_on_listen? -%>

data/lib/rails/generators/rails/app/templates/README.md

@@ -1,4 +1,4 @@
-## README
+# README
 
 This README would normally document whatever steps are necessary to get the
 application up and running.

data/lib/rails/generators/rails/app/templates/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

@@ -3,16 +3,13 @@
   <head>
     <title><%= camelized %></title>
     <%%= csrf_meta_tags %>
-    <%- unless options[:skip_action_cable] -%>
-    <%%= action_cable_meta_tag %>
-    <%- end -%>
 
     <%- if options[:skip_javascript] -%>
     <%%= stylesheet_link_tag    'application', media: 'all' %>
     <%- else -%>
       <%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%>
-    <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => 'reload' %>
-    <%%= javascript_include_tag 'application', 'data-turbolinks-track' => 'reload' %>
+    <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
       <%- else -%>
     <%%= stylesheet_link_tag    'application', media: 'all' %>
     <%%= javascript_include_tag 'application' %>

data/lib/rails/generators/rails/app/templates/bin/rails

@@ -1,3 +1,3 @@
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/lib/rails/generators/rails/app/templates/bin/setup

@@ -15,7 +15,7 @@ chdir APP_ROOT do
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
-  system('bundle check') or system!('bundle install')
+  system('bundle check') || system!('bundle install')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')

data/lib/rails/generators/rails/app/templates/bin/update

@@ -15,7 +15,7 @@ chdir APP_ROOT do
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
-  system 'bundle check' or system! 'bundle install'
+  system('bundle check') || system!('bundle install')
 
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'

data/lib/rails/generators/rails/app/templates/config.ru

@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application

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

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 <% if include_all_railties? -%>
 require 'rails/all'

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

@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.

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

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

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

@@ -16,10 +16,6 @@ Rails.application.configure do
   if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
-    <%- unless options.skip_action_mailer? -%>
-    config.action_mailer.perform_caching = false
-    <%- end -%>
-
     config.cache_store = :memory_store
     config.public_file_server.headers = {
       'Cache-Control' => 'public, max-age=172800'
@@ -27,16 +23,14 @@ Rails.application.configure do
   else
     config.action_controller.perform_caching = false
 
-    <%- unless options.skip_action_mailer? -%>
-    config.action_mailer.perform_caching = false
-    <%- end -%>
-
     config.cache_store = :null_store
   end
   <%- unless options.skip_action_mailer? -%>
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
   <%- end -%>
 
   # Print deprecation notices to the Rails logger.
@@ -52,15 +46,6 @@ Rails.application.configure do
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
-
-  # 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
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
   <%- end -%>
 
   # Raises error for missing translations