railties 5.0.0.beta3 → 5.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4fea73157abd641e818793971d61f9ba1c982cb
-  data.tar.gz: 9356d423706a1cb8c934ca166661c0bd9a018f5d
+  metadata.gz: 849b9b39dee2cd29bc2506bcdb4810e271cb8503
+  data.tar.gz: 2218346e1e9603f0401f7fb0b0bff4d7bcd664eb
 SHA512:
-  metadata.gz: 93728268e600949966dcb493db8738e8b601d973d09bff191808f473e5015862a8a533268e0354136e42b27e4ed73cfe70e8cbe6e34556ff39eeb292acddaea7
-  data.tar.gz: 941025bde174d4fc8645f143148dc26addbd7eb60df50d31c500fa9258105aa5d363b4270b7223ac3f90a280e35d4aa8e5c58a6ebab2c46716751e2b365c646b
+  metadata.gz: 0e3cca869fce3881223643ae25a0eaa8db48d917235f89293969256a6b8fcbd29020ac7cbec44e9435f39cf6cd861815625f4e8222cf89cf4fb1a75eab7880d8
+  data.tar.gz: 4579abdacba1336783561695db94b0bdc13b4b3b309c526cb1beedadb985a19da58f9c4d75a9ec0051d741cd677e9811926890f39869f6333328414a28791a43

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## Rails 5.0.0.beta4 (April 27, 2016) ##
+
+*   Add `config/initializers/to_time_preserves_timezone.rb`, which tells
+    Active Support to preserve the receiver's timezone when calling `to_time`.
+    This matches the new behavior that will be part of Ruby 2.4.
+
+    Fixes #24617.
+
+    *Andrew White*
+
+*   Make `rails restart` command work with Puma by passing the restart command
+    which Puma can use to restart rails server.
+
+    *Prathamesh Sonpatki*
+
+*   The application generator writes a new file `config/spring.rb`, which tells
+    Spring to watch additional common files.
+
+    *Xavier Noria*
+
+*   The tasks in the rails task namespace is deprecated in favor of app namespace.
+    (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.)
+
+    *Ryo Hashimoto*
+
+*   Enable HSTS with IncludeSudomains header for new applications.
+
+    *Egor Homakov*, *Prathamesh Sonpatki*
+
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
 *   Alias `rake` with `rails_command` in the Rails Application Templates API
@@ -19,7 +48,7 @@
     system monitor and the async plugin for spring.
 
 *   The Gemfiles of new applications include spring-watcher-listen on Linux and
-    Mac OS X (unless --skip-spring).
+    Mac OS X (unless `--skip-spring`).
 
     *Xavier Noria*
 
@@ -28,7 +57,9 @@
 
     *Xavier Noria*
 
-*   Add dummy files for apple-touch-icon.png and apple-touch-icon.png. GH#23427
+*   Add dummy files for apple-touch-icon.png and apple-touch-icon.png.
+
+    See #23427.
 
     *Alexey Zabelin*
 
@@ -92,7 +123,7 @@
 
     *Chuck Callebs*
 
-*   Allow use of minitest-rails gem with Rails test runner.
+*   Allow use of `minitest-rails` gem with Rails test runner.
 
     Fixes #22455.
 
@@ -105,13 +136,13 @@
     *Yuji Yaginuma*
 
 *   Make `static_index` part of the `config.public_file_server` config and
-    call it `public_file_server.index_name`.
+    call it `config.public_file_server.index_name`.
 
     *Yuki Nishijima*
 
-*   Deprecate `serve_static_files` in favor of `public_file_server.enabled`.
+*   Deprecate `config.serve_static_files` in favor of `config.public_file_server.enabled`.
 
-    Unifies the static asset options under `public_file_server`.
+    Unifies the static asset options under `config.public_file_server`.
 
     To upgrade, replace occurrences of:
 
@@ -149,8 +180,8 @@
 
     *Yuki Nishijima*
 
-*   Route generator should be idempotent
-    running generators several times no longer require you to cleanup routes.rb
+*   Route generators are now idempotent.
+    Running generators several times no longer require you to cleanup routes.rb.
 
     *Thiago Pinto*
 
