railties 3.2.22.5 → 4.0.0.beta1

data/lib/rails/tasks/engine.rake

@@ -60,7 +60,7 @@ namespace :db do
 end
 
 def find_engine_path(path)
-  return if path == "/"
+  return File.expand_path(Dir.pwd) if path == "/"
 
   if Rails::Engine.find(path)
     path

data/lib/rails/tasks/framework.rake

@@ -1,6 +1,6 @@
 namespace :rails do
-  desc "Update configs and some other initially generated files (or use just update:configs, update:scripts, or update:application_controller)"
-  task :update => [ "update:configs", "update:scripts", "update:application_controller" ]
+  desc "Update configs and some other initially generated files (or use just update:configs, update:bin, or update:application_controller)"
+  task update: [ "update:configs", "update:bin", "update:application_controller" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
@@ -9,8 +9,8 @@ namespace :rails do
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
     require 'rails/generators'
     require 'rails/generators/rails/app/app_generator'
-    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, :destination_root => Rails.root
-    generator.apply template, :verbose => false
+    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, destination_root: Rails.root
+    generator.apply template, verbose: false
   end
 
   namespace :templates do
@@ -44,8 +44,8 @@ namespace :rails do
       @app_generator ||= begin
         require 'rails/generators'
         require 'rails/generators/rails/app/app_generator'
-        gen = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
-                                                             :destination_root => Rails.root
+        gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
+                                                             destination_root: Rails.root
         File.exists?(Rails.root.join("config", "application.rb")) ?
           gen.send(:app_const) : gen.send(:valid_app_const?)
         gen
@@ -58,9 +58,9 @@ namespace :rails do
       invoke_from_app_generator :create_config_files
     end
 
-    # desc "Adds new scripts to the application script/ directory"
-    task :scripts do
-      invoke_from_app_generator :create_script_files
+    # desc "Adds new executables to the application bin/ directory"
+    task :bin do
+      invoke_from_app_generator :create_bin_files
     end
 
     # desc "Rename application.rb to application_controller.rb"

data/lib/rails/tasks/log.rake

@@ -1,9 +1,23 @@
 namespace :log do
-  desc "Truncates all *.log files in log/ to zero bytes"
+  desc "Truncates all *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
   task :clear do
-    FileList["log/*.log"].each do |log_file|
-      f = File.open(log_file, "w")
-      f.close
+    log_files.each do |file|
+      clear_log_file(file)
     end
   end
+
+  def log_files
+    if ENV['LOGS']
+      ENV['LOGS'].split(',')
+                  .map    { |file| "log/#{file.strip}.log" }
+                  .select { |file| File.exists?(file) }
+    else
+      FileList["log/*.log"]
+    end
+  end
+
+  def clear_log_file(file)
+    f = File.open(file, "w")
+    f.close
+  end
 end

data/lib/rails/tasks/middleware.rake

@@ -1,5 +1,5 @@
 desc 'Prints out your Rack middleware stack'
-task :middleware => :environment do
+task middleware: :environment do
   Rails.configuration.middleware.each do |middleware|
     puts "use #{middleware.inspect}"
   end

data/lib/rails/tasks/misc.rake

@@ -1,10 +1,3 @@
-task :rails_env do
-  # TODO Do we really need this?
-  unless defined? RAILS_ENV
-    RAILS_ENV = ENV['RAILS_ENV'] ||= 'development'
-  end
-end
-
 desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
   require 'securerandom'
@@ -12,7 +5,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about => :environment do
+task about: :environment do
   puts Rails::Info
 end
 
@@ -33,7 +26,7 @@ namespace :time do
       require 'active_support'
       require 'active_support/time'
       jan_offset = Time.now.beginning_of_year.utc_offset
-      jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset
+      jul_offset = Time.now.beginning_of_year.change(month: 7).utc_offset
       offset = jan_offset < jul_offset ? jan_offset : jul_offset
       build_time_zone_list(:all, offset)
     end

data/lib/rails/tasks/routes.rake

@@ -1,9 +1,7 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
-task :routes => :environment do
-  Rails.application.reload_routes!
+task routes: :environment do
   all_routes = Rails.application.routes.routes
-
-  require 'rails/application/route_inspector'
-  inspector = Rails::Application::RouteInspector.new
-  puts inspector.format(all_routes, ENV['CONTROLLER']).join "\n"
+  require 'action_dispatch/routing/inspector'
+  inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
+  puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER'])
 end

data/lib/rails/tasks/statistics.rake

@@ -2,11 +2,17 @@ STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
   %w(Models             app/models),
+  %w(Mailers            app/mailers),
+  %w(Javascripts        app/assets/javascripts),
   %w(Libraries          lib/),
   %w(APIs               app/apis),
+  %w(Controller\ tests  test/controllers),
+  %w(Helper\ tests      test/helpers),
+  %w(Model\ tests       test/models),
+  %w(Mailer\ tests      test/mailers),
   %w(Integration\ tests test/integration),
-  %w(Functional\ tests  test/functional),
-  %w(Unit\ tests        test/unit)
+  %w(Functional\ tests\ (old)  test/functional),
+  %w(Unit\ tests \ (old)       test/unit)
 ].collect { |name, dir| [ name, "#{Rails.root}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
 desc "Report code statistics (KLOCs, etc) from the application"

data/lib/rails/tasks/tmp.rake

@@ -1,11 +1,19 @@
 namespace :tmp do
   desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
-  task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+  task clear: [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+
+  tmp_dirs = [ 'tmp/sessions',
+               'tmp/cache',
+               'tmp/sockets',
+               'tmp/pids',
+               'tmp/cache/assets/development',
+               'tmp/cache/assets/test',
+               'tmp/cache/assets/production' ]
+
+  tmp_dirs.each { |d| directory d }
 
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
-  task :create do
-    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/cache/assets ))
-  end
+  task create: tmp_dirs
 
   namespace :sessions do
     # desc "Clears all files in tmp/sessions"

data/lib/rails/templates/layouts/application.html.erb

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title>Routes</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p, ol, ul, td {
+      font-family: helvetica, verdana, arial, sans-serif;
+      font-size:   13px;
+      line-height: 18px;
+    }
+
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+      white-space: pre-wrap;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+
+    h2 { padding-left: 10px; }
+
+    <%= yield :style %>
+  </style>
+</head>
+<body>
+<h2>Your App: <%= link_to 'properties', '/rails/info/properties' %> | <%= link_to 'routes', '/rails/info/routes' %></h2>
+<%= yield %>
+
+</body>
+</html>

data/lib/rails/templates/rails/info/properties.html.erb

@@ -0,0 +1 @@
+<%= @info.html_safe %>

data/lib/rails/templates/rails/info/routes.html.erb

@@ -0,0 +1,9 @@
+<h2>
+  Routes
+</h2>
+
+<p>
+  Routes match in priority from top to bottom
+</p>
+
+<%= @routes_inspector.format(ActionDispatch::Routing::HtmlTableFormatter.new(self)) %>

data/lib/rails/{generators/rails/app/templates/public/index.html → templates/rails/welcome/index.html.erb}

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Ruby on Rails: Welcome aboard</title>
-    <style type="text/css" media="screen">
+    <style media="screen">
       body {
         margin: 0;
         margin-bottom: 25px;
@@ -59,7 +59,7 @@
 
 
       #header {
-        background-image: url("assets/rails.png");
+        background-image: url("/assets/rails.png");
         background-repeat: no-repeat;
         background-position: top left;
         height: 64px;
@@ -171,17 +171,20 @@
         font-style: italic;
       }
     </style>
-    <script type="text/javascript">
+    <script>
       function about() {
-        info = document.getElementById('about-content');
-        if (window.XMLHttpRequest)
-          { xhr = new XMLHttpRequest(); }
-        else
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
-        xhr.open("GET","rails/info/properties",false);
-        xhr.send("");
-        info.innerHTML = xhr.responseText;
-        info.style.display = 'block'
+        var info = document.getElementById('about-content'),
+            xhr;
+
+        if (info.innerHTML === '') {
+          xhr = new XMLHttpRequest();
+          xhr.open("GET", "/rails/info/properties", false);
+          xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+          xhr.send("");
+          info.innerHTML = xhr.responseText;
+        }
+
+        info.style.display = info.style.display === 'none' ? 'block' : 'none';
       }
     </script>
   </head>
@@ -208,7 +211,7 @@
         </div>
 
         <div id="about">
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <h3><a href="/rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
           <div id="about-content" style="display: none"></div>
         </div>
 
@@ -223,7 +226,8 @@
             </li>
 
             <li>
-              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
+              <h2>Set up a root route to replace this page</h2>
+              <p>You're seeing this page because you're running in development mode and you haven't set a root route yet.</p>
               <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
             </li>
 

data/lib/rails/test_help.rb

@@ -2,48 +2,25 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-begin
-  require 'test/unit'
-rescue LoadError => e
-  raise LoadError, "Please add test-unit gem to your Gemfile: `gem 'test-unit', '~> 3.0'` (#{e.message})", e.backtrace
-end
+require 'active_support/testing/autorun'
 require 'active_support/test_case'
 require 'action_controller/test_case'
 require 'action_dispatch/testing/integration'
 
-if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
-  require 'rails/backtrace_cleaner'
-  Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
-end
-
-if defined?(MiniTest)
-  # Enable turn if it is available
-  begin
-    require 'turn'
-
-    Turn.config do |c|
-      c.natural = true
-    end
-  rescue LoadError
-  end
-end
+# Config Rails backtrace in tests.
+require 'rails/backtrace_cleaner'
+MiniTest.backtrace_filter = Rails.backtrace_cleaner
 
 if defined?(ActiveRecord::Base)
-  require 'active_record/test_case'
-
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
-
-    setup do
-      ActiveRecord::IdentityMap.clear
-    end
   end
 
   ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
-  def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  def create_fixtures(*fixture_set_names, &block)
+    FixtureSet.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, {}, &block)
   end
 end
 

