railties 6.0.0.beta1 → 6.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f8f350ddf521a8fb2a51bddda33e6afc57c6e239ea0fe8bd23bea476d12c8f
-  data.tar.gz: e647293ffdbc4bbc4beddbde230d567e90de69183b5498729717f1bfda0b2890
+  metadata.gz: a90a9035f3be11b2b2a4c4fa8a020b201755e135aaf581420eee30d622f9f6d7
+  data.tar.gz: bcbfff6e2dedab7895b46c3befe8209ff0768d67dcc2047636f79883765cef5e
 SHA512:
-  metadata.gz: f62d369e32f4e40ef7d5f08af230bc70967627c5db1f68c4ab295c7942ac152f33af09bb1012a2d239fb260f411328d3cf78daf70e6d08329079b031ed2f453c
-  data.tar.gz: 786ff80d0075f5ff9adefe82ce44c249aa436c8a62f663c2c10d62bef204b84ed9b1a743b7866314756eb3ea86172f3468822736d01333d0cd04cd224fc1a46d
+  metadata.gz: e2fadeee30a37cd2b47d48fd3cce775c1351195446850888075d2b0540b9a2120fb939e24a5fc5121fe4d0a9188a7daf3c4383af9b9f111f3065a21a83b37544
+  data.tar.gz: 7d5aec204ddc86f793f5dffb7b91b3e95c39e078cf5dd477e8ad0652550cad52be8f3ceada7e6507d612f9a5161a91756a59e2394cf4683f51d13365e2b178ab

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Rails 6.0.0.beta2 (February 25, 2019) ##
+
+*   Fix non-symbol access to nested hashes returned from `Rails::Application.config_for`
+    being broken by allowing non-symbol access with a deprecation notice.
+
+    *Ufuk Kayserilioglu*
+
+*   Fix deeply nested namespace command printing.
+
+    *Gannon McGibbon*
+
+
 ## Rails 6.0.0.beta1 (January 18, 2019) ##
 
 *   Remove deprecated `after_bundle` helper inside plugins templates.
@@ -70,7 +82,7 @@
 
     In other environments `Rails.application.config.hosts` is empty and no
     `Host` header checks will be done. If you want to guard against header
-    attacks on production, you have to manually whitelist the allowed hosts
+    attacks on production, you have to manually permit the allowed hosts
     with:
 
         Rails.application.config.hosts << "product.com"
@@ -83,7 +95,7 @@
         # `beta1.product.com`.
         Rails.application.config.hosts << /.*\.product\.com/
 
-    A special case is supported that allows you to whitelist all sub-domains:
+    A special case is supported that allows you to permit all sub-domains:
 
         # Allow requests from subdomains like `www.product.com` and
         # `beta1.product.com`.

data/lib/minitest/rails_plugin.rb

@@ -54,6 +54,6 @@ module Minitest
     end
   end
 
-  # Backwardscompatibility with Rails 5.0 generated plugin test scripts
+  # Backwards compatibility with Rails 5.0 generated plugin test scripts
   mattr_reader :run_via, default: {}
 end

data/lib/rails.rb

@@ -13,6 +13,7 @@ require "active_support/core_ext/object/blank"
 
 require "rails/application"
 require "rails/version"
+require "rails/autoloaders"
 
 require "active_support/railtie"
 require "action_dispatch/railtie"
@@ -110,5 +111,9 @@ module Rails
     def public_path
       application && Pathname.new(application.paths["public"].first)
     end
+
+    def autoloaders
+      Autoloaders
+    end
   end
 end

data/lib/rails/app_loader.rb

@@ -23,7 +23,7 @@ control:
                                 # too that you may or may not want (like yarn)
 
 If you already have Rails binstubs in source control, you might be
-inadverently overwriting them during deployment by using bundle install
+inadvertently overwriting them during deployment by using bundle install
 with the --binstubs option.
 
 If your application was created prior to Rails 4, here's how to upgrade:

data/lib/rails/application.rb

@@ -7,6 +7,7 @@ require "active_support/key_generator"
 require "active_support/message_verifier"
 require "active_support/encrypted_configuration"
 require "active_support/deprecation"
+require "active_support/hash_with_indifferent_access"
 require "rails/engine"
 require "rails/secrets"
 
@@ -230,8 +231,8 @@ module Rails
         config = YAML.load(ERB.new(yaml.read).result) || {}
         config = (config["shared"] || {}).merge(config[env] || {})
 
-        ActiveSupport::OrderedOptions.new.tap do |config_as_ordered_options|
-          config_as_ordered_options.update(config.deep_symbolize_keys)
+        ActiveSupport::OrderedOptions.new.tap do |options|
+          options.update(NonSymbolAccessDeprecatedHash.new(config))
         end
       else
         raise "Could not load configuration. No such file - #{yaml}"
