railties 6.0.3.3 → 6.1.1

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

@@ -20,7 +20,7 @@ module Rails
 
           add_credentials_file_silently(template)
 
-          say "You can edit encrypted credentials with `rails credentials:edit`."
+          say "You can edit encrypted credentials with `bin/rails credentials:edit`."
           say ""
         end
       end

data/lib/rails/generators/rails/generator/USAGE

@@ -1,9 +1,9 @@
 Description:
-    Stubs out a new generator at lib/generators. Pass the generator name as an argument,
+    Generates a new generator at lib/generators. Pass the generator name as an argument,
     either CamelCased or snake_cased.
 
 Example:
-    `rails generate generator Awesome`
+    `bin/rails generate generator Awesome`
 
     creates a standard awesome generator:
         lib/generators/awesome/

data/lib/rails/generators/rails/generator/templates/USAGE.tt

@@ -2,7 +2,7 @@ Description:
     Explain the generator
 
 Example:
-    rails generate <%= file_name %> Thing
+    bin/rails generate <%= file_name %> Thing
 
     This will create:
         what/will/it/create

data/lib/rails/generators/rails/helper/USAGE

@@ -1,13 +1,12 @@
 Description:
-    Stubs out a new helper. Pass the helper name, either CamelCased
+    Generates a new helper. Pass the helper name, either CamelCased
     or under_scored.
 
     To create a helper within a module, specify the helper name as a
     path like 'parent_module/helper_name'.
 
 Example:
-    `rails generate helper CreditCard`
+    `bin/rails generate helper CreditCard`
 
     Credit card helper.
         Helper:     app/helpers/credit_card_helper.rb
-

data/lib/rails/generators/rails/integration_test/USAGE

@@ -1,10 +1,10 @@
 Description:
-    Stubs out a new integration test. Pass the name of the test, either
+    Generates a new integration test. Pass the name of the test, either
     CamelCased or under_scored, as an argument.
 
     This generator invokes the current integration tool, which defaults to
     TestUnit.
 
 Example:
-    `rails generate integration_test GeneralStories` creates a GeneralStories
+    `bin/rails generate integration_test GeneralStories` creates a GeneralStories
     integration test in test/integration/general_stories_test.rb

data/lib/rails/generators/rails/migration/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Stubs out a new database migration. Pass the migration name, either
+    Generates a new database migration. Pass the migration name, either
     CamelCased or under_scored, and an optional list of attribute pairs as arguments.
 
     A migration class is generated in db/migrate prefixed by a timestamp of the current date and time.
@@ -8,12 +8,12 @@ Description:
     column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
 
 Example:
-    `rails generate migration AddSslFlag`
+    `bin/rails generate migration AddSslFlag`
 
     If the current date is May 14, 2008 and the current time 09:09:12, this creates the AddSslFlag migration
     db/migrate/20080514090912_add_ssl_flag.rb
 
-    `rails generate migration AddTitleBodyToPost title:string body:text published:boolean`
+    `bin/rails generate migration AddTitleBodyToPost title:string body:text published:boolean`
 
     This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with this in the Change migration:
 
@@ -25,7 +25,7 @@ Migration names containing JoinTable will generate join tables for use with
 has_and_belongs_to_many associations.
 
 Example:
-    `rails g migration CreateMediaJoinTable artists musics:uniq`
+    `bin/rails g migration CreateMediaJoinTable artists musics:uniq`
 
     will create the migration
 

data/lib/rails/generators/rails/model/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Stubs out a new model. Pass the model name, either CamelCased or
+    Generates a new model. Pass the model name, either CamelCased or
     under_scored, and an optional list of attribute pairs as arguments.
 
     Attribute pairs are field:type arguments specifying the
@@ -29,7 +29,7 @@ Available field types:
     Just after the field name you can specify a type like text or boolean.
     It will generate the column with the associated SQL type. For instance:
 
-        `rails generate model post title:string body:text`
+        `bin/rails generate model post title:string body:text`
 
     will generate a title column with a varchar type and a body column with a text
     type. If no type is specified the string type will be used by default.
@@ -49,47 +49,47 @@ Available field types:
 
     You can also consider `references` as a kind of type. For instance, if you run:
 
-        `rails generate model photo title:string album:references`
+        `bin/rails generate model photo title:string album:references`
 
     It will generate an `album_id` column. You should generate these kinds of fields when
     you will use a `belongs_to` association, for instance. `references` also supports
     polymorphism, you can enable polymorphism like this:
 
-        `rails generate model product supplier:references{polymorphic}`
+        `bin/rails generate model product supplier:references{polymorphic}`
 
     For integer, string, text and binary fields, an integer in curly braces will
     be set as the limit:
 
