railties 7.0.0.rc2 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b284070001b693990d6b81e724e3c743a63a3cb3b2b92facb47102b72872560
-  data.tar.gz: cb69eb78c8c0373ff652b727ef28ebefb2f25ef8f9ae1fdb0d5445378da49143
+  metadata.gz: 91236829ff0618a329d5e19ed00f9dd85fd6f68d44622dab451f126763faec2e
+  data.tar.gz: 9e7cac33fc86a0b6baf555fb4a002a31657b2d37455d9ef40efc425c042ce45e
 SHA512:
-  metadata.gz: af3ace6e641e5dd20232ccc7eb83e9104ed40c4d85ba4f62d2f0b8d5b96f9b1fee8a31379f41145cad1ffe5aef8acf34daef558104cf13b955555e70cac19b79
-  data.tar.gz: dee8812ce8c27baef9cb88a64c0709153096671a55d046567dd1b760ba942b1e205c3d3e8ac182b4b5628bcf2ea5448643282ac0cd080898d3b68def142dc643
+  metadata.gz: dc0ec824e43c9f015cd5e86d6f4754c8724ca4e61a8856b8421b9b7dbf943398dff56095bf9b646f282a423b41c71fa42f30a5d587d945b6b382c1fdd49aae31
+  data.tar.gz: 5725c5241ec2efd5c4a3d826df6b5548c373f6225dd144472167c08421b7350b34fca209661a174a580fb812ee85c365cdeb66b00b5747d7828a9bb85de0d584

data/CHANGELOG.md

