railties 4.2.11.3 → 5.0.0.beta1

data/lib/rails/generators/test_unit/mailer/templates/preview.rb

@@ -1,11 +1,11 @@
 <% module_namespacing do -%>
-# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
-class <%= class_name %>Preview < ActionMailer::Preview
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>_mailer
+class <%= class_name %>MailerPreview < ActionMailer::Preview
 <% actions.each do |action| -%>
 
-  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>_mailer/<%= action %>
   def <%= action %>
-    <%= class_name %>.<%= action %>
+    <%= class_name %>Mailer.<%= action %>
   end
 <% end -%>
 

data/lib/rails/generators/test_unit/model/model_generator.rb

@@ -19,7 +19,7 @@ module TestUnit # :nodoc:
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template 'fixtures.yml', File.join('test/fixtures', class_path, "#{plural_file_name}.yml")
+          template 'fixtures.yml', File.join('test/fixtures', class_path, "#{fixture_file_name}.yml")
         end
       end
 

data/lib/rails/generators/test_unit/model/templates/fixtures.yml

@@ -5,6 +5,8 @@
 <% attributes.each do |attribute| -%>
   <%- if attribute.password_digest? -%>
   password_digest: <%%= BCrypt::Password.create('secret') %>
+  <%- elsif attribute.reference? -%>
+  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default) %>
   <%- else -%>
   <%= yaml_key_value(attribute.column_name, attribute.default) %>
   <%- end -%>

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -8,10 +8,14 @@ module TestUnit # :nodoc:
 
       check_class_collision suffix: "ControllerTest"
 
+      class_option :api, type: :boolean,
+                         desc: "Generates API functional tests"
+
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_test_files
-        template "functional_test.rb",
+        template_file = options.api? ? "api_functional_test.rb" : "functional_test.rb"
+        template template_file,
                  File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
 

data/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <%- end -%>
+  setup do
+    @<%= singular_table_name %> = <%= fixture_name %>(:one)
+  end
+
+  test "should get index" do
+    get <%= index_helper %>_url
+    assert_response :success
+  end
+
+  test "should create <%= singular_table_name %>" do
+    assert_difference('<%= class_name %>.count') do
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    end
+
+    assert_response 201
+  end
+
+  test "should show <%= singular_table_name %>" do
+    get <%= show_helper %>
+    assert_response :success
+  end
+
+  test "should update <%= singular_table_name %>" do
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    assert_response 200
+  end
+
+  test "should destroy <%= singular_table_name %>" do
+    assert_difference('<%= class_name %>.count', -1) do
+      delete <%= show_helper %>
+    end
+
+    assert_response 204
+  end
+end
+<% end -%>

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

@@ -1,51 +1,51 @@
 require 'test_helper'
 
 <% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <%- end -%>
   setup do
     @<%= singular_table_name %> = <%= fixture_name %>(:one)
-<% if mountable_engine? -%>
-    @routes = Engine.routes
-<% end -%>
   end
 
   test "should get index" do
-    get :index
+    get <%= index_helper %>_url
     assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
   end
 
   test "should get new" do
-    get :new
+    get <%= new_helper %>
     assert_response :success
   end
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     end
 
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    assert_redirected_to <%= singular_table_name %>_path(<%= class_name %>.last)
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, id: <%= "@#{singular_table_name}" %>
+    get <%= show_helper %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: <%= "@#{singular_table_name}" %>
+    get <%= edit_helper %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    patch :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    assert_redirected_to <%= singular_table_name %>_path(<%= "@#{singular_table_name}" %>)
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, id: <%= "@#{singular_table_name}" %>
+      delete <%= show_helper %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/rails/generators/testing/assertions.rb

@@ -1,5 +1,3 @@
-require 'shellwords'
-
 module Rails
   module Generators
     module Testing

data/lib/rails/generators/testing/behaviour.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/testing/stream'
 require 'active_support/concern'
 require 'rails/generators'
 
@@ -10,6 +11,7 @@ module Rails
     module Testing
       module Behaviour
         extend ActiveSupport::Concern
