railties 4.0.13 → 4.1.0.beta1

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/4-0-stable/railties
+* https://github.com/rails/rails/tree/master/railties
 
 == License
 

data/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-git_path = File.join(File.expand_path('../../..', __FILE__), '.git')
+git_path = File.expand_path('../../../.git', __FILE__)
 
 if File.exist?(git_path)
   railties_path = File.expand_path('../../lib', __FILE__)

data/lib/rails.rb

@@ -3,12 +3,13 @@ require 'rails/ruby_version_check'
 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 'rails/application'
 require 'rails/version'
-require 'rails/deprecation'
 
 require 'active_support/railtie'
 require 'action_dispatch/railtie'
@@ -20,26 +21,23 @@ silence_warnings do
 end
 
 module Rails
-  autoload :Info, 'rails/info'
-  autoload :InfoController,    'rails/info_controller'
-  autoload :WelcomeController, 'rails/welcome_controller'
+  extend ActiveSupport::Autoload
+
+  autoload :Info
+  autoload :InfoController
+  autoload :MailersController
+  autoload :WelcomeController
 
   class << self
     attr_accessor :application, :cache, :logger
 
+    delegate :initialize!, :initialized?, to: :application
+
     # The Configuration instance used to configure the Rails environment
     def configuration
       application.config
     end
 
-    def initialize!
-      application.initialize!
-    end
-
-    def initialized?
-      application.initialized?
-    end
-
     def backtrace_cleaner
       @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
@@ -76,7 +74,7 @@ module Rails
       env = Rails.env
       groups.unshift(:default, env)
       groups.concat ENV["RAILS_GROUPS"].to_s.split(",")
-      groups.concat hash.map { |k,v| k if v.map(&:to_s).include?(env) }
+      groups.concat hash.map { |k, v| k if v.map(&:to_s).include?(env) }
       groups.compact!
       groups.uniq!
       groups

data/lib/rails/all.rb

@@ -3,6 +3,7 @@ require "rails"
 %w(
   active_record
   action_controller
+  action_view
   action_mailer
   rails/test_unit
   sprockets

data/lib/rails/api/task.rb

@@ -7,7 +7,6 @@ module Rails
         'activesupport' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
             lib/active_support/**/*.rb
           ),
           :exclude => 'lib/active_support/vendor/*'
@@ -16,16 +15,13 @@ module Rails
         'activerecord' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
             lib/active_record/**/*.rb
-          ),
-          :exclude => 'lib/active_record/vendor/*'
+          )
         },
 
         'activemodel' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
             lib/active_model/**/*.rb
           )
         },
@@ -33,29 +29,30 @@ module Rails
         'actionpack' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
             lib/abstract_controller/**/*.rb
             lib/action_controller/**/*.rb
             lib/action_dispatch/**/*.rb
+          )
+        },
+
+        'actionview' => {
+          :include => %w(
+            README.rdoc
             lib/action_view/**/*.rb
           ),
-          :exclude => 'lib/action_controller/vendor/*'
+          :exclude => 'lib/action_view/vendor/*'
         },
 
         'actionmailer' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
             lib/action_mailer/**/*.rb
-          ),
-          :exclude => 'lib/action_mailer/vendor/*'
+          )
         },
 
         'railties' => {
           :include => %w(
             README.rdoc
-            CHANGELOG.md
-            MIT-LICENSE
             lib/**/*.rb
           ),
           :exclude => 'lib/rails/generators/rails/**/templates/**/*.rb'

data/lib/rails/app_rails_loader.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Rails
   module AppRailsLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    RUBY = Gem.ruby
     EXECUTABLES = ['bin/rails', 'script/rails']
     BUNDLER_WARNING = <<EOS
 Looks like your app's ./bin/rails is a stub that was generated by Bundler.
@@ -49,7 +49,7 @@ EOS
         # call to generate a new application, so restore the original cwd.
         Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
 
-        # Otherwise keep moving upwards in search of a executable.
+        # Otherwise keep moving upwards in search of an executable.
         Dir.chdir('..')
       end
     end

data/lib/rails/application.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
+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'
 
 module Rails
@@ -51,21 +53,49 @@ module Rails
   #   10) Run config.before_eager_load and eager_load! if eager_load is true
   #   11) Run config.after_initialize callbacks
   #
+  # == Multiple Applications
+  #
+  # If you decide to define multiple applications, then the first application
+  # that is initialized will be set to +Rails.application+, unless you override
+  # it with a different application.
+  #
+  # To create a new application, you can instantiate a new instance of a class
+  # that has already been created:
+  #
+  #   class Application < Rails::Application
+  #   end
+  #
+  #   first_application  = Application.new
+  #   second_application = Application.new(config: first_application.config)
+  #
+  # In the above example, the configuration from the first application was used
+  # to initialize the second application. You can also use the +initialize_copy+
+  # 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
+  # application other than +Rails.application+, then you must run those
+  # these manually.
   class Application < Engine
-    autoload :Bootstrap,      'rails/application/bootstrap'
-    autoload :Configuration,  'rails/application/configuration'
-    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)
-        raise "You cannot have more than one Rails::Application" if Rails.application
         super
