railties 4.0.0.beta1 → 4.0.0.rc1

data/lib/rails/app_rails_loader.rb

@@ -4,34 +4,58 @@ module Rails
   module AppRailsLoader
     RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
     EXECUTABLES = ['bin/rails', 'script/rails']
+    BUNDLER_WARNING = <<EOS
+Looks like your app's ./bin/rails is a stub that was generated by Bundler.
+
+In Rails 4, your app's bin/ directory contains executables that are versioned
+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
+  git add bin                   # Add bin/ to source control
+
+You may need to remove bin/ from your .gitignore as well.
+
+When you install a gem whose executable you want to use in your app,
+generate it and add it to source control:
+
+  bundle binstubs some-gem-name
+  git add bin/new-executable
+
+EOS
 
     def self.exec_app_rails
-      cwd   = Dir.pwd
+      original_cwd = Dir.pwd
 
-      exe   = find_executable
-      exe ||= find_executable_in_parent_path
-      return unless exe
+      loop do
+        if exe = find_executable
+          contents = File.read(exe)
 
-      exec RUBY, exe, *ARGV if find_executable
-      Dir.chdir("..") do
-        # Recurse in a chdir block: if the search fails we want to be sure
-        # the application is generated in the original working directory.
-        exec_app_rails unless cwd == Dir.pwd
-      end
-    rescue SystemCallError
-      # could not chdir, no problem just return
-    end
+          if contents =~ /(APP|ENGINE)_PATH/
+            exec RUBY, exe, *ARGV
+            break # non reachable, hack to be able to stub exec in the test suite
+          elsif exe.end_with?('bin/rails') && contents.include?('This file was generated by Bundler')
+            $stderr.puts(BUNDLER_WARNING)
+            Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
+            require File.expand_path('../boot', APP_PATH)
+            require 'rails/commands'
+            break
+          end
+        end
 
-    def self.find_executable
-      EXECUTABLES.find do |exe|
-        File.exists?(exe) && File.read(exe) =~ /(APP|ENGINE)_PATH/
+        # If we exhaust the search there is no executable, this could be a
+        # 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.
+        Dir.chdir('..')
       end
     end
 
-    def self.find_executable_in_parent_path(path = Pathname.new(Dir.pwd))
-      EXECUTABLES.find do |exe|
-        File.exists?(File.join(path, exe)) || !path.root? && find_executable_in_parent_path(path.parent)
-      end
+    def self.find_executable
+      EXECUTABLES.find { |exe| File.exists?(exe) }
     end
   end
 end

data/lib/rails/application.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-# FIXME remove DummyKeyGenerator and this require in 4.1
+require 'active_support/core_ext/object/blank'
 require 'active_support/key_generator'
 require 'rails/engine'
 
@@ -46,10 +46,10 @@ module Rails
   #   6)  Run config.before_initialize callbacks
   #   7)  Run Railtie#initializer defined by railties, engines and application.
   #       One by one, each engine sets up its load paths, routes and runs its config/initializers/* files.
-  #   9)  Custom Railtie#initializers added by railties, engines and applications are executed
-  #   10) Build the middleware stack and run to_prepare callbacks
-  #   11) Run config.before_eager_load and eager_load! if eager_load is true
-  #   12) Run config.after_initialize callbacks
+  #   8)  Custom Railtie#initializers added by railties, engines and applications are executed
+  #   9)  Build the middleware stack and run to_prepare callbacks
+  #   10) Run config.before_eager_load and eager_load! if eager_load is true
+  #   11) Run config.after_initialize callbacks
   #
   class Application < Engine
     autoload :Bootstrap,      'rails/application/bootstrap'
@@ -79,7 +79,7 @@ module Rails
       @initialized      = false
       @reloaders        = []
       @routes_reloader  = nil
-      @env_config       = nil
+      @app_env_config   = nil
       @ordered_railties = nil
       @railties         = nil
     end
@@ -111,7 +111,7 @@ module Rails
           key_generator = ActiveSupport::KeyGenerator.new(config.secret_key_base, iterations: 1000)
           ActiveSupport::CachingKeyGenerator.new(key_generator)
         else
-          ActiveSupport::DummyKeyGenerator.new(config.secret_token)
+          ActiveSupport::LegacyKeyGenerator.new(config.secret_token)
         end
       end
     end
@@ -122,7 +122,8 @@ module Rails
     #
     #   * "action_dispatch.parameter_filter"             => config.filter_parameters
     #   * "action_dispatch.redirect_filter"              => config.filter_redirect
-    #   * "action_dispatch.secret_token"                 => config.secret_token,
+    #   * "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
@@ -134,14 +135,13 @@ module Rails
     #   * "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt
     #
     def env_config
-      @env_config ||= begin
-        if config.secret_key_base.nil?
-          ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base in config/initializers/secret_token.rb file. " +
-            "This should be used instead of the old deprecated config.secret_token in order to use the new EncryptedCookieStore. " +
-            "To convert safely to the encrypted store (without losing existing cookies and sessions), see http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#action-pack"
+      @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"
+            raise "You must set config.secret_key_base in your app's config."
           end
         end
 