@@ -590,5 +591,52 @@ module Rails
       def build_middleware
         config.app_middleware + super
       end
+
+      class NonSymbolAccessDeprecatedHash < HashWithIndifferentAccess # :nodoc:
+        def initialize(value = nil)
+          if value.is_a?(Hash)
+            value.each_pair { |k, v| self[k] = v }
+          else
+            super
+          end
+        end
+
+        def []=(key, value)
+          regular_writer(key.to_sym, convert_value(value, for: :assignment))
+        end
+
+        private
+
+          def convert_key(key)
+            unless key.kind_of?(Symbol)
+              ActiveSupport::Deprecation.warn(<<~MESSAGE.squish)
+                Accessing hashes returned from config_for by non-symbol keys
+                is deprecated and will be removed in Rails 6.1.
+                Use symbols for access instead.
+              MESSAGE
+
+              key = key.to_sym
+            end
+
+            key
+          end
+
+          def convert_value(value, options = {}) # :doc:
+            if value.is_a? Hash
+              if options[:for] == :to_hash
+                value.to_hash
+              else
+                self.class.new(value)
+              end
+            elsif value.is_a?(Array)
+              if options[:for] != :assignment || value.frozen?
+                value = value.dup
+              end
+              value.map! { |e| convert_value(e, options) }
+            else
+              value
+            end
+          end
+      end
   end
 end

data/lib/rails/application/configuration.rb

@@ -20,7 +20,7 @@ module Rails
                     :read_encrypted_secrets, :log_level, :content_security_policy_report_only,
                     :content_security_policy_nonce_generator, :require_master_key, :credentials
 
-      attr_reader :encoding, :api_only, :loaded_config_version
+      attr_reader :encoding, :api_only, :loaded_config_version, :autoloader
 
       def initialize(*)
         super
@@ -30,7 +30,7 @@ module Rails
         @filter_parameters                       = []
         @filter_redirect                         = []
         @helpers_paths                           = []
-        @hosts                                   = Array(([IPAddr.new("0.0.0.0/0"), IPAddr.new("::/0"), "localhost"] if Rails.env.development?))
+        @hosts                                   = Array(([IPAddr.new("0.0.0.0/0"), IPAddr.new("::/0"), ".localhost"] if Rails.env.development?))
         @public_file_server                      = ActiveSupport::OrderedOptions.new
         @public_file_server.enabled              = true
         @public_file_server.index_name           = "index"
@@ -64,6 +64,7 @@ module Rails
         @credentials                             = ActiveSupport::OrderedOptions.new
         @credentials.content_path                = default_credentials_content_path
         @credentials.key_path                    = default_credentials_key_path
+        @autoloader                              = :classic
       end
 
       def load_defaults(target_version)
@@ -117,6 +118,8 @@ module Rails
         when "6.0"
           load_defaults "5.2"
 
+          self.autoloader = :zeitwerk if RUBY_ENGINE == "ruby"
+
           if respond_to?(:action_view)
             action_view.default_enforce_utf8 = false
           end
@@ -267,6 +270,18 @@ module Rails
         end
       end
 
+      def autoloader=(autoloader)
+        case autoloader
+        when :classic
+          @autoloader = autoloader
+        when :zeitwerk
+          require "zeitwerk"
+          @autoloader = autoloader
+        else
+          raise ArgumentError, "config.autoloader may be :classic or :zeitwerk, got #{autoloader.inspect} instead"
+        end
+      end
+
       class Custom #:nodoc:
         def initialize
           @configurations = Hash.new

data/lib/rails/application/finisher.rb

@@ -21,6 +21,13 @@ module Rails
         end
       end
 
+      initializer :let_zeitwerk_take_over do
+        if config.autoloader == :zeitwerk
+          require "active_support/dependencies/zeitwerk_integration"
+          ActiveSupport::Dependencies::ZeitwerkIntegration.take_over
+        end
+      end
+
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.prepend do
@@ -66,6 +73,10 @@ module Rails
       initializer :eager_load! do
         if config.eager_load
           ActiveSupport.run_load_hooks(:before_eager_load, self)
+          # Checks defined?(Zeitwerk) instead of zeitwerk_enabled? because we
+          # want to eager load any dependency managed by Zeitwerk regardless of
+          # the autoloading mode of the application.
+          Zeitwerk::Loader.eager_load_all if defined?(Zeitwerk)
           config.eager_load_namespaces.each(&:eager_load!)
         end
       end

data/lib/rails/autoloaders.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Rails
+  module Autoloaders # :nodoc:
+    class << self
+      include Enumerable
+
+      def main
+        if zeitwerk_enabled?
+          @main ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.main" }
+        end
+      end
+
+      def once
+        if zeitwerk_enabled?
+          @once ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.once" }
+        end
+      end
+
+      def each
+        if zeitwerk_enabled?
+          yield main
+          yield once
+        end
+      end
+
+      def logger=(logger)
+        each { |loader| loader.logger = logger }
+      end
+
+      def zeitwerk_enabled?
+        Rails.configuration.autoloader == :zeitwerk
+      end
+    end
+  end
+end