data/lib/rails/test_unit/railtie.rb

@@ -1,11 +1,10 @@
 module Rails
   class TestUnitRailtie < Rails::Railtie
     config.app_generators do |c|
-      c.test_framework :test_unit, :fixture => true,
-                                   :fixture_replacement => nil
+      c.test_framework :test_unit, fixture: true,
+                                   fixture_replacement: nil
 
       c.integration_tool :test_unit
-      c.performance_tool :test_unit
     end
 
     rake_tasks do

data/lib/rails/test_unit/testing.rake

@@ -15,11 +15,11 @@ def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
       # Support subdirs in app/models and app/controllers
       modified_test_path = source_dir.length > 2 ? "#{test_path}/" << source_dir[1..source_dir.length].join('/') : test_path
 
-      # For modified files in app/ run the tests for it. ex. /test/functional/account_controller.rb
+      # For modified files in app/ run the tests for it. ex. /test/controllers/account_controller.rb
       test = "#{modified_test_path}/#{source_file}_test.rb"
       tests.push test if File.exist?(test)
 
-      # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
+      # For modified files in app, run tests in subdirs too. ex. /test/controllers/account/*_test.rb
       test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
       FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exist?(test)
 
@@ -43,9 +43,9 @@ module Kernel
   end
 end
 