+        include ActiveSupport::Testing::Stream
 
         included do
           class_attribute :destination_root, :current_path, :generator_class, :default_arguments
@@ -90,7 +92,8 @@ module Rails
             cd current_path
           end
 
-          def prepare_destination # :nodoc:
+          # Clears all files and directories in destination.
+          def prepare_destination
             rm_rf(destination_root)
             mkdir_p(destination_root)
           end
@@ -101,22 +104,6 @@ module Rails
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
 
-          def capture(stream)
-            stream = stream.to_s
-            captured_stream = Tempfile.new(stream)
-            stream_io = eval("$#{stream}")
-            origin_stream = stream_io.dup
-            stream_io.reopen(captured_stream)
-
-            yield
-
-            stream_io.rewind
-            return captured_stream.read
-          ensure
-            captured_stream.close
-            captured_stream.unlink
-            stream_io.reopen(origin_stream)
-          end
       end
     end
   end

data/lib/rails/info.rb

@@ -8,7 +8,7 @@ module Rails
     mattr_accessor :properties
     class << (@@properties = [])
       def names
-        map {|val| val.first }
+        map(&:first)
       end
 
       def value_for(property_name)
@@ -26,7 +26,7 @@ module Rails
       end
 
       def to_s
-        column_width = properties.names.map {|name| name.length}.max
+        column_width = properties.names.map(&:length).max
         info = properties.map do |name, value|
           value = value.join(", ") if value.is_a?(Array)
           "%-#{column_width}s   %s" % [name, value]

data/lib/rails/info_controller.rb

@@ -17,7 +17,28 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
   end
 
   def routes
-    @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
-    @page_title = 'Routes'
+    if path = params[:path]
+      path = URI.parser.escape path
+      normalized_path = with_leading_slash path
+      render json: {
+        exact: match_route {|it| it.match normalized_path },
+        fuzzy: match_route {|it| it.spec.to_s.match path }
+      }
+    else
+      @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
+      @page_title = 'Routes'
+    end
+  end
+
+  private
+
+  def match_route
+    _routes.routes.select {|route|
+      yield route.path
+    }.map {|route| route.path.spec.to_s }
+  end
+
+  def with_leading_slash(path)
+    ('/' + path).squeeze('/')
   end
 end

data/lib/rails/mailers_controller.rb

@@ -26,12 +26,12 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
 
           if part = find_part(part_type)
             response.content_type = part_type
-            render text: part.respond_to?(:decoded) ? part.decoded : part
+            render plain: part.respond_to?(:decoded) ? part.decoded : part
           else
             raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{@email_action}"
           end
         else
-          @part = find_preferred_part(request.format, Mime::HTML, Mime::TEXT)
+          @part = find_preferred_part(request.format, Mime[:html], Mime[:text])
           render action: 'email', layout: false, formats: %w[html]
         end
       else

data/lib/rails/paths.rb

@@ -7,7 +7,7 @@ module Rails
     #   root = Root.new "/rails"
     #   root.add "app/controllers", eager_load: true
     #
-    # The command above creates a new root object and add "app/controllers" as a path.
+    # The command above creates a new root object and adds "app/controllers" as a path.
     # This means we can get a <tt>Rails::Paths::Path</tt> object back like below:
     #
     #   path = root["app/controllers"]
@@ -77,23 +77,23 @@ module Rails
       end
 
       def all_paths
-        values.tap { |v| v.uniq! }
+        values.tap(&:uniq!)
       end
 
       def autoload_once
-        filter_by { |p| p.autoload_once? }
+        filter_by(&:autoload_once?)
       end
 
       def eager_load
-        filter_by { |p| p.eager_load? }
+        filter_by(&:eager_load?)
       end
 
       def autoload_paths
-        filter_by { |p| p.autoload? }
+        filter_by(&:autoload?)
       end
 
       def load_paths
-        filter_by { |p| p.load_path? }
+        filter_by(&:load_path?)
       end
 
     private
