RubyGems - railties - Versions diffs - 6.1.7.10 → 7.0.0.alpha1 - Mend

railties 6.1.7.10 → 7.0.0.alpha1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (152) hide show

data/lib/rails/generators/rails/app/app_generator.rb CHANGED Viewed

@@ -73,13 +73,12 @@ module Rails
     def version_control
       if !options[:skip_git] && !options[:pretend]
         run "git init", capture: options[:quiet], abort_on_failure: false
+        if user_default_branch.strip.empty?
+          `git symbolic-ref HEAD refs/heads/main`
+        end
       end
     end
-    def package_json
-      template "package.json"
-    end
     def app
       directory "app"
@@ -94,58 +93,42 @@ module Rails
         "#{shebang}\n" + content
       end
       chmod "bin", 0755 & ~File.umask, verbose: false
-      remove_file "bin/spring" unless spring_install?
-      remove_file "bin/yarn" if options[:skip_javascript]
     end
     def bin_when_updating
       bin
     end
-    def yarn_when_updating
-      template "bin/yarn", force: true do |content|
-        "#{shebang}\n" + content
-      end
-      chmod "bin", 0755 & ~File.umask, verbose: false
-    end
     def config
       empty_directory "config"
       inside "config" do
-        template "routes.rb"
+        template "routes.rb" unless options[:updating]
         template "application.rb"
         template "environment.rb"
-        template "cable.yml" unless options[:skip_action_cable]
-        template "puma.rb"   unless options[:skip_puma]
-        template "spring.rb" if spring_install?
-        template "storage.yml" unless skip_active_storage?
+        template "cable.yml" unless options[:updating] || options[:skip_action_cable]
+        template "puma.rb"   unless options[:updating]
+        template "storage.yml" unless options[:updating] || skip_active_storage?
         directory "environments"
         directory "initializers"
-        directory "locales"
+        directory "locales" unless options[:updating]
       end
     end
     def config_when_updating
-      cookie_serializer_config_exist = File.exist?("config/initializers/cookies_serializer.rb")
-      action_cable_config_exist      = File.exist?("config/cable.yml")
-      active_storage_config_exist    = File.exist?("config/storage.yml")
-      rack_cors_config_exist         = File.exist?("config/initializers/cors.rb")
-      assets_config_exist            = File.exist?("config/initializers/assets.rb")
-      csp_config_exist               = File.exist?("config/initializers/content_security_policy.rb")
+      action_cable_config_exist       = File.exist?("config/cable.yml")
+      active_storage_config_exist     = File.exist?("config/storage.yml")
+      rack_cors_config_exist          = File.exist?("config/initializers/cors.rb")
+      assets_config_exist             = File.exist?("config/initializers/assets.rb")
+      asset_manifest_exist            = File.exist?("app/assets/config/manifest.js")
+      asset_app_stylesheet_exist      = File.exist?("app/assets/stylesheets/application.css")
+      csp_config_exist                = File.exist?("config/initializers/content_security_policy.rb")
       permissions_policy_config_exist = File.exist?("config/initializers/permissions_policy.rb")
       @config_target_version = Rails.application.config.loaded_config_version || "5.0"
       config
-      configru
-      unless cookie_serializer_config_exist
-        gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal"
-      end
       if !options[:skip_action_cable] && !action_cable_config_exist
         template "config/cable.yml"
@@ -159,15 +142,19 @@ module Rails
         remove_file "config/initializers/assets.rb"
       end
+      if options[:skip_sprockets] && !asset_manifest_exist
+        remove_file "app/assets/config/manifest.js"
+      end
+      if options[:skip_sprockets] && !asset_app_stylesheet_exist
+        remove_file "app/assets/stylesheets/application.css"
+      end
       unless rack_cors_config_exist
         remove_file "config/initializers/cors.rb"
       end
       if options[:api]
-        unless cookie_serializer_config_exist
-          remove_file "config/initializers/cookies_serializer.rb"
-        end
         unless csp_config_exist
           remove_file "config/initializers/content_security_policy.rb"
         end
@@ -253,6 +240,11 @@ module Rails
     def config_target_version
       defined?(@config_target_version) ? @config_target_version : Rails::VERSION::STRING.to_f
     end
+    private
+      def user_default_branch
+        @user_default_branch ||= `git config init.defaultbranch`
+      end
   end
   module Generators
@@ -263,28 +255,15 @@ module Rails
     class AppGenerator < AppBase
       # :stopdoc:
-      WEBPACKS = %w( react vue angular elm stimulus )
       add_shared_options_for "application"
       # Add rails command options