@@ -149,6 +149,7 @@ module Rails
           "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,
@@ -305,22 +306,8 @@ module Rails
     def default_middleware_stack #:nodoc:
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         app = self
-        if rack_cache = config.action_dispatch.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
-            rack_cache = {
-              metastore: "rails:/",
-              entitystore: "rails:/",
-              verbose: false
-            }
-          end
 
+        if rack_cache = load_rack_cache
           require "action_dispatch/http/rack_cache"
           middleware.use ::Rack::Cache, rack_cache
         end
@@ -337,12 +324,14 @@ module Rails
           middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
         end
 
-        middleware.use ::Rack::Lock unless config.cache_classes
+        middleware.use ::Rack::Lock unless allow_concurrency?
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
-        middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::ActionDispatch::ShowExceptions, config.exceptions_app || ActionDispatch::PublicExceptions.new(Rails.public_path)
+
+        # 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
 
@@ -368,6 +357,40 @@ module Rails
       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)
+    end
+
     def build_original_fullpath(env) #:nodoc:
       path_info    = env["PATH_INFO"]
       query_string = env["QUERY_STRING"]

data/lib/rails/application/configuration.rb

@@ -5,7 +5,7 @@ require 'rails/engine/configuration'
 module Rails
   class Application
     class Configuration < ::Rails::Engine::Configuration
-      attr_accessor :asset_host, :assets, :autoflush_log,
+      attr_accessor :allow_concurrency, :asset_host, :assets, :autoflush_log,
                     :cache_classes, :cache_store, :consider_all_requests_local, :console,
                     :eager_load, :exceptions_app, :file_watcher, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
@@ -20,6 +20,7 @@ module Rails
       def initialize(*)
         super
         self.encoding = "utf-8"
+        @allow_concurrency             = nil
         @consider_all_requests_local   = false
         @filter_parameters             = []
         @filter_redirect               = []
@@ -98,14 +99,15 @@ module Rails
       end
 
       # Loads and returns the configuration of the database.
-      # First, looks at If ENV['DATABASE_URL'] if it's not present it uses the #paths["config/database"]
-      # The contents of the file are processed via ERB before being sent through YAML::load. 
       def database_configuration
-        if ENV['DATABASE_URL']
-          {Rails.env => ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.connection_url_to_hash(ENV['DATABASE_URL']).stringify_keys}
+        yaml = paths["config/database"].first
+        if File.exists?(yaml)
+          require "erb"
+          YAML.load ERB.new(IO.read(yaml)).result
+        elsif ENV['DATABASE_URL']
+          nil
         else
-          require 'erb'
-          YAML.load ERB.new(IO.read(paths["config/database"].first)).result
+          raise "Could not load database configuration. No such file - #{yaml}"
         end
       rescue Psych::SyntaxError => e
         raise "YAML syntax error occurred while parsing #{paths["config/database"].first}. " \

data/lib/rails/commands.rb

@@ -5,6 +5,7 @@ aliases = {
   "d"  => "destroy",
   "c"  => "console",
   "s"  => "server",
+  "t"  => "test",
   "db" => "dbconsole",
   "r"  => "runner"
 }
@@ -16,6 +17,7 @@ The most common rails commands are:
  generate    Generate new code (short-cut alias: "g")
  console     Start the Rails console (short-cut alias: "c")
  server      Start the Rails server (short-cut alias: "s")
+ test        Running the test file (short-cut alias: "t")
  dbconsole   Start a console for the database specified in config/database.yml
              (short-cut alias: "db")
  new         Create a new Rails application. "rails new my_app" creates a

data/lib/rails/commands/console.rb

@@ -46,7 +46,10 @@ module Rails
     def initialize(app, options={})
       @app     = app
       @options = options
+
+      app.sandbox = sandbox?
       app.load_console
+
       @console = app.config.console || IRB
     end
 
@@ -71,7 +74,6 @@ module Rails
     end
 
     def start
-      app.sandbox = sandbox?
       require_debugger if debugger?
       set_environment! if environment?
 

data/lib/rails/commands/server.rb

@@ -42,8 +42,12 @@ module Rails
       set_environment
     end
 
+    # TODO: this is no longer required but we keep it for the moment to support older config.ru files.
     def app
-      @app ||= super.respond_to?(:to_app) ? super.to_app : super
+      @app ||= begin
+        app = super
+        app.respond_to?(:to_app) ? app.to_app : app
+      end
     end
 
     def opt_parser
@@ -58,7 +62,7 @@ module Rails
       url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
       puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
-      puts "=> Call with -d to detach" unless options[:daemonize]
+      puts "=> Run `rails server -h` for more startup options"
       trap(:INT) { exit }
       puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
 

data/lib/rails/engine.rb

@@ -1,4 +1,5 @@
 require 'rails/railtie'
+require 'rails/engine/railties'
 require 'active_support/core_ext/module/delegation'
 require 'pathname'
 require 'rbconfig'
@@ -106,7 +107,7 @@ module Rails
   #
   # The <tt>Application</tt> class adds a couple more paths to this set. And as in your
   # <tt>Application</tt>, all folders under +app+ are automatically added to the load path.
