railties 6.0.0.beta3 → 6.0.2.rc2

data/lib/rails/generators/rails/app/templates/package.json.tt

@@ -2,10 +2,10 @@
   "name": "<%= app_name %>",
   "private": true,
   "dependencies": {
-    "@rails/ujs": "^6.0.0-alpha"<% unless options[:skip_turbolinks] %>,
+    "@rails/ujs": "^6.0.0"<% unless options[:skip_turbolinks] %>,
     "turbolinks": "^5.2.0"<% end -%><% unless skip_active_storage? %>,
-    "@rails/activestorage": "^6.0.0-alpha"<% end -%><% unless options[:skip_action_cable] %>,
-    "@rails/actioncable": "^6.0.0-alpha"<% end %>
+    "@rails/activestorage": "^6.0.0"<% end -%><% unless options[:skip_action_cable] %>,
+    "@rails/actioncable": "^6.0.0"<% end %>
   },
   "version": "0.1.0"
 }

data/lib/rails/generators/rails/app/templates/public/robots.txt

@@ -1 +1 @@
-# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file

data/lib/rails/generators/rails/app/templates/ruby-version.tt

@@ -1 +1 @@
-<%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" -%>
+<%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" %>

data/lib/rails/generators/rails/assets/assets_generator.rb

@@ -3,7 +3,10 @@
 module Rails
   module Generators
     class AssetsGenerator < NamedBase # :nodoc:
+      class_option :javascripts, type: :boolean, desc: "Generate JavaScripts"
       class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
+
+      class_option :javascript_engine, desc: "Engine for JavaScripts"
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
       private
@@ -11,6 +14,10 @@ module Rails
           file_name
         end
 
+        hook_for :javascript_engine do |javascript_engine|
+          invoke javascript_engine, [name] if options[:javascripts]
+        end
+
         hook_for :stylesheet_engine do |stylesheet_engine|
           invoke stylesheet_engine, [name] if options[:stylesheets]
         end

data/lib/rails/generators/rails/db/system/change/change_generator.rb

@@ -35,8 +35,9 @@ module Rails
           end
 
           def edit_gemfile
-            database_gem_name, _ = gem_for_database
-            gsub_file("Gemfile", all_database_gems_regex, database_gem_name)
+            name, version = gem_for_database
+            gsub_file("Gemfile", all_database_gems_regex, name)
+            gsub_file("Gemfile", gem_entry_regex_for(name), gem_entry_for(name, *version))
           end
 
           private
@@ -48,6 +49,15 @@ module Rails
               all_database_gem_names = all_database_gems.map(&:first)
               /(\b#{all_database_gem_names.join('\b|\b')}\b)/
             end
+
+            def gem_entry_regex_for(gem_name)
+              /^gem.*\b#{gem_name}\b.*/
+            end
+
+            def gem_entry_for(*gem_name_and_version)
+              gem_name_and_version.map! { |segment| "'#{segment}'" }
+              "gem #{gem_name_and_version.join(", ")}"
+            end
         end
       end
     end

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -144,17 +144,6 @@ task default: :test
       end
     end
 
-    def javascripts
-      return if options.skip_javascript?
-
-      if mountable?
-        template "rails/javascripts.js",
-                 "app/assets/javascripts/#{namespaced_name}/application.js"
-      elsif full?
-        empty_directory_with_keep_file "app/assets/javascripts/#{namespaced_name}"
-      end
-    end
-
     def bin(force = false)
       bin_file = engine? ? "bin/rails.tt" : "bin/test.tt"
       template bin_file, force: force do |content|
@@ -236,10 +225,6 @@ task default: :test
         build(:stylesheets) unless api?
       end
 
-      def create_javascript_files
-        build(:javascripts) unless api?
-      end
-
       def create_bin_files
         build(:bin)
       end

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

@@ -5,6 +5,7 @@ pkg/
 <% if sqlite3? -%>
 <%= dummy_path %>/db/*.sqlite3
 <%= dummy_path %>/db/*.sqlite3-journal
+<%= dummy_path %>/db/*.sqlite3-*
 <% end -%>
 <%= dummy_path %>/log/*.log
 <% unless options[:skip_javascript] -%>

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

@@ -32,6 +32,20 @@ module Rails
       hook_for :helper, as: :scaffold do |invoked|
         invoke invoked, [ controller_name ]
       end
+
+      private
+
+        def permitted_params
+          attachments, others = attributes_names.partition { |name| attachments?(name) }
+          params = others.map { |name| ":#{name}" }
+          params += attachments.map { |name| "#{name}: []" }
+          params.join(", ")
+        end
+
+        def attachments?(name)
+          attribute = attributes.find { |attr| attr.name == name }
+          attribute&.attachments?
+        end
     end
   end
 end

data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt

@@ -54,7 +54,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params.fetch(:<%= singular_table_name %>, {})
       <%- else -%>
-      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
       <%- end -%>
     end
 end

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt

@@ -61,7 +61,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params.fetch(:<%= singular_table_name %>, {})
       <%- else -%>
-      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
       <%- end -%>
     end
 end

data/lib/rails/generators/test_unit/model/templates/fixtures.yml.tt

@@ -1,4 +1,4 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 <% unless attributes.empty? -%>
 <% %w(one two).each do |name| %>
 <%= name %>:
@@ -7,7 +7,7 @@
   password_digest: <%%= BCrypt::Password.create('secret') %>
   <%- elsif attribute.reference? -%>
   <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default || name) %>
-  <%- else -%>
+  <%- elsif !attribute.virtual? -%>
   <%= yaml_key_value(attribute.column_name, attribute.default) %>
   <%- end -%>
   <%- if attribute.polymorphic? -%>

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

@@ -49,16 +49,21 @@ module TestUnit # :nodoc:
           attributes_names.map do |name|
             if %w(password password_confirmation).include?(name) && attributes.any?(&:password_digest?)
               ["#{name}", "'secret'"]
-            else
+            elsif !virtual?(name)
               ["#{name}", "@#{singular_table_name}.#{name}"]
             end
-          end.sort.to_h
+          end.compact.sort.to_h
         end
 
         def boolean?(name)
           attribute = attributes.find { |attr| attr.name == name }
           attribute&.type == :boolean
         end
+
+        def virtual?(name)
+          attribute = attributes.find { |attr| attr.name == name }
+          attribute&.virtual?
+        end
     end
   end
 end

data/lib/rails/info.rb

@@ -68,7 +68,7 @@ module Rails
 
     # The RubyGems version, if it's installed.
     property "RubyGems version" do
-      Gem::RubyGemsVersion
+      Gem::VERSION
     end
 
     property "Rack version" do

data/lib/rails/mailers_controller.rb

@@ -5,8 +5,9 @@ require "rails/application_controller"
 class Rails::MailersController < Rails::ApplicationController # :nodoc:
   prepend_view_path ActionDispatch::DebugView::RESCUES_TEMPLATE_PATH
 
+  around_action :set_locale, only: :preview
+  before_action :find_preview, only: :preview
   before_action :require_local!, unless: :show_previews?
-  before_action :find_preview, :set_locale, only: :preview
 
   helper_method :part_query, :locale_query
 
@@ -38,7 +39,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
           end
         else
           @part = find_preferred_part(request.format, Mime[:html], Mime[:text])
-          render action: "email", layout: false, formats: %w[html]
+          render action: "email", layout: false, formats: [:html]
         end
       else
         raise AbstractController::ActionNotFound, "Email '#{@email_action}' not found in #{@preview.name}"
@@ -92,6 +93,8 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
     end
 
     def set_locale
-      I18n.locale = params[:locale] || I18n.default_locale
+      I18n.with_locale(params[:locale] || I18n.default_locale) do
+        yield
+      end
     end
 end

data/lib/rails/source_annotation_extractor.rb

@@ -2,11 +2,6 @@
 
 require "active_support/deprecation"
 
-# Remove this deprecated class in the next minor version
-#:nodoc:
-SourceAnnotationExtractor = ActiveSupport::Deprecation::DeprecatedConstantProxy.
-  new("SourceAnnotationExtractor", "Rails::SourceAnnotationExtractor")
-
 module Rails
   # Implements the logic behind <tt>Rails::Command::NotesCommand</tt>. See <tt>rails notes --help</tt> for usage information.
   #
@@ -29,6 +24,16 @@ module Rails
         directories.push(*dirs)
       end
 
+      def self.tags
+        @@tags ||= %w(OPTIMIZE FIXME TODO)
+      end
+
+      # Registers additional tags
+      #   Rails::SourceAnnotationExtractor::Annotation.register_tags("TESTME", "DEPRECATEME")
+      def self.register_tags(*additional_tags)
+        tags.push(*additional_tags)
+      end
+
       def self.extensions
         @@extensions ||= {}
       end
@@ -66,6 +71,8 @@ module Rails
     # Prints all annotations with tag +tag+ under the root directories +app+,
     # +config+, +db+, +lib+, and +test+ (recursively).
     #
+    # If +tag+ is <tt>nil</tt>, annotations with either default or registered tags are printed.
+    #
     # Specific directories can be explicitly set using the <tt>:dirs</tt> key in +options+.
     #
     #   Rails::SourceAnnotationExtractor.enumerate 'TODO|FIXME', dirs: %w(app lib), tag: true
@@ -75,7 +82,8 @@ module Rails
     # See <tt>#find_in</tt> for a list of file extensions that will be taken into account.
     #
     # This class method is the single entry point for the `rails notes` command.
-    def self.enumerate(tag, options = {})
+    def self.enumerate(tag = nil, options = {})
+      tag ||= Annotation.tags.join("|")
       extractor = new(tag)
       dirs = options.delete(:dirs) || Annotation.directories
       extractor.display(extractor.find(dirs), options)
@@ -147,3 +155,8 @@ module Rails
     end
   end
 end
+
+# Remove this deprecated class in the next minor version
+#:nodoc:
+SourceAnnotationExtractor = ActiveSupport::Deprecation::DeprecatedConstantProxy.
+  new("SourceAnnotationExtractor", "Rails::SourceAnnotationExtractor")

data/lib/rails/tasks.rb

@@ -15,6 +15,7 @@ require "rake"
   routes
   tmp
   yarn
+  zeitwerk
 ).tap { |arr|
   arr << "statistics" if Rake.application.current_scope.empty?
 }.each do |task|

data/lib/rails/tasks/zeitwerk.rake

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+ensure_zeitwerk_mode = ->() do
+  unless Rails.autoloaders.zeitwerk_enabled?
+    abort "Please, enable :zeitwerk mode in config/application.rb and try again."
+  end
+end
+
+eager_load = ->() do
+  puts "Hold on, I am eager loading the application."
+  Zeitwerk::Loader.eager_load_all
+end
+
+report_not_checked = ->(not_checked) do
+  puts
+  puts <<~EOS
+    WARNING: The files in these directories cannot be checked because they
+    are not eager loaded:
+  EOS
+  puts
+
+  not_checked.each { |dir| puts "  #{dir}" }
+  puts
+
+  puts <<~EOS
+    You may verify them manually, or add them to config.eager_load_paths
+    in config/application.rb and run zeitwerk:check again.
+  EOS
+  puts
+end
+
+report = ->(not_checked) do
+  if not_checked.any?
+    report_not_checked[not_checked]
+    puts "Otherwise, all is good!"
+  else
+    puts "All is good!"
+  end
+end
+
+namespace :zeitwerk do
+  desc "Checks project structure for Zeitwerk compatibility"
+  task check: :environment do
+    ensure_zeitwerk_mode[]
+
+    begin
+      eager_load[]
+    rescue NameError => e
+      if e.message =~ /expected file .*? to define constant [\w:]+/
+        abort $&.sub(/expected file #{Regexp.escape(Rails.root.to_s)}./, "expected file ")
+      else
+        raise
+      end
+    end
+
+    eager_load_paths = Rails.configuration.eager_load_namespaces.map do |eln|
+      eln.config.eager_load_paths if eln.respond_to?(:config)
+    end.compact.flatten
+
+    not_checked = ActiveSupport::Dependencies.autoload_paths - eager_load_paths
+    not_checked.select! { |dir| Dir.exist?(dir) }
+    not_checked.reject! { |dir| Dir.empty?(dir) }
+
+    report[not_checked]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta3
+  version: 6.0.2.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -123,6 +123,7 @@ files:
 - lib/rails/application/bootstrap.rb
 - lib/rails/application/configuration.rb
 - lib/rails/application/default_middleware_stack.rb
+- lib/rails/application/dummy_erb_compiler.rb
 - lib/rails/application/finisher.rb
 - lib/rails/application/routes_reloader.rb
 - lib/rails/application_controller.rb
@@ -147,6 +148,7 @@ files:
 - lib/rails/commands/dbconsole/dbconsole_command.rb
 - lib/rails/commands/destroy/destroy_command.rb
 - lib/rails/commands/dev/dev_command.rb
+- lib/rails/commands/encrypted/USAGE
 - lib/rails/commands/encrypted/encrypted_command.rb
 - lib/rails/commands/generate/generate_command.rb
 - lib/rails/commands/help/USAGE
@@ -226,7 +228,6 @@ files:
 - lib/rails/generators/rails/app/templates/bin/rails.tt
 - lib/rails/generators/rails/app/templates/bin/rake.tt
 - lib/rails/generators/rails/app/templates/bin/setup.tt
-- lib/rails/generators/rails/app/templates/bin/update.tt
 - lib/rails/generators/rails/app/templates/bin/yarn.tt
 - lib/rails/generators/rails/app/templates/config.ru.tt
 - lib/rails/generators/rails/app/templates/config/application.rb.tt
@@ -410,6 +411,7 @@ files:
 - lib/rails/tasks/statistics.rake
 - lib/rails/tasks/tmp.rake
 - lib/rails/tasks/yarn.rake
+- lib/rails/tasks/zeitwerk.rake
 - lib/rails/templates/layouts/application.html.erb
 - lib/rails/templates/rails/info/properties.html.erb
 - lib/rails/templates/rails/info/routes.html.erb
@@ -425,12 +427,15 @@ files:
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails/welcome_controller.rb
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/railties
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/railties/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.2.rc2/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.2.rc2/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.2.rc2/railties
 post_install_message: 
 rdoc_options:
 - "--exclude"
@@ -448,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.