railties 6.0.0 → 7.1.3.2

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,18 @@ module Rails
           directory "app"
           empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
         end
+
+        empty_directory_with_keep_file "app/models/concerns"
+        empty_directory_with_keep_file "app/controllers/concerns"
+        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/models/concerns"
+        empty_directory_with_keep_file "app/controllers/concerns"
+        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}"
@@ -46,7 +55,7 @@ module Rails
     end
 
     def license
-      template "MIT-LICENSE"
+      template "MIT-LICENSE" unless inside_application?
     end
 
     def gemspec
@@ -57,6 +66,12 @@ module Rails
       template "gitignore", ".gitignore"
     end
 
+    def version_control
+      if !options[:skip_git] && !options[:pretend]
+        run git_init_command, capture: options[:quiet], abort_on_failure: false
+      end
+    end
+
     def lib
       template "lib/%namespaced_name%.rb"
       template "lib/tasks/%namespaced_name%_tasks.rake"
@@ -76,29 +91,30 @@ module Rails
     def test
       template "test/test_helper.rb"
       template "test/%namespaced_name%_test.rb"
-      append_file "Rakefile", <<-EOF
 
-#{rakefile_test_tasks}
-task default: :test
-      EOF
       if engine?
+        empty_directory_with_keep_file "test/fixtures/files"
+        empty_directory_with_keep_file "test/controllers"
+        empty_directory_with_keep_file "test/mailers"
+        empty_directory_with_keep_file "test/models"
+        empty_directory_with_keep_file "test/integration"
+
+        unless api?
+          empty_directory_with_keep_file "test/helpers"
+        end
+
         template "test/integration/navigation_test.rb"
       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_listen] = true
       opts[:skip_git] = true
-      opts[:skip_turbolinks] = true
-      opts[:skip_webpack_install] = true
+      opts[:skip_hotwire] = true
       opts[:dummy_app] = true
 
       invoke Rails::Generators::AppGenerator,
@@ -107,20 +123,27 @@ 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
+
       if mountable?
         template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       end
+      if engine? && !api?
+        insert_into_file "#{dummy_path}/config/application.rb", indent(<<~RUBY, 4), after: /^\s*config\.load_defaults.*\n/
+
+          # For compatibility with applications that use this config
+          config.action_controller.include_all_helpers = false
+        RUBY
+      end
     end
 
-    def test_dummy_assets
-      template "rails/javascripts.js",    "#{dummy_path}/app/javascript/packs/application.js", force: true
+    def test_dummy_sprocket_assets
       template "rails/stylesheets.css",   "#{dummy_path}/app/assets/stylesheets/application.css", force: true
       template "rails/dummy_manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
     end
 
     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 +199,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"
@@ -191,18 +214,29 @@ task default: :test
       def initialize(*args)
         @dummy_path = nil
         super
+        imply_options
+
+        if !engine? || !with_dummy_app?
+          self.options = options.merge(skip_asset_pipeline: true).freeze
+        end
       end
 
+      public_task :report_implied_options
       public_task :set_default_accessors!
       public_task :create_root
 
+      def target_rails_prerelease
+        super("plugin new")
+      end
+
       def create_root_files
         build(:readme)
         build(:rakefile)
         build(:gemspec)   unless options[:skip_gemspec]
         build(:license)
         build(:gitignore) unless options[:skip_git]
-        build(:gemfile)   unless options[:skip_gemfile]
+        build(:gemfile)
+        build(:version_control)
       end
 
       def create_app_files
@@ -269,6 +303,33 @@ task default: :test
       end
 
     private
+      def gemfile_entries
+        [
+          rails_gemfile_entry,
+          simplify_gemfile_entries(
+            web_server_gemfile_entry,
+            database_gemfile_entry,
+            asset_pipeline_gemfile_entry,
+          ),
+        ].flatten.compact
+      end
+
+      def rails_gemfile_entry
+        if options[:skip_gemspec]
+          super
+        elsif rails_prerelease?
+          super.dup.tap do |entry|
+            entry.comment = <<~COMMENT
+              Your gem is dependent on a prerelease version of Rails. Once you can lock this
+              dependency down to a specific version, move it to your gemspec.
+            COMMENT
+          end
+        end
+      end
+
+      def simplify_gemfile_entries(*gemfile_entries)
+        gemfile_entries.flatten.compact.map { |entry| GemfileEntry.floats(entry.name) }
+      end
 
       def create_dummy_app(path = nil)
         dummy_path(path) if path