-        Rails.application = base.instance
-        Rails.application.add_lib_to_load_path!
-        ActiveSupport.run_load_hooks(:before_configuration, base.instance)
+        Rails.application ||= base.instance
       end
+
+      # Makes the +new+ method public.
+      #
+      # Note that Rails::Application inherits from Rails::Engine, which
+      # inherits from Rails::Railtie and the +new+ method on Rails::Railtie is
+      # private
+      public :new
     end
 
     attr_accessor :assets, :sandbox
@@ -74,14 +104,29 @@ module Rails
 
     delegate :default_url_options, :default_url_options=, to: :routes
 
-    def initialize
-      super
-      @initialized      = false
-      @reloaders        = []
-      @routes_reloader  = nil
-      @app_env_config   = nil
-      @ordered_railties = nil
-      @railties         = nil
+    INITIAL_VARIABLES = [:config, :railties, :routes_reloader, :reloaders,
+                         :routes, :helpers, :app_env_config, :secrets] # :nodoc:
+
+    def initialize(initial_variable_values = {}, &block)
+      super()
+      @initialized       = false
+      @reloaders         = []
+      @routes_reloader   = nil
+      @app_env_config    = nil
+      @ordered_railties  = nil
+      @railties          = nil
+      @message_verifiers = {}
+
+      add_lib_to_load_path!
+      ActiveSupport.run_load_hooks(:before_configuration, self)
+
+      initial_variable_values.each do |variable_name, value|
+        if INITIAL_VARIABLES.include?(variable_name)
+          instance_variable_set("@#{variable_name}", value)
+        end
+      end
+
+      instance_eval(&block) if block_given?
     end
 
     # Returns true if the application is initialized.
@@ -102,14 +147,13 @@ module Rails
       routes_reloader.reload!
     end
 
-
     # Return the application's KeyGenerator
     def key_generator
       # number of iterations selected based on consultation with the google security
       # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
       @caching_key_generator ||= begin
-        if config.secret_key_base
-          key_generator = ActiveSupport::KeyGenerator.new(config.secret_key_base, iterations: 1000)
+        if secrets.secret_key_base
+          key_generator = ActiveSupport::KeyGenerator.new(secrets.secret_key_base, iterations: 1000)
           ActiveSupport::CachingKeyGenerator.new(key_generator)
         else
           ActiveSupport::LegacyKeyGenerator.new(config.secret_token)
@@ -117,40 +161,42 @@ module Rails
       end
     end
 
-    # Stores some of the Rails initial environment parameters which
-    # will be used by middlewares and engines to configure themselves.
-    # Currently stores:
+    # Returns a message verifier object.
+    #
+    # This verifier can be used to generate and verify signed messages in the application.
+    #
+    # It is recommended not to use the same verifier for different things, so you can get different
+    # verifiers passing the +verifier_name+ argument.
     #
-    #   * "action_dispatch.parameter_filter"             => config.filter_parameters
-    #   * "action_dispatch.redirect_filter"              => config.filter_redirect
-    #   * "action_dispatch.secret_token"                 => config.secret_token
-    #   * "action_dispatch.secret_key_base"              => config.secret_key_base
-    #   * "action_dispatch.show_exceptions"              => config.action_dispatch.show_exceptions
-    #   * "action_dispatch.show_detailed_exceptions"     => config.consider_all_requests_local
-    #   * "action_dispatch.logger"                       => Rails.logger
-    #   * "action_dispatch.backtrace_cleaner"            => Rails.backtrace_cleaner
-    #   * "action_dispatch.key_generator"                => key_generator
-    #   * "action_dispatch.http_auth_salt"               => config.action_dispatch.http_auth_salt
-    #   * "action_dispatch.signed_cookie_salt"           => config.action_dispatch.signed_cookie_salt
-    #   * "action_dispatch.encrypted_cookie_salt"        => config.action_dispatch.encrypted_cookie_salt
-    #   * "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt
+    # ==== Parameters
     #