-      class_option :version, type: :boolean, aliases: "-v", group: :rails,
-                             desc: "Show Rails version number and quit"
-      class_option :api, type: :boolean,
-                         desc: "Preconfigure smaller stack for API only apps"
-      class_option :minimal, type: :boolean,
-                             desc: "Preconfigure a minimal rails app"
-      class_option :skip_bundle, type: :boolean, aliases: "-B", default: false,
-                                 desc: "Don't run bundle install"
-      class_option :webpack, type: :string, aliases: "--webpacker", default: nil,
-                             desc: "Preconfigure Webpack with a particular framework (options: #{WEBPACKS.join(", ")})"
-      class_option :skip_webpack_install, type: :boolean, default: false,
-                                          desc: "Don't run Webpack install"
+      class_option :version, type: :boolean, aliases: "-v", group: :rails, desc: "Show Rails version number and quit"
+      class_option :api, type: :boolean, desc: "Preconfigure smaller stack for API only apps"
+      class_option :minimal, type: :boolean, desc: "Preconfigure a minimal rails app"
+      class_option :javascript, type: :string, aliases: "-j", default: "importmap", desc: "Choose JavaScript approach [options: importmap (default), webpack, esbuild, rollup]"
+      class_option :css, type: :string, desc: "Choose CSS processor [options: tailwind, postcss, sass]"
+      class_option :skip_bundle, type: :boolean, aliases: "-B", default: false, desc: "Don't run bundle install"
       def initialize(*args)
         super
@@ -293,7 +272,7 @@ module Rails
           raise Error, "Invalid value for --database option. Supported preconfigurations are: #{DATABASES.join(", ")}."
         end
-        # Force sprockets and yarn to be skipped when generating API only apps.
+        # Force sprockets and JavaScript to be skipped when generating API only apps.
         # Can't modify options hash as it's frozen by default.
         if options[:api]
           self.options = options.merge(skip_sprockets: true, skip_javascript: true).freeze
@@ -311,15 +290,8 @@ module Rails
             skip_dev_gems: true,
             skip_javascript: true,
             skip_jbuilder: true,
-            skip_spring: true,
             skip_system_test: true,
-            skip_webpack_install: true,
-            skip_turbolinks: true).tap do |option|
-              if option[:webpack]
-                option[:skip_webpack_install] = false
-                option[:skip_javascript] = false
-              end
-            end.freeze
+            skip_hotwire: true).freeze
         end
         @after_bundle_callbacks = []
@@ -339,9 +311,8 @@ module Rails
           build(:gitattributes)
         end
-        build(:gemfile) unless options[:skip_gemfile]
+        build(:gemfile)
         build(:version_control)
-        build(:package_json) unless options[:skip_javascript]
       end
       def create_app_files
@@ -357,11 +328,6 @@ module Rails
       end
       remove_task :update_bin_files
-      def update_bin_yarn
-        build(:yarn_when_updating)
-      end
-      remove_task :update_bin_yarn
       def update_active_storage
         unless skip_active_storage?
           rails_command "active_storage:update", inline: true
@@ -473,22 +439,11 @@ module Rails
         end
       end
-      def delete_js_folder_skipping_javascript
-        if options[:skip_javascript] && !options[:minimal]
-          remove_dir "app/javascript"
-        end
-      end
-      def delete_js_packs_when_minimal_skipping_webpack
-        if options[:minimal] && options[:skip_webpack_install]
-          remove_dir "app/javascript/packs"
-          keep_file  "app/javascript"
-        end
-      end
       def delete_assets_initializer_skipping_sprockets
         if options[:skip_sprockets]
           remove_file "config/initializers/assets.rb"
+          remove_file "app/assets/config/manifest.js"
+          remove_file "app/assets/stylesheets/application.css"
         end
       end
@@ -523,7 +478,6 @@ module Rails
       def delete_non_api_initializers_if_api_option
         if options[:api]
-          remove_file "config/initializers/cookies_serializer.rb"
           remove_file "config/initializers/content_security_policy.rb"
           remove_file "config/initializers/permissions_policy.rb"
         end
@@ -537,7 +491,7 @@ module Rails
       def delete_new_framework_defaults
         unless options[:update]
-          remove_file "config/initializers/new_framework_defaults_6_1.rb"
+          remove_file "config/initializers/new_framework_defaults_7_0.rb"
         end
       end
@@ -547,7 +501,9 @@ module Rails
       public_task :apply_rails_template, :run_bundle
       public_task :generate_bundler_binstub
-      public_task :run_webpack
+      public_task :run_javascript
+      public_task :run_hotwire
+      public_task :run_css
       def run_after_bundle_callbacks
         @after_bundle_callbacks.each(&:call)
