railties 5.1.7 → 5.2.0.beta1

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

@@ -0,0 +1,24 @@
+$:.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "<%= namespaced_name %>/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "<%= name %>"
+  s.version     = <%= camelized_modules %>::VERSION
+  s.authors     = ["<%= author %>"]
+  s.email       = ["<%= email %>"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of <%= camelized_modules %>."
+  s.description = "TODO: Description of <%= camelized_modules %>."
+  s.license     = "MIT"
+
+  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
+<% unless options[:skip_active_record] -%>
+
+  s.add_development_dependency "<%= gem_for_database[0] %>"
+<% end -%>
+end

data/lib/rails/generators/rails/plugin/templates/{Gemfile → Gemfile.tt}

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 <% if options[:skip_gemspec] -%>
 <%= '# ' if options.dev? || options.edge? -%>gem 'rails', '<%= Array(rails_version_specifier).join("', '") %>'

data/lib/rails/generators/rails/plugin/templates/{README.md → README.md.tt}

@@ -25,4 +25,4 @@ $ gem install <%= name %>
 Contribution directions go here.
 
 ## License
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/rails/generators/rails/plugin/templates/{Rakefile → Rakefile.tt}

@@ -13,17 +13,16 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
 <% if engine? && !options[:skip_active_record] && with_dummy_app? -%>
-APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-<% end %>
 
+APP_RAKEFILE = File.expand_path("<%= dummy_path -%>/Rakefile", __dir__)
+load 'rails/tasks/engine.rake'
+<% end -%>
 <% if engine? -%>
-load 'rails/tasks/statistics.rake'
-<% end %>
 
+load 'rails/tasks/statistics.rake'
+<% end -%>
 <% unless options[:skip_gemspec] -%>
 
 require 'bundler/gem_tasks'
-<% end %>
+<% end -%>

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

@@ -1,13 +1,30 @@
 # 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('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/<%= namespaced_name -%>/engine', __FILE__)
-APP_PATH = File.expand_path('../../<%= dummy_path -%>/config/application', __FILE__)
+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__)
+<% end -%>
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+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"
+require "action_controller/railtie"
+<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
+require "action_view/railtie"
+require "active_storage/engine"
+<%= 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'

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

@@ -1,4 +1,4 @@
-$: << File.expand_path(File.expand_path("../../test", __FILE__))
+$: << File.expand_path("../test", __dir__)
 
 require "bundler/setup"
 require "rails/plugin/test"

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

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

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

@@ -1,5 +1,7 @@
 <% if engine? -%>
 require "<%= namespaced_name %>/engine"
-
+<% else -%>
+require "<%= namespaced_name %>/railtie"
 <% end -%>
+
 <%= wrap_in_modules "# Your code goes here..." %>

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

@@ -0,0 +1,5 @@
+<%= wrap_in_modules <<-rb.strip_heredoc
+  class Railtie < ::Rails::Railtie
+  end
+rb
+%>

data/lib/rails/generators/rails/plugin/templates/rails/{application.rb → application.rb.tt}

@@ -3,15 +3,18 @@ require_relative 'boot'
 <% 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"
-require "action_view/railtie"
 <%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
-require "active_job/railtie"
+require "action_view/railtie"
 <%= comment_if :skip_action_cable %>require "action_cable/engine"
-<%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <% end -%>
 
 Bundler.require(*Rails.groups)

data/lib/rails/generators/rails/plugin/templates/rails/{dummy_manifest.js → dummy_manifest.js.tt}

@@ -1,4 +1,3 @@
-
 <% unless api? -%>
 //= link_tree ../images
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/rails/{javascripts.js → javascripts.js.tt}

@@ -10,4 +10,7 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+<% unless skip_active_storage? -%>
+//= require activestorage
+<% end -%>
 //= require_tree .

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

@@ -5,4 +5,3 @@ class NavigationTest < ActionDispatch::IntegrationTest
   #   assert true
   # end
 end
-

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

@@ -1,10 +1,8 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__)
+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", __FILE__)]
+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', __FILE__)
+ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
 <% end -%>
 <% end -%>
 require "rails/test_help"
@@ -14,13 +12,16 @@ require "rails/test_help"
 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", __FILE__)
+  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"
   ActiveSupport::TestCase.fixtures :all
 end
+<% end -%>

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

@@ -1,6 +1,6 @@
 Description:
     Stubs out a new resource including an empty model and controller suitable