+    # * +salt+ - the salt that will be used to generate the secret key of the verifier.
+    #
+    # ==== Examples
+    #
+    #     message = Rails.application.message_verifier('salt').generate('my sensible data')
+    #     Rails.application.message_verifier('salt').verify(message)
+    #     # => 'my sensible data'
+    #
+    # See the +ActiveSupport::MessageVerifier+ documentation for more information.
+    def message_verifier(salt)
+      @message_verifiers[salt] ||= begin
+        secret = key_generator.generate_key(salt)
+        ActiveSupport::MessageVerifier.new(secret)
+      end
+    end
+
+    # Stores some of the Rails initial environment parameters which
+    # will be used by middlewares and engines to configure themselves.
     def env_config
       @app_env_config ||= begin
-        if config.secret_key_base.blank?
-          ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base. " +
-            "Read the upgrade documentation to learn more about this new config option."
-
-          if config.secret_token.blank?
-            raise "You must set config.secret_key_base in your app's config."
-          end
-        end
+        validate_secret_key_config!
 
         super.merge({
           "action_dispatch.parameter_filter" => config.filter_parameters,
           "action_dispatch.redirect_filter" => config.filter_redirect,
           "action_dispatch.secret_token" => config.secret_token,
-          "action_dispatch.secret_key_base" => config.secret_key_base,
+          "action_dispatch.secret_key_base" => secrets.secret_key_base,
           "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
           "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
           "action_dispatch.logger" => Rails.logger,
@@ -164,6 +210,30 @@ 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.
+    def rake_tasks(&block)
+      self.class.rake_tasks(&block)
+    end
+
+    # 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)
+      self.class.initializer(name, opts, &block)
+    end
+
+    # Sends any runner called in the instance of a new application up
+    # to the +runner+ method defined in Rails::Railtie.
+    def runner(&blk)
+      self.class.runner(&blk)
+    end
+
+    # Sends the +isolate_namespace+ method up to the class method.
+    def isolate_namespace(mod)
+      self.class.isolate_namespace(mod)
+    end
+
     ## Rails internal API
 
     # This method is called just after an application inherits from Rails::Application,
@@ -181,7 +251,9 @@ module Rails
     # you need to load files in lib/ during the application configuration as well.
     def add_lib_to_load_path! #:nodoc:
       path = File.join config.root, 'lib'
-      $LOAD_PATH.unshift(path) if File.exist?(path)
+      if File.exist?(path) && !$LOAD_PATH.include?(path)
+        $LOAD_PATH.unshift(path)
+      end
     end
 
     def require_environment! #:nodoc:
@@ -207,9 +279,7 @@ module Rails
     end
 
     # Initialize the application passing the given group. By default, the
-    # group is :default but sprockets precompilation passes group equals
-    # to assets if initialize_on_precompile is false to avoid booting the
-    # whole app.
+    # group is :default
     def initialize!(group=:default) #:nodoc:
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
@@ -227,6 +297,31 @@ module Rails
       @config ||= Application::Configuration.new(find_root_with_flag("config.ru", Dir.pwd))
     end
 
+    def config=(configuration) #:nodoc:
+      @config = configuration
+    end
+
+    def secrets #:nodoc:
+      @secrets ||= begin
+        secrets = ActiveSupport::OrderedOptions.new
+        yaml = config.paths["config/secrets"].first
+        if File.exist?(yaml)
+          require "erb"
+          env_secrets = YAML.load(ERB.new(IO.read(yaml)).result)[Rails.env]
+          secrets.merge!(env_secrets.symbolize_keys) if env_secrets
+        end
+
+        # Fallback to config.secret_key_base if secrets.secret_key_base isn't set
+        secrets.secret_key_base ||= config.secret_key_base
+
+        secrets
+      end
+    end
+
+    def secrets=(secrets) #:nodoc:
+      @secrets = secrets
+    end
+
     def to_app #:nodoc:
       self
     end
@@ -235,16 +330,6 @@ module Rails
       config.helpers_paths
     end
 
-    # Return an array of railties respecting the order they're loaded
-    # and the order specified by the +railties_order+ config.
-    #
-    # While when running initializers we need engines in reverse
-    # order here when copying migrations from railties we need then in the same
-    # order as given by +railties_order+
-    def migration_railties # :nodoc:
-      ordered_railties.flatten - [self]
-    end
-
   protected
 
     alias :build_middleware_stack :app
@@ -253,7 +338,6 @@ module Rails
       railties.each { |r| r.run_tasks_blocks(app) }
       super
       require "rails/tasks"
-      config = self.config
       task :environment do
         ActiveSupport.on_load(:before_initialize) { config.eager_load = false }
 
@@ -295,13 +379,13 @@ module Rails
 
         index = order.index(:all)
         order[index] = all
-        order
+        order.reverse.flatten
       end
     end
 
     def railties_initializers(current) #:nodoc:
       initializers = []
-      ordered_railties.reverse.flatten.each do |r|
+      ordered_railties.each do |r|
         if r == self
           initializers += current
         else
@@ -311,94 +395,9 @@ module Rails
       initializers
     end
 
-    def reload_dependencies? #:nodoc:
-      config.reload_classes_only_on_change != true || reloaders.map(&:updated?).any?
-    end
-
     def default_middleware_stack #:nodoc:
-      ActionDispatch::MiddlewareStack.new.tap do |middleware|
-        app = self
-
-        if rack_cache = load_rack_cache
-          require "action_dispatch/http/rack_cache"
-          middleware.use ::Rack::Cache, rack_cache
-        end
-
-        if config.force_ssl
-          middleware.use ::ActionDispatch::SSL, config.ssl_options
-        end
-
-        middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
-
-        if config.serve_static_assets
-          middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
-        end
-
-        middleware.use ::Rack::Lock unless allow_concurrency?
-        middleware.use ::Rack::Runtime
-        middleware.use ::Rack::MethodOverride
-        middleware.use ::ActionDispatch::RequestId
-
-        # Must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::Rails::Rack::Logger, config.log_tags
-        middleware.use ::ActionDispatch::ShowExceptions, show_exceptions_app
-        middleware.use ::ActionDispatch::DebugExceptions, app
-        middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
-
-        unless config.cache_classes
-          middleware.use ::ActionDispatch::Reloader, lambda { app.reload_dependencies? }
-        end
-
-        middleware.use ::ActionDispatch::Callbacks
-        middleware.use ::ActionDispatch::Cookies
-
-        if config.session_store
-          if config.force_ssl && !config.session_options.key?(:secure)
-            config.session_options[:secure] = true
-          end
-          middleware.use config.session_store, config.session_options
-          middleware.use ::ActionDispatch::Flash
-        end
-
-        middleware.use ::ActionDispatch::ParamsParser
-        middleware.use ::Rack::Head
-        middleware.use ::Rack::ConditionalGet
-        middleware.use ::Rack::ETag, "no-cache"
-      end
-    end
-
-    def allow_concurrency?
-      if config.allow_concurrency.nil?
-        config.cache_classes
-      else
-        config.allow_concurrency
-      end
-    end
-
-    def load_rack_cache
-      rack_cache = config.action_dispatch.rack_cache
-      return unless rack_cache
-
-      begin
-        require 'rack/cache'
-      rescue LoadError => error
-        error.message << ' Be sure to add rack-cache to your Gemfile'
-        raise
-      end
-
-      if rack_cache == true
-        {
-          metastore: "rails:/",
-          entitystore: "rails:/",
-          verbose: false
-        }
-      else
-        rack_cache
-      end
-    end
-
-    def show_exceptions_app
-      config.exceptions_app || ActionDispatch::PublicExceptions.new(Rails.public_path)
+      default_stack = DefaultMiddlewareStack.new(self, config, paths)
+      default_stack.build_stack
     end
 
     def build_original_fullpath(env) #:nodoc:
@@ -412,5 +411,11 @@ module Rails
         "#{script_name}#{path_info}"
       end
     end
+
+    def validate_secret_key_config! #:nodoc:
+      if secrets.secret_key_base.blank? && config.secret_token.blank?
+        raise "You must set secret_key_base in your app's config"
+      end
+    end
   end
 end