railties 5.2.2.1 → 6.0.2

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

@@ -1,11 +1,17 @@
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
+  <%-# Spring executes the reloaders when files change. %>
+  <%- if spring_install? -%>
+  config.cache_classes = false
+  <%- else -%>
   config.cache_classes = true
+  <%- end -%>
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -21,6 +27,7 @@ Rails.application.configure do
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
@@ -29,7 +36,7 @@ Rails.application.configure do
   config.action_controller.allow_forgery_protection = false
 
   <%- unless skip_active_storage? -%>
-  # Store uploaded files on the local file system in a temporary directory
+  # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
   <%- end -%>
@@ -45,6 +52,6 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 end

data/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt

@@ -5,7 +5,7 @@ Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-<%- unless options[:skip_yarn] -%>
+<%- unless options[:skip_javascript] -%>
 # Add Yarn node_modules folder to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
 <%- end -%>

data/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt

@@ -11,6 +11,10 @@
 #   policy.object_src  :none
 #   policy.script_src  :self, :https
 #   policy.style_src   :self, :https
+<%- unless options[:skip_javascript] -%>
+#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
+<%- end -%>
 
 #   # Specify URI for violation reports
 #   # policy.report_uri "/csp-violation-report-endpoint"
@@ -19,6 +23,9 @@
 # If you are using UJS then enable automatic nonce generation
 # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
 
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt

@@ -0,0 +1,45 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.0 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Don't force requests from old versions of IE to be UTF-8 encoded.
+# Rails.application.config.action_view.default_enforce_utf8 = false
+
+# Embed purpose and expiry metadata inside signed and encrypted
+# cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.0.
+# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+
+# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
+
+# Return false instead of self when enqueuing is aborted from a callback.
+# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
+
+# Send Active Storage analysis and purge jobs to dedicated queues.
+# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
+# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
+
+# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
+# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
+# Rails.application.config.active_storage.replace_on_assign_to_many = true
+
+# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
+#
+# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
+# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
+# If you send mail in the background, job workers need to have a copy of
+# MailDeliveryJob to ensure all delivery jobs are processed properly.
+# Make sure your entire app is migrated and stable on 6.0 before using this setting.
+# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+
+# Enable the same cache key to be reused when the object being cached of type
+# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
+# of the relation's cache key into the cache version to support recycling cache key.
+# Rails.application.config.active_record.collection_cache_versioning = true

data/lib/rails/generators/rails/app/templates/config/locales/en.yml

@@ -27,7 +27,7 @@
 #   'true': 'foo'
 #
 # To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
+# available at https://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"

data/lib/rails/generators/rails/app/templates/config/puma.rb.tt

@@ -4,8 +4,9 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
@@ -15,8 +16,11 @@ port        ENV.fetch("PORT") { 3000 }
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
 
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
 # Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).

data/lib/rails/generators/rails/app/templates/config/routes.rb.tt

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end

data/lib/rails/generators/rails/app/templates/config/spring.rb.tt

@@ -1,6 +1,6 @@
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }
+Spring.watch(
+  ".ruby-version",
+  ".rbenv-vars",
+  "tmp/restart.txt",
+  "tmp/caching-dev.txt"
+)

data/lib/rails/generators/rails/app/templates/gitignore.tt

@@ -11,6 +11,7 @@
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
+/db/*.sqlite3-*
 
 <% end -%>
 # Ignore all logfiles and tempfiles.
@@ -22,19 +23,14 @@
 <% end -%>
 
 <% unless skip_active_storage? -%>
-# Ignore uploaded files in development
+# Ignore uploaded files in development.
 /storage/*
 <% if keeps? -%>
 !/storage/.keep
 <% end -%>
-<% end -%>
-
-<% unless options.skip_yarn? -%>
-/node_modules
-/yarn-error.log
-
 <% end -%>
 <% unless options.api? -%>
+
 /public/assets
 <% end -%>
 .byebug_history

data/lib/rails/generators/rails/app/templates/package.json.tt

@@ -1,5 +1,11 @@
 {
   "name": "<%= app_name %>",
   "private": true,
-  "dependencies": {}
+  "dependencies": {
+    "@rails/ujs": "^6.0.0"<% unless options[:skip_turbolinks] %>,
+    "turbolinks": "^5.2.0"<% end -%><% unless skip_active_storage? %>,
+    "@rails/activestorage": "^6.0.0"<% end -%><% unless options[:skip_action_cable] %>,
+    "@rails/actioncable": "^6.0.0"<% end %>
+  },
+  "version": "0.1.0"
 }

data/lib/rails/generators/rails/app/templates/public/robots.txt

@@ -1 +1 @@
-# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file

data/lib/rails/generators/rails/app/templates/ruby-version.tt

@@ -1 +1 @@
-<%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{defined?(JRUBY_VERSION) ? JRUBY_VERSION : RUBY_VERSION}" -%>
+<%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" %>

data/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt

@@ -0,0 +1,11 @@
+require "test_helper"
+
+class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase
+  # test "connects with cookies" do
+  #   cookies.signed[:user_id] = 42
+  #
+  #   connect
+  #
+  #   assert_equal connection.user_id, "42"
+  # end
+end

data/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt

@@ -3,6 +3,13 @@ require_relative '../config/environment'
 require 'rails/test_help'
 
 class ActiveSupport::TestCase
+  # Run tests in parallel with specified workers
+<% if defined?(JRUBY_VERSION) || Gem.win_platform? -%>
+  parallelize(workers: :number_of_processors, with: :threads)
+<%- else -%>
+  parallelize(workers: :number_of_processors)
+<% end -%>
+
 <% unless options[:skip_active_record] -%>
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all

data/lib/rails/generators/rails/assets/USAGE

@@ -5,16 +5,13 @@ Description:
     To create an asset within a folder, specify the asset's name as a
     path like 'parent/name'.
 
-    This generates a JavaScript stub in app/assets/javascripts and a stylesheet
-    stub in app/assets/stylesheets.
+    This generates a stylesheet stub in app/assets/stylesheets.
 
-    If CoffeeScript is available, JavaScripts will be generated with the .coffee extension.
     If Sass 3 is available, stylesheets will be generated with the .scss extension.
 
 Example:
     `rails generate assets posts`
 
     Posts assets.
-        JavaScript:     app/assets/javascripts/posts.js
         Stylesheet:     app/assets/stylesheets/posts.css
 

data/lib/rails/generators/rails/assets/assets_generator.rb

@@ -10,7 +10,6 @@ module Rails
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
       private
-
         def asset_name
           file_name
         end

data/lib/rails/generators/rails/controller/controller_generator.rb

@@ -20,10 +20,20 @@ module Rails
         route generate_routing_code
       end
 
-      hook_for :template_engine, :test_framework, :helper, :assets
+      hook_for :template_engine, :test_framework, :helper, :assets do |generator|
+        invoke generator, [ remove_possible_suffix(name), actions ]
+      end
 
       private
 
+        def file_name
+          @_file_name ||= remove_possible_suffix(super)
+        end
+
+        def remove_possible_suffix(name)
+          name.sub(/_?controller$/i, "")
+        end
+
         # This method creates nested route entry for namespaced resources.
         # For eg. rails g controller foo/bar/baz index show
         # Will generate -

data/lib/rails/generators/rails/credentials/credentials_generator.rb

@@ -2,7 +2,6 @@
 
 require "rails/generators/base"
 require "rails/generators/rails/master_key/master_key_generator"
-require "active_support/core_ext/string/strip"
 require "active_support/encrypted_configuration"
 
 module Rails
@@ -21,7 +20,7 @@ module Rails
 
           add_credentials_file_silently(template)
 
-          say "You can edit encrypted credentials with `bin/rails credentials:edit`."
+          say "You can edit encrypted credentials with `rails credentials:edit`."
           say ""
         end
       end
@@ -43,13 +42,13 @@ module Rails
         end
 
         def credentials_template
-          <<-YAML.strip_heredoc
-          # aws:
-          #   access_key_id: 123
-          #   secret_access_key: 345
+          <<~YAML
+            # aws:
+            #   access_key_id: 123
+            #   secret_access_key: 345
 
-          # Used as the base secret for all MessageVerifiers in Rails, including the one protecting cookies.
-          secret_key_base: #{SecureRandom.hex(64)}
+            # Used as the base secret for all MessageVerifiers in Rails, including the one protecting cookies.
+            secret_key_base: #{SecureRandom.hex(64)}
           YAML
         end
     end

data/lib/rails/generators/rails/db/system/change/change_generator.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+
+module Rails
+  module Generators
+    module Db
+      module System
+        class ChangeGenerator < Base # :nodoc:
+          include Database
+          include AppName
+
+          class_option :to, required: true,
+            desc: "The database system to switch to."
+
+          def self.default_generator_root
+            path = File.expand_path(File.join(base_name, "app"), base_root)
+            path if File.exist?(path)
+          end
+
+          def initialize(*)
+            super
+
+            unless DATABASES.include?(options[:to])
+              raise Error, "Invalid value for --to option. Supported preconfigurations are: #{DATABASES.join(", ")}."
+            end
+
+            opt = options.dup
+            opt[:database] ||= opt[:to]
+            self.options = opt.freeze
+          end
+
+          def edit_database_config
+            template("config/databases/#{options[:database]}.yml", "config/database.yml")
+          end
+
+          def edit_gemfile
+            name, version = gem_for_database
+            gsub_file("Gemfile", all_database_gems_regex, name)
+            gsub_file("Gemfile", gem_entry_regex_for(name), gem_entry_for(name, *version))
+          end
+
+          private
+            def all_database_gems
+              DATABASES.map { |database| gem_for_database(database) }
+            end
+
+            def all_database_gems_regex
+              all_database_gem_names = all_database_gems.map(&:first)
+              /(\b#{all_database_gem_names.join('\b|\b')}\b)/
+            end
+
+            def gem_entry_regex_for(gem_name)
+              /^gem.*\b#{gem_name}\b.*/
+            end
+
+            def gem_entry_for(*gem_name_and_version)
+              gem_name_and_version.map! { |segment| "'#{segment}'" }
+              "gem #{gem_name_and_version.join(", ")}"
+            end
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/rails/encrypted_file/encrypted_file_generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails/generators/base"
-require "active_support/core_ext/string/strip"
 require "active_support/encrypted_file"
 
 module Rails
@@ -16,10 +15,10 @@ module Rails
 
       private
         def encrypted_file_template
-          <<-YAML.strip_heredoc
-          # aws:
-          #   access_key_id: 123
-          #   secret_access_key: 345
+          <<~YAML
+            # aws:
+            #   access_key_id: 123
+            #   secret_access_key: 345
 
           YAML
         end

data/lib/rails/generators/rails/helper/helper_generator.rb

@@ -10,6 +10,11 @@ module Rails
       end
 
       hook_for :test_framework
+
+      private
+        def file_name
+          @_file_name ||= super.sub(/_helper\z/i, "")
+        end
     end
   end
 end