@@ -158,7 +189,7 @@
 
     *Simon Eskildsen*
 
-*   Allow rake:stats to account for rake tasks in lib/tasks
+*   Allow `rake stats` to account for rake tasks in lib/tasks.
 
     *Kevin Deisz*
 
@@ -168,7 +199,7 @@
 
     *James Kerr*
 
-*   Add fail fast to `bin/rails test`
+*   Add fail fast to `bin/rails test`.
 
     Adding `--fail-fast` or `-f` when running tests will interrupt the run on
     the first failure:
@@ -200,7 +231,7 @@
 
     *Kasper Timm Hansen*
 
-*   Add inline output to `bin/rails test`
+*   Add inline output to `bin/rails test`.
 
     Any failures or errors (and skips if running in verbose mode) are output
     during a test run:
@@ -231,7 +262,7 @@
     *Kasper Timm Hansen*
 
 *   Fix displaying mailer previews on non local requests when config
-    `action_mailer.show_previews` is set
+    `config.action_mailer.show_previews` is set.
 
     *Wojciech Wnętrzak*
 
@@ -262,14 +293,14 @@
     *Ersin Akinci*
 
 *   Make enabling or disabling caching in development mode possible with
-    rake dev:cache.
+    `rake dev:cache`.
 
-    Running rake dev:cache will create or remove tmp/caching-dev.txt. When this
-    file exists config.action_controller.perform_caching will be set to true in
+    Running `rake dev:cache` will create or remove tmp/caching-dev.txt. When this
+    file exists `config.action_controller.perform_caching` will be set to true in
     config/environments/development.rb.
 
-    Additionally, a server can be started with either --dev-caching or
-    --no-dev-caching included to toggle caching on startup.
+    Additionally, a server can be started with either `--dev-caching` or
+    `--no-dev-caching` included to toggle caching on startup.
 
     *Jussi Mertanen*, *Chuck Callebs*
 
@@ -282,11 +313,11 @@
 
     *Yuji Yaginuma*
 
-*   Adding support for passing a block to the `add_source` action of a custom generator
+*   Adding support for passing a block to the `add_source` action of a custom generator.
 
     *Mike Dalton*, *Hirofumi Wakasugi*
 
-*   `assert_file` understands paths with special characters
+*   `assert_file` now understands paths with special characters
     (eg. `v0.1.4~alpha+nightly`).
 
     *Diego Carrion*

data/lib/rails/all.rb

@@ -1,4 +1,4 @@
-require "rails"
+require 'rails'
 
 %w(
   active_record/railtie
@@ -11,7 +11,7 @@ require "rails"
   sprockets/railtie
 ).each do |railtie|
   begin
-    require "#{railtie}"
+    require railtie
   rescue LoadError
   end
 end

data/lib/rails/app_loader.rb

@@ -16,7 +16,7 @@ like any other source code, rather than stubs that are generated on demand.
 Here's how to upgrade:
 
   bundle config --delete bin    # Turn off Bundler's stub generator
-  rake rails:update:bin         # Use the new Rails 4 executables
+  rails app:update:bin          # Use the new Rails 5 executables
   git add bin                   # Add bin/ to source control
 
 You may need to remove bin/ from your .gitignore as well.

data/lib/rails/application.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 require 'yaml'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
@@ -74,8 +73,7 @@ module Rails
   # the configuration.
   #
   # If you decide to define rake tasks, runners, or initializers in an
-  # application other than +Rails.application+, then you must run those
-  # these manually.
+  # application other than +Rails.application+, then you must run them manually.
   class Application < Engine
     autoload :Bootstrap,              'rails/application/bootstrap'
     autoload :Configuration,          'rails/application/configuration'
@@ -113,7 +111,7 @@ module Rails
 
     attr_accessor :assets, :sandbox
     alias_method :sandbox?, :sandbox
-    attr_reader :reloaders
+    attr_reader :reloaders, :reloader, :executor
 
     delegate :default_url_options, :default_url_options=, to: :routes
 
@@ -131,6 +129,10 @@ module Rails
       @message_verifiers = {}
       @ran_load_hooks    = false
 