@@ -276,9 +337,8 @@ 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_sprocket_assets) unless skip_sprockets?
           build(:test_dummy_clean)
           # ensure that bin/rails has proper dummy_path
           build(:bin, true)
@@ -360,6 +420,10 @@ task default: :test
         end
       end
 
+      def rails_version_specifier(gem_version = Rails.gem_version)
+        [">= #{gem_version}"]
+      end
+
       def valid_const?
         if /-\d/.match?(original_name)
           raise Error, "Invalid plugin name #{original_name}. Please give a name which does not contain a namespace starting with numeric characters."
@@ -376,34 +440,10 @@ 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'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-        RUBY
-      end
-
       def dummy_path(path = nil)
         @dummy_path = path if path
         @dummy_path || options[:dummy_path]
@@ -423,7 +463,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,33 +1,28 @@
-$:.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 %>."
+  <%- unless inside_application? -%>
   spec.license     = "MIT"
+  <%- end -%>
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # 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.chdir(File.expand_path(__dir__)) do
+    Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  end
 
-  spec.add_development_dependency "<%= gem_for_database[0] %>"
-<% end -%>
+  <%= "# " if rails_prerelease? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
 end

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

@@ -1,48 +1,19 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+<% unless options[:skip_gemspec] -%>
 
-<% if options[:skip_gemspec] -%>
-<%= '# ' if options.dev? || options.edge? -%>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 -%>
-
-<% 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.
+<% gemfile_entries.each do |gemfile_entry| %>
+<%= gemfile_entry %>
 <% end -%>
+<% if RUBY_ENGINE == "ruby" -%>
 
-<% if options.dev? || options.edge? -%>
-# Your gem is dependent on dev or edge Rails. Once you can lock this
-# dependency down to a specific version, move it to your gemspec.
-<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
-<% gemfile_entries.each do |gem| -%>
-<% 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}" }.join(', ') %>
-<% end -%>
-<% end -%>
-
-<% end -%>
-<% if RUBY_ENGINE == 'ruby' -%>
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
+# Start debugger with binding.b [https://github.com/ruby/debug]
+# gem "debug", ">= 1.0.0"
 <% end -%>
-<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
+<% if RUBY_PLATFORM.match?(/mingw|mswin|java/) -%>
 
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data", platforms: %i[ <%= bundler_windows_platforms %> jruby ]
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/MIT-LICENSE.tt

@@ -1,4 +1,4 @@
-Copyright <%= Date.today.year %> <%= author %>
+Copyright <%= author %>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/rails/generators/rails/plugin/templates/README.md.tt