data/lib/rails/command/actions.rb

@@ -11,10 +11,20 @@ module Rails
       end
 
       def require_application_and_environment!
+        require_application!
+        require_environment!
+      end
+
+      def require_application!
         require ENGINE_PATH if defined?(ENGINE_PATH)
 
         if defined?(APP_PATH)
           require APP_PATH
+        end
+      end
+
+      def require_environment!
+        if defined?(APP_PATH)
           Rails.application.require_environment!
         end
       end

data/lib/rails/command/base.rb

@@ -115,7 +115,7 @@ module Rails
         # For a Rails::Command::TestCommand placed in <tt>rails/command/test_command.rb</tt>
         # would return <tt>rails/test</tt>.
         def default_command_root
-          path = File.expand_path(File.join("../commands", command_root_namespace), __dir__)
+          path = File.expand_path(relative_command_path, __dir__)
           path if File.exist?(path)
         end
 
@@ -135,12 +135,20 @@ module Rails
           end
 
           def command_root_namespace
-            (namespace.split(":") - %w( rails )).first
+            (namespace.split(":") - %w(rails)).join(":")
+          end
+
+          def relative_command_path
+            File.join("../commands", *command_root_namespace.split(":"))
           end
 
           def namespaced_commands
             commands.keys.map do |key|
-              key == command_root_namespace ? key : "#{command_root_namespace}:#{key}"
+              if command_root_namespace.match?(/(\A|\:)#{key}\z/)
+                command_root_namespace
+              else
+                "#{command_root_namespace}:#{key}"
+              end
             end
           end
       end

data/lib/rails/command/behavior.rb

@@ -71,8 +71,9 @@ module Rails
             paths = []
             namespaces.each do |namespace|
               pieces = namespace.split(":")
-              paths << pieces.dup.push(pieces.last).join("/")
-              paths << pieces.join("/")
+              path = pieces.join("/")
+              paths << "#{path}/#{pieces.last}"
+              paths << path
             end
             paths.uniq!
             paths

data/lib/rails/commands/credentials/USAGE

@@ -54,5 +54,5 @@ doesn't exist.
 The encryption key can also be put in `ENV["RAILS_MASTER_KEY"]`, which takes
 precedence over the file encryption key.
 
-In addition to that, the default credentials lookup paths can be overriden through
+In addition to that, the default credentials lookup paths can be overridden through
 `config.credentials.content_path` and `config.credentials.key_path`.

data/lib/rails/commands/credentials/credentials_command.rb

@@ -20,7 +20,7 @@ module Rails
       end
 
       def edit
-        require_application_and_environment!
+        require_application!
 
         ensure_editor_available(command: "bin/rails credentials:edit") || (return)
 
@@ -37,7 +37,7 @@ module Rails
       end
 
       def show
-        require_application_and_environment!
+        require_application!
 
         say credentials.read.presence || missing_credentials_message
       end

data/lib/rails/engine.rb

@@ -472,11 +472,10 @@ module Rails
     # Eager load the application by loading all ruby
     # files inside eager_load paths.
     def eager_load!
-      config.eager_load_paths.each do |load_path|
-        matcher = /\A#{Regexp.escape(load_path.to_s)}\/(.*)\.rb\Z/
-        Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-          require_dependency file.sub(matcher, '\1')
-        end
+      if Rails.autoloaders.zeitwerk_enabled?
+        eager_load_with_zeitwerk!
+      else
+        eager_load_with_dependencies!
       end
     end
 
@@ -652,6 +651,22 @@ module Rails
 
     private
 
+      def eager_load_with_zeitwerk!
+        (config.eager_load_paths - Zeitwerk::Loader.all_dirs).each do |path|
+          Dir.glob("#{path}/**/*.rb").sort.each { |file| require file }
+        end
+      end
+
+      def eager_load_with_dependencies!
+        config.eager_load_paths.each do |load_path|
+          # Starts after load_path plus a slash, ends before ".rb".
+          relname_range = (load_path.to_s.length + 1)...-3
+          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+            require_dependency file[relname_range]
+          end
+        end
+      end
+
       def load_config_initializer(initializer) # :doc:
         ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
           load(initializer)

data/lib/rails/gem_version.rb

@@ -10,7 +10,7 @@ module Rails
     MAJOR = 6
     MINOR = 0
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -222,6 +222,7 @@ module Rails
         log :generate, what
 
         options = args.extract_options!
+        options[:without_rails_env] = true
         argument = args.flat_map(&:to_s).join(" ")
 
         execute_command :rails, "generate #{what} #{argument}", options
@@ -284,14 +285,15 @@ module Rails
         # based on the executor parameter provided.
         def execute_command(executor, command, options = {}) # :doc:
           log executor, command
-          env  = options[:env] || ENV["RAILS_ENV"] || "development"
+          env = options[:env] || ENV["RAILS_ENV"] || "development"
+          rails_env = " RAILS_ENV=#{env}" unless options[:without_rails_env]
           sudo = options[:sudo] && !Gem.win_platform? ? "sudo " : ""
           config = { verbose: false }
 
           config[:capture] = options[:capture] if options[:capture]
           config[:abort_on_failure] = options[:abort_on_failure] if options[:abort_on_failure]
 
-          in_root { run("#{sudo}#{extify(executor)} #{command} RAILS_ENV=#{env}", config) }
+          in_root { run("#{sudo}#{extify(executor)} #{command}#{rails_env}", config) }
         end
 
         # Add an extension to the given name based on the platform.

data/lib/rails/generators/app_base.rb

@@ -128,7 +128,7 @@ module Rails
       def gemfile_entries # :doc:
         [rails_gemfile_entry,
          database_gemfile_entry,
-         webserver_gemfile_entry,
+         web_server_gemfile_entry,
          assets_gemfile_entry,
          webpacker_gemfile_entry,
          javascript_gemfile_entry,
@@ -189,7 +189,7 @@ module Rails
                             "Use #{options[:database]} as the database for Active Record"
       end
 
-      def webserver_gemfile_entry # :doc:
+      def web_server_gemfile_entry # :doc:
         return [] if options[:skip_puma]
         comment = "Use Puma as the app server"
         GemfileEntry.new("puma", "~> 3.11", comment)

data/lib/rails/generators/database.rb

@@ -15,6 +15,7 @@ module Rails
         case database
         when "mysql"          then ["mysql2", [">= 0.4.4"]]
         when "postgresql"     then ["pg", [">= 0.18", "< 2.0"]]
+        when "sqlite3"        then ["sqlite3", ["~> 1.3", ">= 1.3.6"]]
         when "oracle"         then ["activerecord-oracle_enhanced-adapter", nil]
         when "frontbase"      then ["ruby-frontbase", nil]
         when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]

data/lib/rails/generators/migration.rb

@@ -63,8 +63,7 @@ module Rails
         numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
 
         create_migration numbered_destination, nil, config do
-          match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
-          if match && match[:version] >= "2.2.0" # Ruby 2.6+
+          if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
             ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context)
           else
             ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)

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