+      @executor          = Class.new(ActiveSupport::Executor)
+      @reloader          = Class.new(ActiveSupport::Reloader)
+      @reloader.executor = @executor
+
       # are these actually used?
       @initial_variable_values = initial_variable_values
       @block = block
@@ -243,7 +245,7 @@ module Rails
       @app_env_config ||= begin
         validate_secret_key_config!
 
-        super.merge({
+        super.merge(
           "action_dispatch.parameter_filter" => config.filter_parameters,
           "action_dispatch.redirect_filter" => config.filter_redirect,
           "action_dispatch.secret_token" => secrets.secret_token,
@@ -259,7 +261,7 @@ module Rails
           "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt,
           "action_dispatch.cookies_serializer" => config.action_dispatch.cookies_serializer,
           "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest
-        })
+        )
       end
     end
 

data/lib/rails/application/bootstrap.rb

@@ -1,6 +1,7 @@
-require "active_support/notifications"
-require "active_support/dependencies"
-require "active_support/descendants_tracker"
+require 'fileutils'
+require 'active_support/notifications'
+require 'active_support/dependencies'
+require 'active_support/descendants_tracker'
 
 module Rails
   class Application

data/lib/rails/application/configuration.rb

@@ -58,7 +58,7 @@ module Rails
 
       def static_cache_control=(value)
         ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
-          `static_cache_control` is deprecated and will be removed in Rails 5.1.
+          `config.static_cache_control` is deprecated and will be removed in Rails 5.1.
           Please use
           `config.public_file_server.headers = { 'Cache-Control' => '#{value}' }`
           instead.
@@ -69,8 +69,8 @@ module Rails
 
       def serve_static_files
         ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
-          `serve_static_files` is deprecated and will be removed in Rails 5.1.
-          Please use `public_file_server.enabled` instead.
+          `config.serve_static_files` is deprecated and will be removed in Rails 5.1.
+          Please use `config.public_file_server.enabled` instead.
         eow
 
         @public_file_server.enabled
@@ -78,8 +78,8 @@ module Rails
 
       def serve_static_files=(value)
         ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
-          `serve_static_files` is deprecated and will be removed in Rails 5.1.
-          Please use `public_file_server.enabled = #{value}` instead.
+          `config.serve_static_files` is deprecated and will be removed in Rails 5.1.
+          Please use `config.public_file_server.enabled = #{value}` instead.
         eow
 
         @public_file_server.enabled = value

data/lib/rails/application/default_middleware_stack.rb

@@ -34,22 +34,10 @@ module Rails
             # handling: presumably their code is not threadsafe
 
             middleware.use ::Rack::Lock
-
-          elsif config.allow_concurrency == :unsafe
-            # Do nothing, even if we know this is dangerous. This is the
-            # historical behaviour for true.
-
-          else
-            # Default concurrency setting: enabled, but safe
-
-            unless config.cache_classes && config.eager_load
-              # Without cache_classes + eager_load, the load interlock
-              # is required for proper operation
-
-              middleware.use ::ActionDispatch::LoadInterlock
-            end
           end
 
+          middleware.use ::ActionDispatch::Executor, app.executor
+
           middleware.use ::Rack::Runtime
           middleware.use ::Rack::MethodOverride unless config.api_only
           middleware.use ::ActionDispatch::RequestId
@@ -61,7 +49,7 @@ module Rails
           middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
 
           unless config.cache_classes
-            middleware.use ::ActionDispatch::Reloader, lambda { reload_dependencies? }
+            middleware.use ::ActionDispatch::Reloader, app.reloader
           end
 
           middleware.use ::ActionDispatch::Callbacks
@@ -83,10 +71,6 @@ module Rails
 
       private
 
-        def reload_dependencies?
-          config.reload_classes_only_on_change != true || app.reloaders.map(&:updated?).any?
-        end
-
         def load_rack_cache
           rack_cache = config.action_dispatch.rack_cache
           return unless rack_cache

data/lib/rails/application/finisher.rb

@@ -38,16 +38,16 @@ module Rails
         app.routes.define_mounted_helper(:main_app)
       end
 
-      initializer :add_to_prepare_blocks do
+      initializer :add_to_prepare_blocks do |app|
         config.to_prepare_blocks.each do |block|