-task :default => :test
+task default: :test
 
-desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
+desc 'Runs test:units, test:functionals, test:integration together'
 task :test do
   Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
 end
@@ -61,7 +61,7 @@ namespace :test do
         Rake::Task[task].invoke
         nil
       rescue => e
-        { :task => task, :exception => e }
+        { task: task, exception: e }
       end
     end.compact
 
@@ -71,10 +71,24 @@ namespace :test do
     end
   end
 
-  Rake::TestTask.new(:recent => "test:prepare") do |t|
+  # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
+  desc "Run tests quickly by merging all types and not resetting db"
+  Rake::TestTask.new(:all) do |t|
+    t.libs << "test"
+    t.pattern = "test/**/*_test.rb"
+  end
+
+  namespace :all do
+    desc "Run tests quickly, but also reset db"
+    task :db => %w[db:test:prepare test:all]
+  end
+
+  Rake::TestTask.new(recent: "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
+      recent_tests('app/models/**/*.rb', 'test/models', since) +
       recent_tests('app/models/**/*.rb', 'test/unit', since) +
+      recent_tests('app/controllers/**/*.rb', 'test/controllers', since) +
       recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
     t.libs << 'test'
@@ -82,12 +96,12 @@ namespace :test do
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
 
-  Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
+  Rake::TestTask.new(uncommitted: "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
-      elsif File.directory?(".git")
-        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
+      elsif system "git rev-parse --git-dir 2>&1 >/dev/null"
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others --exclude-standard` }.split.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
       end
@@ -95,8 +109,10 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
-      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      unit_tests       = models.map { |model| "test/models/#{File.basename(model, '.rb')}_test.rb" } +
+                         models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" } +
+      functional_tests = controllers.map { |controller| "test/controllers/#{File.basename(controller, '.rb')}_test.rb" } +
+                         controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
       (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
 
@@ -104,46 +120,42 @@ namespace :test do
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(:single => "test:prepare") do |t|
+  Rake::TestTask.new(single: "test:prepare") do |t|
     t.libs << "test"
   end
 
-  Rails::SubTestTask.new(:units => "test:prepare") do |t|
+  Rails::SubTestTask.new(models: "test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/unit/**/*_test.rb'
+    t.pattern = 'test/models/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
+  Rails::SubTestTask.new(helpers: "test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/functional/**/*_test.rb'
+    t.pattern = 'test/helpers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:integration => "test:prepare") do |t|
+  Rails::SubTestTask.new(units: "test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/integration/**/*_test.rb'
+    t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
   end
 
-  task 'test:benchmark_mode' do
-    ENV["BENCHMARK_TESTS"] = '1'
+  Rails::SubTestTask.new(controllers: "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/controllers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:benchmark => ['test:prepare', 'test:benchmark_mode']) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/performance/**/*_test.rb'
+  Rails::SubTestTask.new(mailers: "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/mailers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:profile => 'test:prepare') do |t|
-    t.libs << 'test'
-    t.pattern = 'test/performance/**/*_test.rb'
+  Rails::SubTestTask.new(functionals: "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:plugins => :environment) do |t|
+  Rails::SubTestTask.new(integration: "test:prepare") do |t|
     t.libs << "test"
-
-    if ENV['PLUGIN']
-      t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
-    else
-      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
-    end
+    t.pattern = 'test/integration/**/*_test.rb'
   end
 end