RubyGems - railties - Versions diffs - 6.1.6 → 7.1.2 - Mend

railties 6.1.6 → 7.1.2

Files changed (245) hide show

data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css.tt CHANGED Viewed

@@ -2,11 +2,11 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+ * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
  * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *

data/lib/rails/generators/rails/app/templates/app/mailers/application_mailer.rb.tt CHANGED Viewed

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
-  layout 'mailer'
+  default from: "from@example.com"
+  layout "mailer"
 end

data/lib/rails/generators/rails/app/templates/app/models/application_record.rb.tt CHANGED Viewed

@@ -1,3 +1,3 @@
 class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+  primary_abstract_class
 end

data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt CHANGED Viewed

@@ -6,16 +6,10 @@
     <%%= csrf_meta_tags %>
     <%%= csp_meta_tag %>
-    <%- if options[:skip_javascript] -%>
-    <%%= stylesheet_link_tag 'application', media: 'all' %>
+    <%- if options[:skip_hotwire] || options[:skip_javascript] -%>
+    <%%= stylesheet_link_tag "application" %>
     <%- else -%>
-      <%- unless options[:skip_turbolinks] -%>
-    <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
-      <%- else -%>
-    <%%= stylesheet_link_tag 'application', media: 'all' %>
-    <%%= javascript_pack_tag 'application' %>
-      <%- end -%>
+    <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <%- end -%>
   </head>

data/lib/rails/generators/rails/app/templates/app/views/layouts/mailer.html.erb.tt CHANGED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style>
       /* Email styles need to be inline */
     </style>

data/lib/rails/generators/rails/app/templates/bin/rails.tt CHANGED Viewed

@@ -1,6 +1,3 @@
-<% if spring_install? -%>
-load File.expand_path("spring", __dir__)
-<% end -%>
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"

data/lib/rails/generators/rails/app/templates/bin/rake.tt CHANGED Viewed

@@ -1,6 +1,3 @@
-<% if spring_install? -%>
-load File.expand_path("spring", __dir__)
-<% end -%>
 require_relative "../config/boot"
 require "rake"
 Rake.application.run

data/lib/rails/generators/rails/app/templates/bin/setup.tt CHANGED Viewed

@@ -1,10 +1,10 @@
 require "fileutils"
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 FileUtils.chdir APP_ROOT do
@@ -12,28 +12,32 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-<% unless options.skip_javascript? -%>
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+<% if using_node? -%>
   # Install JavaScript dependencies
-  system! 'bin/yarn'
+  system("yarn check --check-files") || system!("yarn install")
+<% elsif using_bun? -%>
+  # Install JavaScript dependencies
+  system!("bun install")
 <% end -%>
 <% unless options.skip_active_record? -%>
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 <% end -%>
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

data/lib/rails/generators/rails/app/templates/config/application.rb.tt CHANGED Viewed

@@ -1,23 +1,6 @@
 require_relative "boot"
-<% if include_all_railties? -%>
-require "rails/all"
-<% else -%>
-require "rails"
-# Pick the frameworks you want:
-require "active_model/railtie"
-<%= comment_if :skip_active_job %>require "active_job/railtie"
-<%= comment_if :skip_active_record %>require "active_record/railtie"
-<%= comment_if :skip_active_storage %>require "active_storage/engine"
-require "action_controller/railtie"
-<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
-<%= comment_if :skip_action_mailbox %>require "action_mailbox/engine"
-<%= comment_if :skip_action_text %>require "action_text/engine"
-require "action_view/railtie"
-<%= comment_if :skip_action_cable %>require "action_cable/engine"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
-<%= comment_if :skip_test %>require "rails/test_unit/railtie"
-<% end -%>
+<%= rails_require_statement %>
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -32,6 +15,11 @@ module <%= app_const_base %>
     config.load_defaults Rails::VERSION::STRING.to_f
 <%- end -%>
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w(assets tasks))
     # Configuration for the application, engines, and railties goes here.
     #
     # These settings can be overridden in specific environments using the files