@@ -123,6 +123,10 @@ module Rails
         options[:load_path]     ? load_path!     : skip_load_path!
       end
 
+      def absolute_current # :nodoc:
+        File.expand_path(@current, @root.path)
+      end
+
       def children
         keys = @root.keys.find_all { |k|
           k.start_with?(@current) && k != @current
@@ -175,6 +179,10 @@ module Rails
         @paths
       end
 
+      def extensions # :nodoc:
+        $1.split(',') if @glob =~ /\{([\S]+)\}/
+      end
+
       # Expands all paths against the root and return all unique values.
       def expanded
         raise "You need to set a path root" unless @root.path

data/lib/rails/rack.rb

@@ -1,7 +1,5 @@
 module Rails
   module Rack
-    autoload :Debugger,      "rails/rack/debugger"   if RUBY_VERSION < '2.0.0'
-    autoload :Logger,        "rails/rack/logger"
-    autoload :LogTailer,     "rails/rack/log_tailer"
+    autoload :Logger, "rails/rack/logger"
   end
 end

data/lib/rails/rack/debugger.rb

@@ -1,24 +1,3 @@
-module Rails
-  module Rack
-    class Debugger
-      def initialize(app)
-        @app = app
+require 'active_support/deprecation'
 
-        ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
-
-        require 'debugger'
-
-        ::Debugger.start
-        ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
-        puts "=> Debugger enabled"
-      rescue LoadError
-        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
-        exit(1)
-      end
-
-      def call(env)
-        @app.call(env)
-      end
-    end
-  end
-end
+ActiveSupport::Deprecation.warn("This file is deprecated and will be removed in Rails 5.1 with no replacement.")

data/lib/rails/rack/logger.rb

@@ -7,6 +7,10 @@ require 'rack/body_proxy'
 module Rails
   module Rack
     # Sets log tags, logs the request, calls the app, and flushes the logs.
+    #
+    # Log tags (+taggers+) can be an Array containing: methods that the +request+
+    # object responds to, objects that respond to +to_s+ or Proc objects that accept
+    # an instance of the +request+ object.
     class Logger < ActiveSupport::LogSubscriber
       def initialize(app, taggers = nil)
         @app          = app

data/lib/rails/ruby_version_check.rb

@@ -1,13 +1,13 @@
-if RUBY_VERSION < '1.9.3'
+if RUBY_VERSION < '2.2.2' && RUBY_ENGINE == 'ruby'
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 4 prefers to run on Ruby 2.1 or newer.
+    Rails 5 requires Ruby 2.2.2 or newer.
 
     You're running
       #{desc}
 
-    Please upgrade to Ruby 1.9.3 or newer to continue.
+    Please upgrade to Ruby 2.2.2 or newer to continue.
 
   end_message
 end

data/lib/rails/source_annotation_extractor.rb

@@ -3,7 +3,7 @@
 #   rake notes
 #   rake notes:optimize
 #
-# and friends. See <tt>rake -T notes</tt> and <tt>railties/lib/tasks/annotations.rake</tt>.
+# and friends. See <tt>rake -T notes</tt> and <tt>railties/lib/rails/tasks/annotations.rake</tt>.
 #
 # Annotation objects are triplets <tt>:line</tt>, <tt>:tag</tt>, <tt>:text</tt> that
 # represent the line where the annotation lives, its tag, and its text. Note

data/lib/rails/tasks.rb

@@ -1,11 +1,14 @@
+require 'rake'
+
 # Load Rails Rakefile extensions
 %w(
   annotations
-  documentation
   framework
+  initializers
   log
   middleware
   misc
+  restart
   routes
   tmp
 ).tap { |arr|

data/lib/rails/tasks/engine.rake

@@ -40,7 +40,7 @@ namespace :db do
   desc "Rolls the schema back to the previous version (specify steps w/ STEP=n)."
   app_task "rollback"
 
-  desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
+  desc "Create a db/schema.rb file that can be portably used against any DB supported by Active Record"
   app_task "schema:dump"
 
   desc "Load a schema.rb file into the database"