-  # If you have an <tt>app/services/tt> folder for example, it will be added by default.
+  # If you have an <tt>app/services</tt> folder for example, it will be added by default.
   #
   # == Endpoint
   #
@@ -467,7 +468,7 @@ module Rails
     end
 
     def railties
-      @railties ||= self.class::Railties.new
+      @railties ||= Railties.new
     end
 
     # Returns a module with all the helpers defined for the engine.
@@ -552,7 +553,7 @@ module Rails
     #
     # This needs to be an initializer, since it needs to run once
     # per engine and get the engine as a block parameter
-    initializer :set_autoload_paths, before: :bootstrap_hook do |app|
+    initializer :set_autoload_paths, before: :bootstrap_hook do
       ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
       ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
 

data/lib/rails/generators/actions.rb

@@ -215,7 +215,7 @@ module Rails
 
       # Make an entry in Rails routing file config/routes.rb
       #
-      #   route "root :to => 'welcome#index'"
+      #   route "root 'welcome#index'"
       def route(routing_code)
         log :route, routing_code
         sentinel = /\.routes\.draw do\s*$/

data/lib/rails/generators/app_base.rb

@@ -115,7 +115,11 @@ module Rails
       end
 
       def database_gemfile_entry
-        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
+        options[:skip_active_record] ? "" :
+          <<-GEMFILE.strip_heredoc.chomp
+            # Use #{options[:database]} as the database for Active Record
+            gem '#{gem_for_database}'
+          GEMFILE
       end
 
       def include_all_railties?
@@ -131,13 +135,11 @@ module Rails
           <<-GEMFILE.strip_heredoc
             gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
             gem 'arel',      github: 'rails/arel'
-            gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     github: 'rails/rails'
             gem 'arel',      github: 'rails/arel'
-            gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
@@ -178,40 +180,56 @@ module Rails
         return if options[:skip_sprockets]
 
         gemfile = if options.dev? || options.edge?
+          <<-GEMFILE.strip_heredoc
+            # Use edge version of sprockets-rails
+            gem 'sprockets-rails', github: 'rails/sprockets-rails'
+
+            # Use SCSS for stylesheets
+            gem 'sass-rails', github: 'rails/sass-rails'
+
+            # Use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '>= 1.3.0'
+          GEMFILE
+        else
+          <<-GEMFILE.strip_heredoc
+            # Use SCSS for stylesheets
+            gem 'sass-rails', '~> 4.0.0.rc1'
+
+            # Use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '>= 1.3.0'
+          GEMFILE
+        end
+
+        if options[:skip_javascript]
+          gemfile += <<-GEMFILE
+            #{coffee_gemfile_entry}
+            #{javascript_runtime_gemfile_entry}
+          GEMFILE
+        end
+
+        gemfile.gsub(/^[ \t]+/, '')
+      end
+
+      def coffee_gemfile_entry
+        if options.dev? || options.edge?
           <<-GEMFILE
-            # Gems used only for assets and not required
-            # in production environments by default.
-            group :assets do
-              gem 'sprockets-rails', github: 'rails/sprockets-rails'
-              gem 'sass-rails',   github: 'rails/sass-rails'
-              gem 'coffee-rails', github: 'rails/coffee-rails'
-
-              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-              #{javascript_runtime_gemfile_entry}
-              gem 'uglifier', '>= 1.0.3'
-            end
+            # Use CoffeeScript for .js.coffee assets and views
+            gem 'coffee-rails', github: 'rails/coffee-rails'
           GEMFILE
         else
           <<-GEMFILE
-            # Gems used only for assets and not required
-            # in production environments by default.
-            group :assets do
-              gem 'sass-rails',   '~> 4.0.0.beta1'
-              gem 'coffee-rails', '~> 4.0.0.beta1'
-
-              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-              #{javascript_runtime_gemfile_entry}
-              gem 'uglifier', '>= 1.0.3'
-            end
+            # Use CoffeeScript for .js.coffee assets and views
+            gem 'coffee-rails', '~> 4.0.0'
           GEMFILE
         end
-
-        gemfile.strip_heredoc.gsub(/^[ \t]*$/, '')
       end
 
       def javascript_gemfile_entry
         unless options[:skip_javascript]
-          <<-GEMFILE.strip_heredoc
+          <<-GEMFILE.gsub(/^[ \t]+/, '')
+            #{coffee_gemfile_entry}
+            #{javascript_runtime_gemfile_entry}
+            # Use #{options[:javascript]} as the JavaScript library
             gem '#{options[:javascript]}-rails'
 
             # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
@@ -221,11 +239,15 @@ module Rails
       end
 
       def javascript_runtime_gemfile_entry
-        if defined?(JRUBY_VERSION)
-          "gem 'therubyrhino'\n"
+        runtime = if defined?(JRUBY_VERSION)
+          "gem 'therubyrhino'"
         else
-          "# gem 'therubyracer', platforms: :ruby\n"
+          "# gem 'therubyracer', platforms: :ruby"
         end
+        <<-GEMFILE
+          # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+          #{runtime}
+        GEMFILE
       end
 
       def bundle_command(command)