data/lib/rails/generators/rails/app/templates/config/boot.rb.tt CHANGED Viewed

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" # Set up gems listed in the Gemfile.
 <% if depend_on_bootsnap? -%>

data/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml.tt CHANGED Viewed

@@ -3,7 +3,7 @@
 #   gem install activerecord-jdbcmssql-adapter
 #
 # Configure using Gemfile:
-#   gem 'activerecord-jdbcmssql-adapter'
+#   gem "activerecord-jdbcmssql-adapter"
 #
 # development:
 #   adapter: mssql
@@ -65,4 +65,4 @@ test:
 production:
   url: jdbc:db://localhost/<%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml.tt CHANGED Viewed

@@ -4,7 +4,7 @@
 #   gem install activerecord-jdbcmysql-adapter
 #
 # Configure Using Gemfile
-# gem 'activerecord-jdbcmysql-adapter'
+# gem "activerecord-jdbcmysql-adapter"
 #
 # And be sure to use new-style password hashing:
 #   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
@@ -42,7 +42,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -51,4 +51,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml.tt CHANGED Viewed

@@ -1,7 +1,7 @@
 # PostgreSQL. Versions 9.3 and up are supported.
 #
 # Configure Using Gemfile
-# gem 'activerecord-jdbcpostgresql-adapter'
+# gem "activerecord-jdbcpostgresql-adapter"
 #
 default: &default
   adapter: postgresql
@@ -12,13 +12,13 @@ development:
   <<: *default
   database: <%= app_name %>_development
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
+  # The specified database role being used to connect to PostgreSQL.
+  # To create additional roles in PostgreSQL see `$ createuser --help`.
+  # When left blank, PostgreSQL will use the default role. This is
   # the same name as the operating system user running Rails.
   #username: <%= app_name %>
-  # The password associated with the postgres role (username).
+  # The password associated with the PostgreSQL role (username).
   #password:
   # Connect on a TCP socket. Omitted by default since the client uses a
@@ -58,7 +58,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -67,4 +67,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml.tt CHANGED Viewed

@@ -1,8 +1,8 @@
 # SQLite. Versions 3.8.0 and up are supported.
-#   gem 'activerecord-jdbcsqlite3-adapter'
+#   gem "activerecord-jdbcsqlite3-adapter"
 #
 # Configure Using Gemfile
-# gem 'activerecord-jdbcsqlite3-adapter'
+# gem "activerecord-jdbcsqlite3-adapter"
 #
 default: &default
   adapter: sqlite3
@@ -10,15 +10,15 @@ default: &default
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: storage/development.sqlite3
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: storage/test.sqlite3
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: storage/production.sqlite3

data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt CHANGED Viewed

@@ -4,7 +4,7 @@
 #   gem install mysql2
 #
 # Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
+#   gem "mysql2"
 #
 # And be sure to use new-style password hashing:
 #   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
@@ -47,7 +47,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -56,4 +56,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml.tt CHANGED Viewed

@@ -50,7 +50,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -59,4 +59,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt CHANGED Viewed

@@ -4,15 +4,13 @@
 #   gem install pg
 # On macOS with Homebrew:
 #   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
 # On Windows:
 #   gem install pg
 #       Choose the win32 build.
 #       Install PostgreSQL and put its /bin directory on your path.
 #
 # Configure Using Gemfile
-# gem 'pg'
+# gem "pg"
 #
 default: &default
   adapter: postgresql
@@ -25,13 +23,13 @@ development:
   <<: *default
   database: <%= app_name %>_development
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
+  # The specified database role being used to connect to PostgreSQL.
+  # To create additional roles in PostgreSQL see `$ createuser --help`.
+  # When left blank, PostgreSQL will use the default role. This is
   # the same name as the operating system user running Rails.
   #username: <%= app_name %>