-        `rails generate model user pseudo:string{30}`
+        `bin/rails generate model user pseudo:string{30}`
 
     For decimal, two integers separated by a comma in curly braces will be used
     for precision and scale:
 
-        `rails generate model product 'price:decimal{10,2}'`
+        `bin/rails generate model product 'price:decimal{10,2}'`
 
     You can add a `:uniq` or `:index` suffix for unique or standard indexes
     respectively:
 
-        `rails generate model user pseudo:string:uniq`
-        `rails generate model user pseudo:string:index`
+        `bin/rails generate model user pseudo:string:uniq`
+        `bin/rails generate model user pseudo:string:index`
 
     You can combine any single curly brace option with the index options:
 
-        `rails generate model user username:string{30}:uniq`
-        `rails generate model product supplier:references{polymorphic}:index`
+        `bin/rails generate model user username:string{30}:uniq`
+        `bin/rails generate model product supplier:references{polymorphic}:index`
 
     If you require a `password_digest` string column for use with
     has_secure_password, you can specify `password:digest`:
 
-        `rails generate model user password:digest`
+        `bin/rails generate model user password:digest`
 
     If you require a `token` string column for use with
     has_secure_token, you can specify `auth_token:token`:
 
-        `rails generate model user auth_token:token`
+        `bin/rails generate model user auth_token:token`
 
 Examples:
-    `rails generate model account`
+    `bin/rails generate model account`
 
         For Active Record and TestUnit it creates:
 
@@ -98,11 +98,11 @@ Examples:
             Fixtures:   test/fixtures/accounts.yml
             Migration:  db/migrate/XXX_create_accounts.rb
 
-    `rails generate model post title:string body:text published:boolean`
+    `bin/rails generate model post title:string body:text published:boolean`
 
         Creates a Post model with a string title, text body, and published flag.
 
-    `rails generate model admin/account`
+    `bin/rails generate model admin/account`
 
         For Active Record and TestUnit it creates:
 
@@ -111,4 +111,3 @@ Examples:
             Test:       test/models/admin/account_test.rb
             Fixtures:   test/fixtures/admin/accounts.yml
             Migration:  db/migrate/XXX_create_admin_accounts.rb
-

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/hash/except"
 require "rails/generators/rails/app/app_generator"
 require "date"
 
@@ -24,10 +25,14 @@ module Rails
           directory "app"
           empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
         end
+
+        remove_dir "app/mailers" if options[:skip_action_mailer]
+        remove_dir "app/jobs" if options[:skip_active_job]
       elsif full?
         empty_directory_with_keep_file "app/models"
         empty_directory_with_keep_file "app/controllers"
-        empty_directory_with_keep_file "app/mailers"
+        empty_directory_with_keep_file "app/mailers" unless options[:skip_action_mailer]
+        empty_directory_with_keep_file "app/jobs" unless options[:skip_active_job]
 
         unless api?
           empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
@@ -57,6 +62,12 @@ module Rails
       template "gitignore", ".gitignore"
     end
 
+    def version_control
+      if !options[:skip_git] && !options[:pretend]
+        run "git init", capture: options[:quiet], abort_on_failure: false
+      end
+    end
+
     def lib
       template "lib/%namespaced_name%.rb"
       template "lib/tasks/%namespaced_name%_tasks.rake"
@@ -86,15 +97,13 @@ task default: :test
       end
     end
 
-    PASSTHROUGH_OPTIONS = [
-      :skip_active_record, :skip_active_storage, :skip_action_mailer, :skip_javascript, :skip_action_cable, :skip_sprockets, :database,
-      :api, :quiet, :pretend, :skip
-    ]
+    DUMMY_IGNORE_OPTIONS = %i[dev edge master template]
 
     def generate_test_dummy(force = false)
-      opts = (options.dup || {}).keep_if { |k, _| PASSTHROUGH_OPTIONS.map(&:to_s).include?(k) }
+      opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS)
       opts[:force] = force
       opts[:skip_bundle] = true
+      opts[:skip_spring] = true
       opts[:skip_listen] = true
       opts[:skip_git] = true
       opts[:skip_turbolinks] = true
@@ -107,7 +116,11 @@ task default: :test
 
     def test_dummy_config
       template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
+
+      insert_into_file "#{dummy_path}/config/application.rb", <<~RUBY, after: /^Bundler\.require.+\n/
+        require #{namespaced_name.inspect}
+      RUBY
+
       if mountable?
         template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       end
@@ -121,6 +134,7 @@ task default: :test
 
     def test_dummy_clean
       inside dummy_path do
+        remove_file ".ruby-version"
         remove_file "db/seeds.rb"
         remove_file "Gemfile"
         remove_file "lib/tasks"
@@ -176,7 +190,7 @@ task default: :test
                                   desc: "Generate a rails engine with bundled Rails application for testing"
 
       class_option :mountable,    type: :boolean, default: false,