@@ -1,5 +1,52 @@
+## Rails 7.0.2 (February 08, 2022) ##
+
+*   No changes.
+
+
+## Rails 7.0.1 (January 06, 2022) ##
+
+*   Prevent duplicate entries in plugin Gemfile.
+
+    *Jonathan Hefner*
+
+*   Fix asset pipeline errors for plugin dummy apps.
+
+    *Jonathan Hefner*
+
+*   Fix generated route revocation.
+
+    *Jonathan Hefner*
+
+*   Addresses an issue in which Sidekiq jobs could not reload certain
+    namespaces.
+
+    See [fxn/zeitwerk#198](https://github.com/fxn/zeitwerk/issues/198) for
+    details.
+
+    *Xavier Noria*
+
+*   Fix plugin generator to a plugin that pass all the tests.
+
+    *Rafael Mendonça França*
+
+
+## Rails 7.0.0 (December 15, 2021) ##
+
+*   No changes.
+
+
+## Rails 7.0.0.rc3 (December 14, 2021) ##
+
+*   Allow localhost with a port by default in development
+
+    [Fixes: #43864]
+
 ## Rails 7.0.0.rc2 (December 14, 2021) ##
 
+*   No changes
+
+## Rails 7.0.0.rc1 (December 06, 2021) ##
+
 *   Remove deprecated `config` in `dbconsole`.
 
     *Rafael Mendonça França*

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2021 David Heinemeier Hansson
+Copyright (c) 2004-2022 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/rails/application/configuration.rb

@@ -33,8 +33,12 @@ module Rails
         @filter_parameters                       = []
         @filter_redirect                         = []
         @helpers_paths                           = []
-        @hosts                                   = Array(([".localhost", IPAddr.new("0.0.0.0/0"), IPAddr.new("::/0")] if Rails.env.development?))
-        @hosts.concat(ENV["RAILS_DEVELOPMENT_HOSTS"].to_s.split(",").map(&:strip)) if Rails.env.development?
+        if Rails.env.development?
+          @hosts = ActionDispatch::HostAuthorization::ALLOWED_HOSTS_IN_DEVELOPMENT +
+            ENV["RAILS_DEVELOPMENT_HOSTS"].to_s.split(",").map(&:strip)
+        else
+          @hosts = []
+        end
         @host_authorization                      = {}
         @public_file_server                      = ActiveSupport::OrderedOptions.new
         @public_file_server.enabled              = true
@@ -77,13 +81,17 @@ module Rails
         @server_timing                           = false
       end
 
-      # Loads default configurations. See {the result of the method for each version}[https://guides.rubyonrails.org/configuring.html#results-of-config-load-defaults].
+      # Loads default configuration values for a target version. This includes
+      # defaults for versions prior to the target version. See the
+      # {configuration guide}[https://guides.rubyonrails.org/configuring.html]
+      # for the default values associated with a particular version.
       def load_defaults(target_version)
         case target_version.to_s
         when "5.0"
           if respond_to?(:action_controller)
             action_controller.per_form_csrf_tokens = true
             action_controller.forgery_protection_origin_check = true
+            action_controller.urlsafe_csrf_tokens = false
           end
 
           ActiveSupport.to_time_preserves_timezone = true
@@ -169,7 +177,7 @@ module Rails
           end
 
           if respond_to?(:action_controller)
-            action_controller.urlsafe_csrf_tokens = true
+            action_controller.delete(:urlsafe_csrf_tokens)
           end
 
           if respond_to?(:action_view)
@@ -236,6 +244,7 @@ module Rails
               " -frames:v 1 -f image2"
 
             active_storage.variant_processor = :vips
+            active_storage.multiple_file_field_include_hidden = true
           end
 
           if respond_to?(:active_record)

data/lib/rails/application/finisher.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/array/conversions"
 require "active_support/descendants_tracker"

data/lib/rails/application.rb

@@ -10,6 +10,7 @@ require "active_support/hash_with_indifferent_access"
 require "active_support/configuration_file"
 require "rails/engine"
 require "rails/secrets"
+require "rails/autoloaders"
 
 module Rails
   # An Engine with the responsibility of coordinating the whole boot process.
@@ -95,7 +96,7 @@ module Rails
 
     attr_accessor :assets, :sandbox
     alias_method :sandbox?, :sandbox
-    attr_reader :reloaders, :reloader, :executor
+    attr_reader :reloaders, :reloader, :executor, :autoloaders
 
     delegate :default_url_options, :default_url_options=, to: :routes
 
@@ -117,6 +118,8 @@ module Rails
       @reloader          = Class.new(ActiveSupport::Reloader)
       @reloader.executor = @executor
 
+      @autoloaders = Rails::Autoloaders.new
+
       # are these actually used?
       @initial_variable_values = initial_variable_values
       @block = block

data/lib/rails/autoloaders/inflector.rb

@@ -3,7 +3,7 @@
 require "active_support/inflector"
 
 module Rails
-  module Autoloaders
+  class Autoloaders
     module Inflector # :nodoc:
       # Concurrent::Map is not needed. This is a private class, and overrides
       # must be defined while the application boots.

data/lib/rails/autoloaders.rb

@@ -1,44 +1,48 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
-
 module Rails
-  module Autoloaders # :nodoc:
+  class Autoloaders # :nodoc:
     require_relative "autoloaders/inflector"
 
-    class << self
-      include Enumerable
-
-      def main
-        @main ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.main"
-          loader.inflector = Inflector
-        end
-      end
-
-      def once
-        @once ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.once"
-          loader.inflector = Inflector
-        end
-      end
-
-      def each
-        yield main
-        yield once
-      end
-
-      def logger=(logger)
-        each { |loader| loader.logger = logger }
-      end
-
-      def log!
-        each(&:log!)
-      end
-
-      def zeitwerk_enabled?
-        true
-      end
+    include Enumerable
+
+    attr_reader :main, :once
+
+    def initialize
+      # This `require` delays loading the library on purpose.
+      #
+      # In Rails 7.0.0, railties/lib/rails.rb loaded Zeitwerk as a side-effect,
+      # but a couple of edge cases related to Bundler and Bootsnap showed up.
+      # They had to do with order of decoration of `Kernel#require`, something
+      # the three of them do.
+      #
+      # Delaying this `require` up to this point is a convenient trade-off.
+      require "zeitwerk"
+
+      @main = Zeitwerk::Loader.new
+      @main.tag = "rails.main"
+      @main.inflector = Inflector
+
+      @once = Zeitwerk::Loader.new
+      @once.tag = "rails.once"
+      @once.inflector = Inflector
+    end
+
+    def each
+      yield main
+      yield once
+    end
+
+    def logger=(logger)
+      each { |loader| loader.logger = logger }
+    end
+
+    def log!
+      each(&:log!)
+    end
+
+    def zeitwerk_enabled?
+      true
     end
   end
 end

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -97,15 +97,18 @@ module Rails
     def db_config
       return @db_config if defined?(@db_config)
 
-      # We need to check whether the user passed the database the
-      # first time around to show a consistent error message to people
-      # relying on 2-level database configuration.
-
-      @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
+      # If the user provided a database, use that. Otherwise find
+      # the first config in the database.yml
+      if database
+        @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
+      else
+        @db_config = configurations.find_db_config(environment)
+      end
 
       unless @db_config
+        missing_db = database ? "'#{database}' database is not" : "No databases are"
         raise ActiveRecord::AdapterNotSpecified,
-          "'#{database}' database is not configured for '#{environment}'. Available configuration: #{configurations.inspect}"
+          "#{missing_db} configured for '#{environment}'. Available configuration: #{configurations.inspect}"
       end
 
       @db_config
@@ -116,7 +119,7 @@ module Rails
     end
 
     def database
-      @options.fetch(:database, "primary")
+      @options[:database]
     end
 
     private

data/lib/rails/gem_version.rb

@@ -9,8 +9,8 @@ module Rails
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 0
-    PRE   = "rc2"
+    TINY  = 2
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -279,26 +279,32 @@ module Rails
       #   route "root 'welcome#index'"
       #   route "root 'admin#index'", namespace: :admin
       def route(routing_code, namespace: nil)
-        routing_code = Array(namespace).reverse.reduce(routing_code) do |code, ns|
-          "namespace :#{ns} do\n#{optimize_indentation(code, 2)}end"
+        namespace = Array(namespace)
+        namespace_pattern = route_namespace_pattern(namespace)
+        routing_code = namespace.reverse.reduce(routing_code) do |code, name|
+          "namespace :#{name} do\n#{rebase_indentation(code, 2)}end"
         end
 
         log :route, routing_code
 
-        after_pattern = Array(namespace).each_with_index.reverse_each.reduce(nil) do |pattern, (ns, i)|
-          margin = "\\#{i + 1}[ ]{2}"
-          "(?:(?:^[ ]*\n|^#{margin}.*\n)*?^(#{margin})namespace :#{ns} do\n#{pattern})?"
-        end.then do |pattern|
-          /^([ ]*).+\.routes\.draw do[ ]*\n#{pattern}/
-        end
-
         in_root do
-          if existing = match_file("config/routes.rb", after_pattern)
-            base_indent, *, prev_indent = existing.captures.compact.map(&:length)
-            routing_code = optimize_indentation(routing_code, base_indent + 2).lines.grep_v(/^[ ]{,#{prev_indent}}\S/).join
+          if namespace_match = match_file("config/routes.rb", namespace_pattern)
+            base_indent, *, existing_block_indent = namespace_match.captures.compact.map(&:length)
+            existing_line_pattern = /^[ ]{,#{existing_block_indent}}\S.+\n?/
+            routing_code = rebase_indentation(routing_code, base_indent + 2).gsub(existing_line_pattern, "")
+            namespace_pattern = /#{Regexp.escape namespace_match.to_s}/
           end
 
-          inject_into_file "config/routes.rb", routing_code, after: after_pattern, verbose: false, force: false
+          inject_into_file "config/routes.rb", routing_code, after: namespace_pattern, verbose: false, force: false
+
+          if behavior == :revoke && namespace.any? && namespace_match
+            empty_block_pattern = /(#{namespace_pattern})((?:\s*end\n){1,#{namespace.size}})/
+            gsub_file "config/routes.rb", empty_block_pattern, verbose: false, force: true do |matched|
+              beginning, ending = empty_block_pattern.match(matched).captures
+              ending.sub!(/\A\s*end\n/, "") while !ending.empty? && beginning.sub!(/^[ ]*namespace .+ do\n\s*\z/, "")
+              beginning + ending
+            end
+          end
         end
       end
 
@@ -363,6 +369,7 @@ module Rails
           return "#{value}\n" unless value.is_a?(String)
           "#{value.strip_heredoc.indent(amount).chomp}\n"
         end
+        alias rebase_indentation optimize_indentation
 
         # Indent the +Gemfile+ to the depth of @indentation
         def indentation # :doc:
@@ -387,6 +394,16 @@ module Rails
         def match_file(path, pattern)
           File.read(path).match(pattern) if File.exist?(path)
         end
+
+        def route_namespace_pattern(namespace)
+          namespace.each_with_index.reverse_each.reduce(nil) do |pattern, (name, i)|
+            cummulative_margin = "\\#{i + 1}[ ]{2}"
+            blank_or_indented_line = "^[ ]*\n|^#{cummulative_margin}.*\n"
+            "(?:(?:#{blank_or_indented_line})*?^(#{cummulative_margin})namespace :#{name} do\n#{pattern})?"
+          end.then do |pattern|
+            /^([ ]*).+\.routes\.draw do[ ]*\n#{pattern}/
+          end
+        end
     end
   end
 end

data/lib/rails/generators/app_base.rb

@@ -100,23 +100,26 @@ module Rails
                                            desc: "Show this help message and quit"
       end
 
-      def initialize(*)
+      def initialize(positional_argv, option_argv, *)
+        @argv = [*positional_argv, *option_argv]
         @gem_filter = lambda { |gem| true }
         super
       end
 
     private
       def gemfile_entries # :doc:
-        [rails_gemfile_entry,
-         asset_pipeline_gemfile_entry,
-         database_gemfile_entry,
-         web_server_gemfile_entry,
-         javascript_gemfile_entry,
-         hotwire_gemfile_entry,
-         css_gemfile_entry,
-         jbuilder_gemfile_entry,
-         psych_gemfile_entry,
-         cable_gemfile_entry].flatten.find_all(&@gem_filter)
+        [
+          rails_gemfile_entry,
+          asset_pipeline_gemfile_entry,
+          database_gemfile_entry,
+          web_server_gemfile_entry,
+          javascript_gemfile_entry,
+          hotwire_gemfile_entry,
+          css_gemfile_entry,
+          jbuilder_gemfile_entry,
+          psych_gemfile_entry,
+          cable_gemfile_entry,
+        ].flatten.compact.select(&@gem_filter)
       end
 
       def builder # :doc:
@@ -158,7 +161,8 @@ module Rails
       end
 
       def database_gemfile_entry # :doc:
-        return [] if options[:skip_active_record]
+        return if options[:skip_active_record]
+
         gem_name, gem_version = gem_for_database
         GemfileEntry.version gem_name, gem_version,
           "Use #{options[:database]} as the database for Active Record"
@@ -169,15 +173,13 @@ module Rails
       end
 
       def asset_pipeline_gemfile_entry
-        return [] if options[:skip_asset_pipeline]
+        return if options[:skip_asset_pipeline]
 
         if options[:asset_pipeline] == "sprockets"
-          GemfileEntry.version "sprockets-rails", ">= 3.4.1",
+          GemfileEntry.floats "sprockets-rails",
             "The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]"
         elsif options[:asset_pipeline] == "propshaft"
-          GemfileEntry.version "propshaft", ">= 0.4.1", "The modern asset pipeline for Rails [https://github.com/rails/propshaft/]"
-        else
-          []
+          GemfileEntry.floats "propshaft", "The modern asset pipeline for Rails [https://github.com/rails/propshaft]"
         end
       end
 
@@ -255,39 +257,40 @@ module Rails
           new(name, version, comment)
         end
 
+        def self.floats(name, comment = nil)
+          new(name, nil, comment)
+        end
+
         def self.path(name, path, comment = nil)
           new(name, nil, comment, path: path)
         end
 
-        def version
-          version = super
-
-          if version.is_a?(Array)
-            version.join('", "')
-          else
-            version
-          end
+        def to_s
+          [
+            (comment.gsub(/^/, "# ").chomp + "\n" if comment),
+            ("# " if commented_out),
+            "gem \"#{name}\"",
+            *Array(version).map { |constraint| ", \"#{constraint}\"" },
+            *options.map { |key, value| ", #{key}: #{value.inspect}" },
+          ].compact.join
         end
       end
 
+      def rails_prerelease?
+        options.dev? || options.edge? || options.main?
+      end
+
       def rails_gemfile_entry
         if options.dev?
-          [
-            GemfileEntry.path("rails", Rails::Generators::RAILS_DEV_PATH, "Use local checkout of Rails")
-          ]
+          GemfileEntry.path("rails", Rails::Generators::RAILS_DEV_PATH, "Use local checkout of Rails")
         elsif options.edge?
           edge_branch = Rails.gem_version.prerelease? ? "main" : [*Rails.gem_version.segments.first(2), "stable"].join("-")
-          [
-            GemfileEntry.github("rails", "rails/rails", edge_branch, "Use specific branch of Rails")
-          ]
+          GemfileEntry.github("rails", "rails/rails", edge_branch, "Use specific branch of Rails")
         elsif options.main?
-          [
-            GemfileEntry.github("rails", "rails/rails", "main", "Use main development branch of Rails")
-          ]
+          GemfileEntry.github("rails", "rails/rails", "main", "Use main development branch of Rails")
         else
-          [GemfileEntry.version("rails",
-                            rails_version_specifier,
-                            %(Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"))]
+          GemfileEntry.version("rails", rails_version_specifier,
+            %(Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"))
         end
       end
 
@@ -305,29 +308,28 @@ module Rails
       end
 
       def jbuilder_gemfile_entry
-        return [] if options[:skip_jbuilder]
-        comment = "Build JSON APIs with ease [https://github.com/rails/jbuilder]"
-        GemfileEntry.new "jbuilder", "~> 2.11", comment, {}, options[:api]
+        return if options[:skip_jbuilder]
+        GemfileEntry.new "jbuilder", nil, "Build JSON APIs with ease [https://github.com/rails/jbuilder]", {}, options[:api]
       end
 
       def javascript_gemfile_entry
-        return [] if options[:skip_javascript]
+        return if options[:skip_javascript]
 
         if adjusted_javascript_option == "importmap"
-          GemfileEntry.version("importmap-rails", ">= 0.9.2", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]")
+          GemfileEntry.floats "importmap-rails", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]"
         else
-          GemfileEntry.version "jsbundling-rails", ">= 0.2.2", "Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]"
+          GemfileEntry.floats "jsbundling-rails", "Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]"
         end
       end
 
       def hotwire_gemfile_entry
-        return [] if options[:skip_javascript] || options[:skip_hotwire]
+        return if options[:skip_javascript] || options[:skip_hotwire]
 
         turbo_rails_entry =
-          GemfileEntry.version("turbo-rails", ">= 0.9.0", "Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]")
+          GemfileEntry.floats "turbo-rails", "Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]"
 
         stimulus_rails_entry =
-          GemfileEntry.version("stimulus-rails", ">= 0.7.3", "Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]")
+          GemfileEntry.floats "stimulus-rails", "Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]"
 
         [ turbo_rails_entry, stimulus_rails_entry ]
       end
@@ -347,17 +349,17 @@ module Rails
       end
 
       def css_gemfile_entry
-        return [] unless options[:css]
+        return unless options[:css]
 
         if !using_node? && options[:css] == "tailwind"
-          GemfileEntry.version("tailwindcss-rails", ">= 0.5.3", "Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]")
+          GemfileEntry.floats "tailwindcss-rails", "Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]"
         else
-          GemfileEntry.version("cssbundling-rails", ">= 0.2.7", "Bundle and process CSS [https://github.com/rails/cssbundling-rails]")
+          GemfileEntry.floats "cssbundling-rails", "Bundle and process CSS [https://github.com/rails/cssbundling-rails]"
         end
       end
 
       def psych_gemfile_entry
-        return [] unless defined?(Rubinius)
+        return unless defined?(Rubinius)
 
         comment = "Use Psych as the YAML engine, instead of Syck, so serialized " \
                   "data can be read safely from different rubies (see http://git.io/uuLVag)"
@@ -365,11 +367,10 @@ module Rails
       end
 
       def cable_gemfile_entry
-        return [] if options[:skip_action_cable]
+        return if options[:skip_action_cable]
+
         comment = "Use Redis adapter to run Action Cable in production"
-        gems = []
-        gems << GemfileEntry.new("redis", "~> 4.0", comment, {}, true)
-        gems
+        GemfileEntry.new("redis", "~> 4.0", comment, {}, true)
       end
 
       def bundle_command(command, env = {})
@@ -410,6 +411,28 @@ module Rails
         !options[:skip_bootsnap] && !options[:dev] && !defined?(JRUBY_VERSION)
       end
 
+      def target_rails_prerelease(self_command = "new")
+        return unless rails_prerelease? && bundle_install?
+
+        if !File.exist?(File.expand_path("Gemfile", destination_root))
+          create_file("Gemfile", <<~GEMFILE)
+            source "https://rubygems.org"
+            git_source(:github) { |repo| "https://github.com/\#{repo}.git" }
+            #{rails_gemfile_entry}
+          GEMFILE
+
+          run_bundle
+
+          @argv[0] = destination_root
+          require "shellwords"
+          bundle_command("exec rails #{self_command} #{Shellwords.join(@argv)}")
+          exit
+        else
+          remove_file("Gemfile")
+          remove_file("Gemfile.lock")
+        end
+      end
+
       def run_bundle
         bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end

data/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt

@@ -5,6 +5,6 @@
 <br>
 
 <div>
-  <%%= link_to "Show this <%= human_name.downcase %>", @<%= singular_table_name %> %> |
-  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path %>
+  <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %> %> |
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
 </div>

data/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt

@@ -3,7 +3,12 @@
 <h1><%= human_name.pluralize %></h1>
 
 <div id="<%= plural_table_name %>">
-  <%%= render @<%= plural_table_name %> %>
+  <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+    <%%= render <%= singular_table_name %> %>
+    <p>
+      <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %> %>
+    </p>
+  <%% end %>
 </div>
 
-<%%= link_to "New <%= human_name.downcase %>", new_<%= singular_route_name %>_path %>
+<%%= link_to "New <%= human_name.downcase %>", <%= new_helper(type: :path) %> %>

data/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt

@@ -5,5 +5,5 @@
 <br>
 
 <div>
-  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path %>
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
 </div>

data/lib/rails/generators/erb/scaffold/templates/partial.html.erb.tt

@@ -14,7 +14,4 @@
   </p>
 
 <% end -%>
-  <p>
-    <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_name %> %>
-  </p>
 </div>

data/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt

@@ -3,8 +3,8 @@
 <%%= render @<%= singular_table_name %> %>
 
 <div>
-  <%%= link_to "Edit this <%= human_name.downcase %>", edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
-  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path %>
+  <%%= link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %> %> |
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
 
-  <%%= button_to "Destroy this <%= human_name.downcase %>", <%= singular_table_name %>_path(@<%= singular_table_name %>), method: :delete %>
+  <%%= button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete %>
 </div>