-  # The password associated with the postgres role (username).
+  # The password associated with the PostgreSQL role (username).
   #password:
   # Connect on a TCP socket. Omitted by default since the client uses a
@@ -74,7 +72,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -83,4 +81,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt CHANGED Viewed

@@ -2,7 +2,7 @@
 #   gem install sqlite3
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+#   gem "sqlite3"
 #
 default: &default
   adapter: sqlite3
@@ -11,15 +11,15 @@ default: &default
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: storage/development.sqlite3
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: storage/test.sqlite3
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: storage/production.sqlite3

data/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml.tt CHANGED Viewed

@@ -5,14 +5,14 @@
 #   gem install activerecord-sqlserver-adapter
 #
 # Ensure the activerecord adapter and db driver gems are defined in your Gemfile
-#   gem 'tiny_tds'
-#   gem 'activerecord-sqlserver-adapter'
+#   gem "tiny_tds"
+#   gem "activerecord-sqlserver-adapter"
 #
 default: &default
   adapter: sqlserver
   encoding: utf8
   username: sa
-  password: <%%= ENV['SA_PASSWORD'] %>
+  password: <%%= ENV["SA_PASSWORD"] %>
   host: localhost
 development:
@@ -41,7 +41,7 @@ test:
 # URL environment variable explicitly:
 #
 #   production:
-#     url: <%%= ENV['MY_APP_DATABASE_URL'] %>
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
 #
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
@@ -50,4 +50,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt ADDED Viewed

@@ -0,0 +1,59 @@
+# MySQL. Versions 5.5.8 and up are supported.
+#
+# Install the MySQL driver
+#   gem install trilogy
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem "trilogy"
+#
+# And be sure to use new-style password hashing:
+#   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
+#
+default: &default
+  adapter: trilogy
+  encoding: utf8mb4
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  username: root
+  password:
+<% if mysql_socket -%>
+  socket: <%= mysql_socket %>
+<% else -%>
+  host: localhost
+<% end -%>
+development:
+  <<: *default
+  database: <%= app_name %>_development
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: <%= app_name %>_test
+# As with config/credentials.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password or a full connection URL as an environment
+# variable when you boot the app. For example:
+#
+#   DATABASE_URL="trilogy://myuser:mypass@localhost/somedatabase"
+#
+# If the connection URL is provided in the special DATABASE_URL environment
+# variable, Rails will automatically merge its configuration values on top of
+# the values provided in this file. Alternatively, you can specify a connection
+# URL environment variable explicitly:
+#
+#   production:
+#     url: <%%= ENV["MY_APP_DATABASE_URL"] %>
+#
+# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full overview on how database connection configuration can be specified.
+#
+production:
+  <<: *default
+  database: <%= app_name %>_production
+  username: <%= app_name %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt CHANGED Viewed

@@ -6,7 +6,7 @@ Rails.application.configure do
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
   # Do not eager load code on boot.
   config.eager_load = false
@@ -14,9 +14,12 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
+  # Enable server timing
+  config.server_timing = true
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     <%- unless options.api? -%>
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
@@ -24,7 +27,7 @@ Rails.application.configure do
     <%- end -%>
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -61,12 +64,12 @@ Rails.application.configure do
   config.active_record.verbose_query_logs = true
   <%- end -%>
-  <%- unless options.skip_sprockets? -%>
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
+  <%- unless options[:skip_active_job] -%>
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
+  <%- end -%>
+  <%- unless skip_sprockets? -%>
   # Suppress logger output for asset requests.
   config.assets.quiet = true
   <%- end -%>
@@ -77,10 +80,11 @@ Rails.application.configure do
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  <%= '# ' unless depend_on_listen? %>config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  <%- unless skip_action_cable? -%>
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
+  <%- end -%>
+  # Raise error when a before_action's only/except options reference missing actions
+  config.action_controller.raise_on_missing_callback_actions = true
 end