@@ -28,7 +28,7 @@ ruby <%= "'#{RUBY_VERSION}'" -%>
 
 <% if depend_on_bootsnap? -%>
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootsnap', '>= 1.4.1', require: false
 
 <%- end -%>
 <%- if options.api? -%>

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -98,4 +98,25 @@ Rails.application.configure do
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
   <%- end -%>
+
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

@@ -48,7 +48,4 @@ Rails.application.configure do
 
   # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
-
-  # Prevent expensive template finalization at end of test suite runs.
-  config.action_view.finalize_compiled_template_methods = false
 end

data/lib/rails/generators/rails/app/templates/config/puma.rb.tt

@@ -17,7 +17,7 @@ port        ENV.fetch("PORT") { 3000 }
 environment ENV.fetch("RAILS_ENV") { "development" }
 
 # Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).

data/lib/rails/tasks/statistics.rake

@@ -9,6 +9,7 @@ STATS_DIRECTORIES = [
   %w(Jobs               app/jobs),
   %w(Models             app/models),
   %w(Mailers            app/mailers),
+  %w(Mailboxes          app/mailboxes),
   %w(Channels           app/channels),
   %w(JavaScripts        app/assets/javascripts),
   %w(JavaScript         app/javascript),
@@ -18,6 +19,8 @@ STATS_DIRECTORIES = [
   %w(Helper\ tests      test/helpers),
   %w(Model\ tests       test/models),
   %w(Mailer\ tests      test/mailers),
+  %w(Mailbox\ tests     test/mailboxes),
+  %w(Channel\ tests     test/channels),
   %w(Job\ tests         test/jobs),
   %w(Integration\ tests test/integration),
   %w(System\ tests      test/system),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-02-25 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.beta1
+        version: 6.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.0.beta2
 - !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.beta1
+        version: 6.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.0.beta2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -126,6 +126,7 @@ files:
 - lib/rails/application/finisher.rb
 - lib/rails/application/routes_reloader.rb
 - lib/rails/application_controller.rb
+- lib/rails/autoloaders.rb
 - lib/rails/backtrace_cleaner.rb
 - lib/rails/cli.rb
 - lib/rails/code_statistics.rb
@@ -428,8 +429,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta1/railties
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta1/railties/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta2/railties
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta2/railties/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--exclude"