@@ -8,7 +8,7 @@ How to use my plugin.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem '<%= name %>'
+gem "<%= name %>"
 ```
 
 And then execute:

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/app/mailers/%namespaced_name%/application_mailer.rb.tt

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt

@@ -6,9 +6,6 @@
   <%%= csp_meta_tag %>
 
   <%%= stylesheet_link_tag    "<%= namespaced_name %>/application", media: "all" %>
-  <%- unless options[:skip_javascript] -%>
-  <%%= javascript_include_tag "<%= namespaced_name %>/application" %>
-  <%- end -%>
 </head>
 <body>
 

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

@@ -1,30 +1,15 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/<%= namespaced_name -%>/engine', __dir__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/<%= namespaced_name -%>/engine", __dir__)
 <% if with_dummy_app? -%>
-APP_PATH = File.expand_path('../<%= dummy_path -%>/config/application', __dir__)
+APP_PATH = File.expand_path("../<%= dummy_path -%>/config/application", __dir__)
 <% end -%>
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
-<% if include_all_railties? -%>
-require 'rails/all'
-<% else -%>
-require "rails"
-# Pick the frameworks you want:
-require "active_model/railtie"
-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"
-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 -%>
-require 'rails/engine/commands'
+<%= rails_require_statement %>
+require "rails/engine/commands"

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

@@ -1,18 +1,14 @@
-.bundle/
-log/*.log
-pkg/
+/.bundle/
+/doc/
+/log/*.log
+/pkg/
+/tmp/
 <% if with_dummy_app? -%>
 <% if sqlite3? -%>
-<%= dummy_path %>/db/*.sqlite3
-<%= dummy_path %>/db/*.sqlite3-journal
+/<%= dummy_path %>/db/*.sqlite3
+/<%= dummy_path %>/db/*.sqlite3-*
 <% end -%>
-<%= dummy_path %>/log/*.log
-<% unless options[:skip_javascript] -%>
-<%= dummy_path %>/node_modules/
-<%= dummy_path %>/yarn-error.log
-<% end -%>
-<% unless skip_active_storage? -%>
-<%= dummy_path %>/storage/
-<% end -%>
-<%= dummy_path %>/tmp/
+/<%= dummy_path %>/log/*.log
+/<%= dummy_path %>/storage/
+/<%= dummy_path %>/tmp/
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb.tt

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class Engine < ::Rails::Engine
-  #{mountable? ? '  isolate_namespace ' + camelized_modules : ' '}
-  #{api? ? "  config.generators.api_only = true" : ' '}
+  #{mountable? ? "  isolate_namespace " + camelized_modules : " "}
+  #{api? ? "  config.generators.api_only = true" : " "}
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb.tt

@@ -1 +1 @@
-<%= wrap_in_modules "VERSION = '0.1.0'" %>
+<%= wrap_in_modules 'VERSION = "0.1.0"' %>

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

@@ -1,3 +1,4 @@
+require "<%= namespaced_name %>/version"
 <% if engine? -%>
 require "<%= namespaced_name %>/engine"
 <% else -%>

data/lib/rails/generators/rails/plugin/templates/rails/boot.rb.tt

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/lib/rails/generators/rails/plugin/templates/test/%namespaced_name%_test.rb.tt

@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"
 
-class <%= camelized_modules %>::Test < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, <%= camelized_modules %>
+class <%= camelized_modules %>Test < ActiveSupport::TestCase
+  test "it has a version number" do
+    assert <%= camelized_modules %>::VERSION
   end
 end

data/lib/rails/generators/rails/plugin/templates/test/integration/navigation_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class NavigationTest < ActionDispatch::IntegrationTest
   # test "the truth" do

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

@@ -1,29 +1,21 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require_relative "<%= File.join('..', options[:dummy_path], 'config/environment') -%>"
+require_relative "<%= File.join("..", options[:dummy_path], "config/environment") -%>"
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__)]
 <% if options[:mountable] -%>
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
+ActiveRecord::Migrator.migrations_paths << File.expand_path("../db/migrate", __dir__)
 <% end -%>
 <% end -%>
 require "rails/test_help"
 
-# Filter out the backtrace from minitest while preserving the one from other libraries.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
-
-<% unless engine? -%>
-require "rails/test_unit/reporter"
-Rails::TestUnitReporter.executable = 'bin/test'
-<% end -%>
-
 <% unless options[:skip_active_record] -%>
 # Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("fixtures", __dir__)
-  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-  ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
+if ActiveSupport::TestCase.respond_to?(:fixture_paths=)
+  ActiveSupport::TestCase.fixture_paths = [File.expand_path("fixtures", __dir__)]
+  ActionDispatch::IntegrationTest.fixture_paths = ActiveSupport::TestCase.fixture_paths
+  ActiveSupport::TestCase.file_fixture_path = File.expand_path("fixtures", __dir__) + "/files"
   ActiveSupport::TestCase.fixtures :all
 end
 <% end -%>

data/lib/rails/generators/rails/resource/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Stubs out a new resource including an empty model and controller suitable
+    Generates a new resource including an empty model and controller suitable
     for a RESTful, resource-oriented application. Pass the singular model name,
     either CamelCased or under_scored, as the first argument, and an optional
     list of attribute pairs.
@@ -18,6 +18,6 @@ Description:
     views or add any methods to the generated controller.
 
 Examples:
-    `rails generate resource post` # no attributes
-    `rails generate resource post title:string body:text published:boolean`
-    `rails generate resource purchase order_id:integer amount:decimal`
+    `bin/rails generate resource post` # no attributes
+    `bin/rails generate resource post title:string body:text published:boolean`
+    `bin/rails generate resource purchase order_id:integer amount:decimal`

data/lib/rails/generators/rails/resource/resource_generator.rb

@@ -16,6 +16,12 @@ module Rails
                              desc: "Actions for the resource controller"
 
       hook_for :resource_route, required: true
+
+      class << self
+        def desc(description = nil)
+          ERB.new(File.read(usage_path)).result(binding)
+        end
+      end
     end
   end
 end