railties 4.2.0.rc3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88874438743eb9e5522e5331297d6c94bc06e141
-  data.tar.gz: 15f485dbfedcf89849b0c8b3a22a29c39da7e1c0
+  metadata.gz: 55baacf9acdd0d42344c849d3b057fbc89ac979d
+  data.tar.gz: 9ade7f6a3318f7aad6227abcc28c18bece50ebb1
 SHA512:
-  metadata.gz: 9bd2a6f33ffceb1f5dad6d8ba92dc87ebebb3841e0d171a9539add1544ac5e8548daddb6505f4bb076cca9edff4f4a52ab2c1f76fae374888b818bf5aad5af86
-  data.tar.gz: de8253f7d0311d9929889893376e781728701ba4a91136c8b361b6e47413bc13f079b1c2669271a427caf336d3488d7632e9e29d3be16c52e1e39289a9cb9ca9
+  metadata.gz: eae7ddad125a425b93487bd646b65c1fa058d73ee993cdd1729a7bc631d61a1ed6466a7ef5bad146e9bf27d5f7afd02af2c4dc27d5a93590ce27f0e9c5ec569d
+  data.tar.gz: 23e2210d29927128d38510c7c6ccc73d3c199d2aaed0e8eaa8a4233a3e14d128a70eba2ecf1b28c39b0310aa2c6908953b19781286aa206d6c57c199bed2ab35

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+*   Deprecate `config.serve_static_assets` in favor of `config.serve_static_files`
+    to clarify that the option is unrelated to the asset pipeline.
+
+    *Godfrey Chan*
+
+*   `config.serve_static_files` can now be set from an environment variable in
+    production mode. The feature remains off by default, but can be enabled by
+    setting `RAILS_SERVE_STATIC_FILES` to a non-empty string at boot time.
+
+    *Richard Schneeman*, *Godfrey Chan*
+
 *   Generated migrations add the appropriate foreign key constraints to
     references.
 

data/lib/rails/application/configuration.rb

@@ -1,5 +1,7 @@
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/string/filters'
 require 'active_support/file_update_checker'
+require 'active_support/deprecation'
 require 'rails/engine/configuration'
 require 'rails/source_annotation_extractor'
 
@@ -11,7 +13,7 @@ module Rails
                     :eager_load, :exceptions_app, :file_watcher, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
                     :railties_order, :relative_url_root, :secret_key_base, :secret_token,
-                    :serve_static_assets, :ssl_options, :static_cache_control, :session_options,
+                    :serve_static_files, :ssl_options, :static_cache_control, :session_options,
                     :time_zone, :reload_classes_only_on_change,
                     :beginning_of_week, :filter_redirect, :x
 
@@ -25,7 +27,7 @@ module Rails
         @filter_parameters             = []
         @filter_redirect               = []
         @helpers_paths                 = []
-        @serve_static_assets           = true
+        @serve_static_files            = true
         @static_cache_control          = nil
         @force_ssl                     = false
         @ssl_options                   = {}
@@ -139,6 +141,25 @@ module Rails
         self.generators.colorize_logging = val
       end
 
+      # :nodoc:
+      SERVE_STATIC_ASSETS_DEPRECATION_MESSAGE = <<-MSG.squish
+        The configuration option `config.serve_static_assets` has been renamed
+        to `config.serve_static_files` to clarify its role (it merely enables
+        serving everything in the `public` folder and is unrelated to the asset
+        pipeline). The `serve_static_assets` alias will be removed in Rails 5.0.
+        Please migrate your configuration files accordingly.
+      MSG
+
+      def serve_static_assets
+        ActiveSupport::Deprecation.warn SERVE_STATIC_ASSETS_DEPRECATION_MESSAGE
+        serve_static_files
+      end
+
+      def serve_static_assets=(value)
+        ActiveSupport::Deprecation.warn SERVE_STATIC_ASSETS_DEPRECATION_MESSAGE
+        self.serve_static_files = value
+      end
+
       def session_store(*args)
         if args.empty?
           case @session_store

data/lib/rails/application/default_middleware_stack.rb

@@ -17,7 +17,7 @@ module Rails
 
           middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
 
-          if config.serve_static_assets
+          if config.serve_static_files
             middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
           end
 

data/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "rc3"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

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

@@ -20,8 +20,9 @@ Rails.application.configure do
   # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or NGINX will already do this).
-  config.serve_static_assets = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   <%- unless options.skip_sprockets? -%>
   # Compress JavaScripts and CSS.

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

@@ -12,8 +12,8 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc3
+  version: 4.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc3
+        version: 4.2.0
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -352,9 +352,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2