-                                  desc: "Generate mountable isolated application"
+                                  desc: "Generate mountable isolated engine"
 
       class_option :skip_gemspec, type: :boolean, default: false,
                                   desc: "Skip gemspec file"
@@ -203,6 +217,7 @@ task default: :test
         build(:license)
         build(:gitignore) unless options[:skip_git]
         build(:gemfile)   unless options[:skip_gemfile]
+        build(:version_control)
       end
 
       def create_app_files
@@ -275,7 +290,6 @@ task default: :test
         say_status :vendor_app, dummy_path
         mute do
           build(:generate_test_dummy)
-          store_application_definition!
           build(:test_dummy_config)
           build(:test_dummy_assets)
           build(:test_dummy_clean)
@@ -375,25 +389,13 @@ task default: :test
         end
       end
 
-      def application_definition
-        @application_definition ||= begin
-
-          dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-          unless options[:pretend] || !File.exist?(dummy_application_path)
-            contents = File.read(dummy_application_path)
-            contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1]
-          end
-        end
-      end
-      alias :store_application_definition! :application_definition
-
       def get_builder_class
         defined?(::PluginBuilder) ? ::PluginBuilder : Rails::PluginBuilder
       end
 
       def rakefile_test_tasks
         <<-RUBY
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
@@ -422,7 +424,7 @@ end
 
       def relative_path
         return unless inside_application?
-        app_path.sub(/^#{rails_app_path}\//, "")
+        app_path.delete_prefix("#{rails_app_path}/")
       end
     end
   end

data/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt

@@ -1,14 +1,10 @@
-$:.push File.expand_path("lib", __dir__)
+require_relative "lib/<%= namespaced_name %>/version"
 
-# Maintain your gem's version:
-require "<%= namespaced_name %>/version"
-
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
-  spec.name        = "<%= name %>"
+  spec.name        = <%= name.inspect %>
   spec.version     = <%= camelized_modules %>::VERSION
-  spec.authors     = ["<%= author %>"]
-  spec.email       = ["<%= email %>"]
+  spec.authors     = [<%= author.inspect %>]
+  spec.email       = [<%= email.inspect %>]
   spec.homepage    = "TODO"
   spec.summary     = "TODO: Summary of <%= camelized_modules %>."
   spec.description = "TODO: Description of <%= camelized_modules %>."
@@ -16,18 +12,13 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
-  spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+  spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
-  <%= '# ' if options.dev? || options.edge? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
-<% unless options[:skip_active_record] -%>
+  spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
-  spec.add_development_dependency "<%= gem_for_database[0] %>"
-<% end -%>
+  <%= '# ' if options.dev? || options.edge? || options.master? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
 end

data/lib/rails/generators/rails/plugin/templates/Gemfile.tt

@@ -2,23 +2,16 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 <% if options[:skip_gemspec] -%>
-<%= '# ' if options.dev? || options.edge? -%>gem 'rails', '<%= Array(rails_version_specifier).join("', '") %>'
+<%= '# ' if options.dev? || options.edge? || options.master? -%>gem 'rails', '<%= Array(rails_version_specifier).join("', '") %>'
 <% else -%>
-# Declare your gem's dependencies in <%= name %>.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+# Specify your gem's dependencies in <%= name %>.gemspec.
 gemspec
 <% end -%>
+<% unless options[:skip_active_record] -%>
 
-<% if options[:skip_gemspec] -%>
 group :development do
   gem '<%= gem_for_database[0] %>'
 end
-<% else -%>
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
 <% end -%>
 
 <% if options.dev? || options.edge? -%>

data/lib/rails/generators/rails/plugin/templates/Rakefile.tt

@@ -1,28 +1,14 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = '<%= camelized_modules %>'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/setup"
 <% if engine? && !options[:skip_active_record] && with_dummy_app? -%>
 
 APP_RAKEFILE = File.expand_path("<%= dummy_path -%>/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 <% end -%>
 <% if engine? -%>
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 <% end -%>
 <% unless options[:skip_gemspec] -%>
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt

@@ -1,6 +1,5 @@
 <%= wrap_in_modules <<~rb
   class ApplicationController < ActionController::#{api? ? "API" : "Base"}
-    #{ api? ? '# ' : '' }protect_from_forgery with: :exception
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/bin/rails.tt

@@ -9,10 +9,10 @@ APP_PATH = File.expand_path('../<%= dummy_path -%>/config/application', __dir__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 <% if include_all_railties? -%>
-require 'rails/all'
+require "rails/all"
 <% else -%>
 require "rails"
 # Pick the frameworks you want:
@@ -27,4 +27,4 @@ require "action_view/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <% end -%>
-require 'rails/engine/commands'
+require "rails/engine/commands"