-    for a restful, resource-oriented application. Pass the singular model name,
+    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.
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/resource_helpers"
 require "rails/generators/rails/model/model_generator"
 

data/lib/rails/generators/rails/resource_route/resource_route_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class ResourceRouteGenerator < NamedBase # :nodoc:
@@ -15,37 +17,32 @@ module Rails
       def add_resource_route
         return if options[:actions].present?
 
-        # iterates over all namespaces and opens up blocks
-        regular_class_path.each_with_index do |namespace, index|
-          write("namespace :#{namespace} do", index + 1)
+        depth = 0
+        lines = []
+
+        # Create 'namespace' ladder
+        # namespace :foo do
+        #   namespace :bar do
+        regular_class_path.each do |ns|
+          lines << indent("namespace :#{ns} do\n", depth * 2)
+          depth += 1
         end
 
         # inserts the primary resource
-        write("resources :#{file_name.pluralize}", route_length + 1)
+        # Create route
+        #     resources 'products'
+        lines << indent(%{resources :#{file_name.pluralize}\n}, depth * 2)
 
-        # ends blocks
-        regular_class_path.each_index do |index|
-          write("end", route_length - index)
+        # Create `end` ladder
+        #   end
+        # end
+        until depth.zero?
+          depth -= 1
+          lines << indent("end\n", depth * 2)
         end
 
-        # route prepends two spaces onto the front of the string that is passed, this corrects that.
-        # Also it adds a \n to the end of each line, as route already adds that
-        # we need to correct that too.
-        route route_string[2..-2]
+        route lines.join
       end
-
-      private
-        def route_string
-          @route_string ||= ""
-        end
-
-        def write(str, indent)
-          route_string << "#{"  " * indent}#{str}\n"
-        end
-
-        def route_length
-          regular_class_path.length
-        end
     end
   end
 end

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/rails/resource/resource_generator"
 
 module Rails
@@ -16,13 +18,10 @@ module Rails
       def handle_skip
         @options = @options.merge(stylesheets: false) unless options[:assets]
         @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet]
-        @options = @options.merge(system_tests: false) if options[:api]
       end
 
       hook_for :scaffold_controller, required: true
 
-      hook_for :system_tests, as: :system
-
       hook_for :assets do |assets|
         invoke assets, [controller_name]
       end

data/lib/rails/generators/rails/scaffold_controller/USAGE

@@ -12,7 +12,7 @@ Description:
 Example:
     `rails generate scaffold_controller CreditCard`
 
-    Credit card controller with URLs like /credit_card/debit.
+    Credit card controller with URLs like /credit_cards.
         Controller: app/controllers/credit_cards_controller.rb
         Test:       test/controllers/credit_cards_controller_test.rb
         Views:      app/views/credit_cards/index.html.erb [...]

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/resource_helpers"
 
 module Rails

data/lib/rails/generators/rails/scaffold_controller/templates/{controller.rb → controller.rb.tt}

@@ -29,7 +29,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
     else
       render :new
     end
@@ -38,7 +38,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
     else
       render :edit
     end

data/lib/rails/generators/rails/system_test/system_test_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class SystemTestGenerator < NamedBase # :nodoc:

data/lib/rails/generators/rails/task/task_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class TaskGenerator < NamedBase # :nodoc:

data/lib/rails/generators/resource_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_model"
 require "rails/generators/model_helpers"
 

data/lib/rails/generators/test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 require "rails/generators/testing/behaviour"
 require "rails/generators/testing/setup_and_teardown"
@@ -14,7 +16,7 @@ module Rails
     #
     #   class AppGeneratorTest < Rails::Generators::TestCase
     #     tests AppGenerator
-    #     destination File.expand_path("../tmp", File.dirname(__FILE__))
+    #     destination File.expand_path("../tmp", __dir__)
     #   end
     #
     # If you want to ensure your destination root is clean before running each test,
@@ -22,7 +24,7 @@ module Rails
     #
     #   class AppGeneratorTest < Rails::Generators::TestCase
     #     tests AppGenerator
-    #     destination File.expand_path("../tmp", File.dirname(__FILE__))
+    #     destination File.expand_path("../tmp", __dir__)
     #     setup :prepare_destination
     #   end
     class TestCase < ActiveSupport::TestCase

data/lib/rails/generators/test_unit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/named_base"
 
 module TestUnit # :nodoc:

data/lib/rails/generators/test_unit/controller/controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:

data/lib/rails/generators/test_unit/generator/generator_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/test_unit"
 
 module TestUnit # :nodoc: