railties 5.0.7.2 → 5.1.0.beta1

data/lib/rails/tasks/initializers.rake

@@ -1,6 +1,6 @@
 desc "Print out all defined initializers in the order they are invoked by Rails."
 task initializers: :environment do
   Rails.application.initializers.tsort_each do |initializer|
-    puts initializer.name
+    puts "#{initializer.context_class}.#{initializer.name}"
   end
 end

data/lib/rails/tasks/log.rake

@@ -1,9 +1,9 @@
 namespace :log do
-  
-  ## 
+
+  ##
   # Truncates all/specified log files
-  # ENV['LOGS'] 
-  #   - defaults to standard environment log files i.e. 'development,test,production'
+  # ENV['LOGS']
+  #   - defaults to all environments log files i.e. 'development,test,production'
   #   - ENV['LOGS']=all truncates all files i.e. log/*.log
   #   - ENV['LOGS']='test,development' truncates only specified files
   desc "Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
@@ -14,23 +14,27 @@ namespace :log do
   end
 
   def log_files
-    if ENV['LOGS'] == 'all'
+    if ENV["LOGS"] == "all"
       FileList["log/*.log"]
-    elsif ENV['LOGS']
-      log_files_to_truncate(ENV['LOGS'])
+    elsif ENV["LOGS"]
+      log_files_to_truncate(ENV["LOGS"])
     else
-      log_files_to_truncate("development,test,production")
+      log_files_to_truncate(all_environments.join(","))
     end
   end
 
   def log_files_to_truncate(envs)
-    envs.split(',')
+    envs.split(",")
         .map    { |file| "log/#{file.strip}.log" }
         .select { |file| File.exist?(file) }
   end
-  
+
   def clear_log_file(file)
     f = File.open(file, "w")
     f.close
   end
+
+  def all_environments
+    Dir["config/environments/*.rb"].map { |fname| File.basename(fname, ".*") }
+  end
 end

data/lib/rails/tasks/middleware.rake

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

data/lib/rails/tasks/misc.rake

@@ -1,16 +1,16 @@
-desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
+desc "Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)."
 task :secret do
-  require 'securerandom'
+  require "securerandom"
   puts SecureRandom.hex(64)
 end
 
-desc 'List versions of all Rails frameworks and the environment'
+desc "List versions of all Rails frameworks and the environment"
 task about: :environment do
   puts Rails::Info
 end
 
 namespace :time do
-  desc 'List all time zones, list by two-letter country code (`rails time:zones[US]`), or list by UTC offset (`rails time:zones[-8]`)'
+  desc "List all time zones, list by two-letter country code (`rails time:zones[US]`), or list by UTC offset (`rails time:zones[-8]`)"
   task :zones, :country_or_offset do |t, args|
     zones, offset = ActiveSupport::TimeZone.all, nil
 
@@ -38,8 +38,8 @@ namespace :time do
 
     # desc 'Displays names of time zones recognized by the Rails TimeZone class with the same offset as the system local time'
     task :local do
-      require 'active_support'
-      require 'active_support/time'
+      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
@@ -49,12 +49,12 @@ namespace :time do
     end
 
     # to find UTC -06:00 zones, OFFSET can be set to either -6, -6:00 or 21600
-    def build_time_zone_list(zones, offset = ENV['OFFSET'])
-      require 'active_support'
-      require 'active_support/time'
+    def build_time_zone_list(zones, offset = ENV["OFFSET"])
+      require "active_support"
+      require "active_support/time"
       if offset
         offset = if offset.to_s.match(/(\+|-)?(\d+):(\d+)/)
-          sign = $1 == '-' ? -1 : 1
+          sign = $1 == "-" ? -1 : 1
           hours, minutes = $2.to_f, $3.to_f
           ((hours * 3600) + (minutes.to_f * 60)) * sign
         elsif offset.to_f.abs <= 13

data/lib/rails/tasks/restart.rake

@@ -1,8 +1,8 @@
-desc 'Restart app by touching tmp/restart.txt'
+desc "Restart app by touching tmp/restart.txt"
 task :restart do
   verbose(false) do
-    mkdir_p 'tmp'
-    touch 'tmp/restart.txt'
-    rm_f 'tmp/pids/server.pid'
+    mkdir_p "tmp"
+    touch "tmp/restart.txt"
+    rm_f "tmp/pids/server.pid"
   end
 end

data/lib/rails/tasks/routes.rake

@@ -1,21 +1,12 @@
-require 'active_support/deprecation'
-require 'active_support/core_ext/string/strip' # for strip_heredoc
-require 'optparse'
+require "optparse"
 
-desc 'Print out all defined routes in match order, with names. Target specific controller with -c option, or grep routes using -g option'
+desc "Print out all defined routes in match order, with names. Target specific controller with -c option, or grep routes using -g option"
 task routes: :environment do
   all_routes = Rails.application.routes.routes
-  require 'action_dispatch/routing/inspector'
+  require "action_dispatch/routing/inspector"
   inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
-  if ARGV.any?{ |argv| argv.start_with? 'CONTROLLER' }
-    puts <<-eow.strip_heredoc
-      Passing `CONTROLLER` to `bin/rails routes` is deprecated and will be removed in Rails 5.1.
-      Please use `bin/rails routes -c controller_name` instead.
-    eow
-  end
 
   routes_filter = nil
-  routes_filter = { controller: ENV['CONTROLLER'] } if ENV['CONTROLLER']
 
   OptionParser.new do |opts|
     opts.banner = "Usage: rails routes [options]"

data/lib/rails/tasks/statistics.rake

@@ -8,9 +8,8 @@ STATS_DIRECTORIES = [
   %w(Models             app/models),
   %w(Mailers            app/mailers),
   %w(Channels           app/channels),
-  %w(Javascripts        app/assets/javascripts),
+  %w(JavaScripts        app/assets/javascripts),
   %w(Libraries          lib/),
-  %w(Tasks              lib/tasks),
   %w(APIs               app/apis),
   %w(Controller\ tests  test/controllers),
   %w(Helper\ tests      test/helpers),
@@ -18,12 +17,13 @@ STATS_DIRECTORIES = [
   %w(Mailer\ tests      test/mailers),
   %w(Job\ tests         test/jobs),
   %w(Integration\ tests test/integration),
+  %w(System\ tests      test/system),
 ].collect do |name, dir|
   [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
 end.select { |name, dir| File.directory?(dir) }
 
 desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
-  require 'rails/code_statistics'
+  require "rails/code_statistics"
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end

data/lib/rails/tasks/tmp.rake

@@ -2,10 +2,10 @@ namespace :tmp do
   desc "Clear cache and socket files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear)"
   task clear: ["tmp:cache:clear", "tmp:sockets:clear"]
 
-  tmp_dirs = [ 'tmp/cache',
-               'tmp/sockets',
-               'tmp/pids',
-               'tmp/cache/assets' ]
+  tmp_dirs = [ "tmp/cache",
+               "tmp/sockets",
+               "tmp/pids",
+               "tmp/cache/assets" ]
 
   tmp_dirs.each { |d| directory d }
 
@@ -15,21 +15,21 @@ namespace :tmp do
   namespace :cache do
     # desc "Clears all files and directories in tmp/cache"
     task :clear do
-      rm_rf Dir['tmp/cache/[^.]*'], verbose: false
+      rm_rf Dir["tmp/cache/[^.]*"], verbose: false
     end
   end
 
   namespace :sockets do
     # desc "Clears all files in tmp/sockets"
     task :clear do
-      rm Dir['tmp/sockets/[^.]*'], verbose: false
+      rm Dir["tmp/sockets/[^.]*"], verbose: false
     end
   end
 
   namespace :pids do
     # desc "Clears all files in tmp/pids"
     task :clear do
-      rm Dir['tmp/pids/[^.]*'], verbose: false
+      rm Dir["tmp/pids/[^.]*"], verbose: false
     end
   end
 end

data/lib/rails/tasks/yarn.rake

@@ -0,0 +1,11 @@
+namespace :yarn do
+  desc "Install all JavaScript dependencies as specified via Yarn"
+  task :install do
+    system("./bin/yarn install --no-progress")
+  end
+end
+
+# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
+if Rake::Task.task_defined?("assets:precompile")
+  Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
+end

data/lib/rails/templates/rails/mailers/email.html.erb

@@ -88,7 +88,10 @@
     <% unless @email.attachments.nil? || @email.attachments.empty? %>
       <dt>Attachments:</dt>
       <dd>
-        <%= @email.attachments.map { |a| a.respond_to?(:original_filename) ? a.original_filename : a.filename }.join(', ') %>
+        <% @email.attachments.each do |a| %>
+          <% filename = a.respond_to?(:original_filename) ? a.original_filename : a.filename %>
+          <%= link_to filename, "data:application/octet-stream;charset=utf-8;base64,#{Base64.encode64(a.body.to_s)}", download: filename %>
+        <% end %>
       </dd>
     <% end %>
 

data/lib/rails/test_help.rb

@@ -2,21 +2,28 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require 'active_support/test_case'
-require 'action_controller'
-require 'action_controller/test_case'
-require 'action_dispatch/testing/integration'
-require 'rails/generators/test_case'
+require "rails/test_unit/minitest_plugin"
+require "active_support/test_case"
+require "action_controller"
+require "action_controller/test_case"
+require "action_dispatch/testing/integration"
+require "rails/generators/test_case"
 
-require 'active_support/testing/autorun'
+require "active_support/testing/autorun"
+
+if defined?(Capbyara)
+  require "action_dispatch/system_test_case"
+end
 
 if defined?(ActiveRecord::Base)
   ActiveRecord::Migration.maintain_test_schema!
 
-  class ActiveSupport::TestCase
-    include ActiveRecord::TestFixtures
-    self.fixture_path = "#{Rails.root}/test/fixtures/"
-    self.file_fixture_path = self.fixture_path + "files"
+  module ActiveSupport
+    class TestCase
+      include ActiveRecord::TestFixtures
+      self.fixture_path = "#{Rails.root}/test/fixtures/"
+      self.file_fixture_path = fixture_path + "files"
+    end
   end
 
   ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
@@ -26,6 +33,8 @@ if defined?(ActiveRecord::Base)
   end
 end
 
+# :enddoc:
+
 class ActionController::TestCase
   def before_setup # :nodoc:
     @routes = Rails.application.routes
@@ -39,3 +48,12 @@ class ActionDispatch::IntegrationTest
     super
   end
 end
+
+if defined? Capybara
+  class ActionDispatch::SystemTestCase
+    def before_setup # :nodoc:
+      @routes = Rails.application.routes
+      super
+    end
+  end
+end

data/lib/rails/test_unit/line_filtering.rb

@@ -1,12 +1,78 @@
-require 'method_source'
-require "rails/test_unit/runner"
+require "method_source"
 
 module Rails
   module LineFiltering # :nodoc:
     def run(reporter, options = {})
-      options[:filter] = Rails::TestUnit::Runner.compose_filter(self, options[:filter])
+      if options[:patterns] && options[:patterns].any? { |p| p =~ /:\d+/ }
+        options[:filter] = \
+          CompositeFilter.new(self, options[:filter], options[:patterns])
+      end
 
       super
     end
   end
+
+  class CompositeFilter # :nodoc:
+    attr_reader :named_filter
+
+    def initialize(runnable, filter, patterns)
+      @runnable = runnable
+      @named_filter = derive_named_filter(filter)
+      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
+    end
+
+    # Minitest uses === to find matching filters.
+    def ===(method)
+      @filters.any? { |filter| filter === method }
+    end
+
+    private
+      def derive_named_filter(filter)
+        if filter.respond_to?(:named_filter)
+          filter.named_filter
+        elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
+          Regexp.new $1
+        elsif filter.is_a?(String)
+          filter
+        end
+      end
+
+      def derive_line_filters(patterns)
+        patterns.flat_map do |file_and_line|
+          file, *lines = file_and_line.split(":")
+
+          if lines.empty?
+            Filter.new(@runnable, file, nil) if file
+          else
+            lines.map { |line| Filter.new(@runnable, file, line) }
+          end
+        end
+      end
+  end
+
+  class Filter # :nodoc:
+    def initialize(runnable, file, line)
+      @runnable, @file = runnable, File.expand_path(file)
+      @line = line.to_i if line
+    end
+
+    def ===(method)
+      return unless @runnable.method_defined?(method)
+
+      if @line
+        test_file, test_range = definition_for(@runnable.instance_method(method))
+        test_file == @file && test_range.include?(@line)
+      else
+        @runnable.instance_method(method).source_location.first == @file
+      end
+    end
+
+    private
+      def definition_for(method)
+        file, start_line = method.source_location
+        end_line = method.source.count("\n") + start_line - 1
+
+        return file, start_line..end_line
+      end
+  end
 end

data/lib/rails/test_unit/minitest_plugin.rb

@@ -0,0 +1,139 @@
+require "active_support/core_ext/module/attribute_accessors"
+require "rails/test_unit/reporter"
+require "rails/test_unit/test_requirer"
+require "shellwords"
+
+module Minitest
+  class SuppressedSummaryReporter < SummaryReporter
+    # Disable extra failure output after a run if output is inline.
+    def aggregated_results
+      super unless options[:output_inline]
+    end
+  end
+
+  def self.plugin_rails_options(opts, options)
+    executable = ::Rails::TestUnitReporter.executable
+    opts.separator ""
+    opts.separator "Usage: #{executable} [options] [files or directories]"
+    opts.separator "You can run a single test by appending a line number to a filename:"
+    opts.separator ""
+    opts.separator "    #{executable} test/models/user_test.rb:27"
+    opts.separator ""
+    opts.separator "You can run multiple files and directories at the same time:"
+    opts.separator ""
+    opts.separator "    #{executable} test/controllers test/integration/login_test.rb"
+    opts.separator ""
+    opts.separator "By default test failures and errors are reported inline during a run."
+    opts.separator ""
+
+    opts.separator "Rails options:"
+    opts.on("-e", "--environment ENV",
+            "Run tests in the ENV environment") do |env|
+      options[:environment] = env.strip
+    end
+
+    opts.on("-b", "--backtrace",
+            "Show the complete backtrace") do
+      options[:full_backtrace] = true
+    end
+
+    opts.on("-d", "--defer-output",
+            "Output test failures and errors after the test run") do
+      options[:output_inline] = false
+    end
+
+    opts.on("-f", "--fail-fast",
+            "Abort test run on first failure or error") do
+      options[:fail_fast] = true
+    end
+
+    opts.on("-c", "--[no-]color",
+            "Enable color in the output") do |value|
+      options[:color] = value
+    end
+
+    opts.on("-w", "--warnings",
+            "Enable ruby warnings") do
+      $VERBOSE = true
+    end
+
+    options[:color] = true
+    options[:output_inline] = true
+    options[:patterns] = opts.order! unless run_via.rake?
+  end
+
+  def self.rake_run(patterns) # :nodoc:
+    self.run_via = :rake unless run_via.set?
+    ::Rails::TestRequirer.require_files(patterns)
+    autorun
+  end
+
+  module RunRespectingRakeTestopts
+    def run(args = [])
+      if run_via.rake?
+        args = Shellwords.split(ENV["TESTOPTS"] || "")
+      end
+
+      super
+    end
+  end
+
+  singleton_class.prepend RunRespectingRakeTestopts
+
+  # Owes great inspiration to test runner trailblazers like RSpec,
+  # minitest-reporters, maxitest and others.
+  def self.plugin_rails_init(options)
+    ENV["RAILS_ENV"] = options[:environment] || "test"
+
+    # If run via `ruby` we've been passed the files to run directly, or if run
+    # via `rake` then they have already been eagerly required.
+    unless run_via.ruby? || run_via.rake?
+      ::Rails::TestRequirer.require_files(options[:patterns])
+    end
+
+    unless options[:full_backtrace] || ENV["BACKTRACE"]
+      # Plugin can run without Rails loaded, check before filtering.
+      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
+    end
+
+    # Replace progress reporter for colors.
+    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
+    reporter << SuppressedSummaryReporter.new(options[:io], options)
+    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+  end
+
+  def self.run_via=(runner)
+    if run_via.set?
+      raise ArgumentError, "run_via already assigned"
+    else
+      run_via.runner = runner
+    end
+  end
+
+  class RunVia
+    attr_accessor :runner
+    alias set? runner
+
+    # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
+    def []=(runner, *)
+      @runner = runner
+    end
+
+    def ruby?
+      runner == :ruby
+    end
+
+    def rake?
+      runner == :rake
+    end
+  end
+
+  mattr_reader(:run_via) { RunVia.new }
+end
+
+# Put Rails as the first plugin minitest initializes so other plugins
+# can override or replace our default reporter setup.
+# Since minitest only loads plugins if its extensions are empty we have
+# to call `load_plugins` first.
+Minitest.load_plugins
+Minitest.extensions.unshift "rails"