-          ActionDispatch::Reloader.to_prepare(&block)
+          app.reloader.to_prepare(&block)
         end
       end
 
       # This needs to happen before eager load so it happens
       # in exactly the same point regardless of config.cache_classes
-      initializer :run_prepare_callbacks do
-        ActionDispatch::Reloader.prepare!
+      initializer :run_prepare_callbacks do |app|
+        app.reloader.prepare!
       end
 
       initializer :eager_load! do
@@ -62,13 +62,60 @@ module Rails
         ActiveSupport.run_load_hooks(:after_initialize, self)
       end
 
+      class MutexHook
+        def initialize(mutex = Mutex.new)
+          @mutex = mutex
+        end
+
+        def run
+          @mutex.lock
+        end
+
+        def complete(_state)
+          @mutex.unlock
+        end
+      end
+
+      module InterlockHook
+        def self.run
+          ActiveSupport::Dependencies.interlock.start_running
+        end
+
+        def self.complete(_state)
+          ActiveSupport::Dependencies.interlock.done_running
+        end
+      end
+
+      initializer :configure_executor_for_concurrency do |app|
+        if config.allow_concurrency == false
+          # User has explicitly opted out of concurrent request
+          # handling: presumably their code is not threadsafe
+
+          app.executor.register_hook(MutexHook.new, outer: true)
+
+        elsif config.allow_concurrency == :unsafe
+          # Do nothing, even if we know this is dangerous. This is the
+          # historical behaviour for true.
+
+        else
+          # Default concurrency setting: enabled, but safe
+
+          unless config.cache_classes && config.eager_load
+            # Without cache_classes + eager_load, the load interlock
+            # is required for proper operation
+
+            app.executor.register_hook(InterlockHook, outer: true)
+          end
+        end
+      end
+
       # Set routes reload after the finisher hook to ensure routes added in
       # the hook are taken into account.
-      initializer :set_routes_reloader_hook do
+      initializer :set_routes_reloader_hook do |app|
         reloader = routes_reloader
         reloader.execute_if_updated
         self.reloaders << reloader
-        ActionDispatch::Reloader.to_prepare do
+        app.reloader.to_run do
           # We configure #execute rather than #execute_if_updated because if
           # autoloaded constants are cleared we need to reload routes also in
           # case any was used there, as in
@@ -78,18 +125,27 @@ module Rails
           # This means routes are also reloaded if i18n is updated, which
           # might not be necessary, but in order to be more precise we need
           # some sort of reloaders dependency support, to be added.
+          require_unload_lock!
           reloader.execute
         end
       end
 
       # Set clearing dependencies after the finisher hook to ensure paths
       # added in the hook are taken into account.
-      initializer :set_clear_dependencies_hook, group: :all do
+      initializer :set_clear_dependencies_hook, group: :all do |app|
         callback = lambda do
-          ActiveSupport::Dependencies.interlock.unloading do
-            ActiveSupport::DescendantsTracker.clear
-            ActiveSupport::Dependencies.clear
+          ActiveSupport::DescendantsTracker.clear
+          ActiveSupport::Dependencies.clear
+        end
+
+        if config.cache_classes
+          app.reloader.check = lambda { false }
+        elsif config.reload_classes_only_on_change
+          app.reloader.check = lambda do
+            app.reloaders.map(&:updated?).any?
           end
+        else
+          app.reloader.check = lambda { true }
         end
 
         if config.reload_classes_only_on_change
@@ -99,15 +155,19 @@ module Rails
           # Prepend this callback to have autoloaded constants cleared before
           # any other possible reloading, in case they need to autoload fresh
           # constants.
-          ActionDispatch::Reloader.to_prepare(prepend: true) do
+          app.reloader.to_run(prepend: true) do
             # In addition to changes detected by the file watcher, if routes
             # or i18n have been updated we also need to clear constants,
             # that's why we run #execute rather than #execute_if_updated, this
             # callback has to clear autoloaded constants after any update.
-            reloader.execute
+            class_unload! do
+              reloader.execute
+            end
           end
         else
-          ActionDispatch::Reloader.to_cleanup(&callback)
+          app.reloader.to_complete do
+            class_unload!(&callback)
+          end
         end
       end