@@ -565,7 +521,7 @@ module Rails
         create_file(*args, &block)
       end
-      # Registers a callback to be executed after bundle and spring binstubs
+      # Registers a callback to be executed after bundle binstubs
       # have run.
       #
       #   after_bundle do

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

@@ -1,78 +1,67 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby <%= "'#{RUBY_VERSION}'" -%>
-<% unless gemfile_entries.first&.comment -%>
-<% end -%>
+ruby <%= "\"#{RUBY_VERSION}\"" -%>
 <% gemfile_entries.each do |gem| -%>
-<% if gem.comment -%>
+<% if gem.comment %>
 # <%= gem.comment %>
 <% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
-<% if gem.options.any? -%>
-, <%= gem.options.map { |k,v|
-  "#{k}: #{v.inspect.gsub('"', '\'')}" }.join(', ') %>
-<% end -%>
-<% end -%>
-# Use Active Model has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-<% unless skip_active_storage? -%>
+<%= gem.commented_out ? "# " : "" %>gem "<%= gem.name %>"<%= %(, "#{gem.version}") if gem.version -%>
+<% if gem.options.any? -%>, <%= gem.options.map { |k,v| "#{k}: #{v.inspect}" }.join(", ") %><% end -%>
+<% end %>
-# Use Active Storage variant
-# gem 'image_processing', '~> 1.2'
-<% end -%>
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 <% if depend_on_bootsnap? -%>
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.4.4', require: false
+gem "bootsnap", ">= 1.4.4", require: false
 <%- end -%>
+# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+# gem "bcrypt", "~> 3.1.7"
+<% unless options.skip_sprockets? || options.minimal? -%>
+# Use Sass to process CSS
+# gem "sassc-rails", "~> 2.1"
+<% end -%>
+<% unless skip_active_storage? -%>
+# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
+# gem "image_processing", "~> 1.2"
+<% end -%>
 <%- if options.api? -%>
-# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
-# gem 'rack-cors'
+# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
+# gem "rack-cors"
 <%- end -%>
-<% if RUBY_ENGINE == 'ruby' -%>
+<% if RUBY_ENGINE == "ruby" -%>
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  # Start debugger with binding.b [https://github.com/ruby/debug]
+  gem "debug", ">= 1.0.0", platforms: %i[ mri mingw x64_mingw ]
 end
 <% end -%>
 group :development do
 <%- unless options.api? || options.skip_dev_gems? -%>
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  <%- if options.dev? || options.edge? || options.master? -%>
-  gem 'web-console', github: 'rails/web-console'
-  <%- else -%>
-  gem 'web-console', '>= 4.1.0'
-  <%- end -%>
-  # Display performance information such as SQL time and flame graphs for each request in your browser.
-  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  gem 'rack-mini-profiler', '~> 2.0'
+  # Use console on exceptions pages [https://github.com/rails/web-console]
+  gem "web-console", ">= 4.1.0"
+  # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
+  # gem "rack-mini-profiler", ">= 2.3.3"
 <%- end -%>
-<% if depend_on_listen? -%>
-  gem 'listen', '~> 3.3'
-<% end -%>
-<% if spring_install? -%>
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-<% end -%>
+  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
+  # gem "spring"
 end
 <%- if depends_on_system_test? -%>
 group :test do
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 3.26'
-  gem 'selenium-webdriver', '>= 4.0.0.rc1'
-  # Easy installation and use of web drivers to run system tests with browsers
-  gem 'webdrivers'
+  # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
+  gem "capybara", ">= 3.26"
+  gem "selenium-webdriver"
+  gem "webdrivers"
 end
-<%- end -%>
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+<%- end -%>

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

@@ -2,20 +2,13 @@
 <html>
   <head>
     <title><%= camelized %></title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
     <%%= 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/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,7 +1,7 @@
 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 ==")
@@ -12,28 +12,23 @@ 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? -%>
-  # Install JavaScript dependencies
-  system! 'bin/yarn'
-<% end -%>
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 <% 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/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
@@ -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

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

@@ -12,7 +12,7 @@
 #       Install PostgreSQL and put its /bin directory on your path.
 #
 # Configure Using Gemfile
-# gem 'pg'
+# gem "pg"
 #
 default: &default
   adapter: postgresql
@@ -74,7 +74,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 +83,4 @@ production:
   <<: *default
   database: <%= app_name %>_production
   username: <%= app_name %>
-  password: <%%= ENV['<%= app_name.upcase %>_DATABASE_PASSWORD'] %>
+  password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>