actionview 6.1.3.1 → 7.0.0.alpha1

data/lib/action_view/template/text.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module ActionView #:nodoc:
+module ActionView # :nodoc:
   # = Action View Text Template
-  class Template #:nodoc:
-    class Text #:nodoc:
+  class Template # :nodoc:
+    class Text # :nodoc:
       attr_accessor :type
 
       def initialize(string)

data/lib/action_view/template/types.rb

@@ -3,8 +3,8 @@
 require "active_support/core_ext/module/attribute_accessors"
 
 module ActionView
-  class Template #:nodoc:
-    class Types
+  class Template # :nodoc:
+    module Types
       class Type
         SET = Struct.new(:symbols).new([ :html, :text, :js, :css, :xml, :json ])
 
@@ -37,21 +37,23 @@ module ActionView
         end
       end
 
-      cattr_accessor :type_klass
+      class << self
+        attr_accessor :type_klass
 
-      def self.delegate_to(klass)
-        self.type_klass = klass
-      end
+        def delegate_to(klass)
+          self.type_klass = klass
+        end
 
-      delegate_to Type
+        def [](type)
+          type_klass[type]
+        end
 
-      def self.[](type)
-        type_klass[type]
+        def symbols
+          type_klass::SET.symbols
+        end
       end
 
-      def self.symbols
-        type_klass::SET.symbols
-      end
+      delegate_to Type
     end
   end
 end

data/lib/action_view/template.rb

@@ -319,7 +319,16 @@ module ActionView
         # Only locals with valid variable names get set directly. Others will
         # still be available in local_assigns.
         locals = @locals - Module::RUBY_RESERVED_KEYWORDS
-        locals = locals.grep(/\A@?(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
+        deprecated_locals = locals.grep(/\A@+/)
+        if deprecated_locals.any?
+          ActiveSupport::Deprecation.warn(<<~MSG)
+            Passing instance variables to `render` is deprecated.
+            In Rails 7.1, #{deprecated_locals.to_sentence} will be ignored.
+          MSG
+          locals = locals.grep(/\A@?(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
+        else
+          locals = locals.grep(/\A(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
+        end
 
         # Assign for the same variable is to suppress unused variable warning
         locals.each_with_object(+"") { |key, code| code << "#{key} = local_assigns[:#{key}]; #{key} = #{key};" }

data/lib/action_view/template_details.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module ActionView
+  class TemplateDetails # :nodoc:
+    class Requested
+      attr_reader :locale, :handlers, :formats, :variants
+      attr_reader :locale_idx, :handlers_idx, :formats_idx, :variants_idx
+
+      ANY_HASH = Hash.new(1).merge(nil => 0).freeze
+
+      def initialize(locale:, handlers:, formats:, variants:)
+        @locale = locale
+        @handlers = handlers
+        @formats = formats
+        @variants = variants
+
+        @locale_idx   = build_idx_hash(locale)
+        @handlers_idx = build_idx_hash(handlers)
+        @formats_idx  = build_idx_hash(formats)
+        if variants == :any
+          @variants_idx = ANY_HASH
+        else
+          @variants_idx = build_idx_hash(variants)
+        end
+      end
+
+      private
+        def build_idx_hash(arr)
+          [*arr, nil].each_with_index.to_h.freeze
+        end
+    end
+
+    attr_reader :locale, :handler, :format, :variant
+
+    def initialize(locale, handler, format, variant)
+      @locale = locale
+      @handler = handler
+      @format = format
+      @variant = variant
+    end
+
+    def matches?(requested)
+      requested.formats_idx[@format] &&
+        requested.locale_idx[@locale] &&
+        requested.variants_idx[@variant] &&
+        requested.handlers_idx[@handler]
+    end
+
+    def sort_key_for(requested)
+      [
+        requested.formats_idx[@format],
+        requested.locale_idx[@locale],
+        requested.variants_idx[@variant],
+        requested.handlers_idx[@handler]
+      ]
+    end
+
+    def handler_class
+      Template.handler_for_extension(handler)
+    end
+
+    def format_or_default
+      format || handler_class.try(:default_format)
+    end
+  end
+end

data/lib/action_view/template_path.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module ActionView
+  # Represents a template path within ActionView's lookup and rendering system,
+  # like "users/show"
+  #
+  # TemplatePath makes it convenient to convert between separate name, prefix,
+  # partial arguments and the virtual path.
+  class TemplatePath
+    attr_reader :name, :prefix, :partial, :virtual
+    alias_method :partial?, :partial
+    alias_method :virtual_path, :virtual
+
+    # Convert name, prefix, and partial into a virtual path string
+    def self.virtual(name, prefix, partial)
+      if prefix.empty?
+        "#{partial ? "_" : ""}#{name}"
+      elsif partial
+        "#{prefix}/_#{name}"
+      else
+        "#{prefix}/#{name}"
+      end
+    end
+
+    # Build a TemplatePath form a virtual path
+    def self.parse(virtual)
+      if nameidx = virtual.rindex("/")
+        prefix = virtual[0, nameidx]
+        name = virtual.from(nameidx + 1)
+        prefix = prefix[1..] if prefix.start_with?("/")
+      else
+        prefix = ""
+        name = virtual
+      end
+      partial = name.start_with?("_")
+      name = name[1..] if partial
+      new name, prefix, partial, virtual
+    end
+
+    # Convert name, prefix, and partial into a TemplatePath
+    def self.build(name, prefix, partial)
+      new name, prefix, partial, virtual(name, prefix, partial)
+    end
+
+    def initialize(name, prefix, partial, virtual)
+      @name    = name
+      @prefix  = prefix
+      @partial = partial
+      @virtual = virtual
+    end
+
+    alias :to_str :virtual
+    alias :to_s :virtual
+
+    def hash # :nodoc:
+      @virtual.hash
+    end
+
+    def eql?(other) # :nodoc:
+      @virtual == other.virtual
+    end
+    alias :== :eql? # :nodoc:
+  end
+end

data/lib/action_view/test_case.rb

@@ -24,6 +24,10 @@ module ActionView
         self.class.controller_path = path
       end
 
+      def self.controller_name
+        "test"
+      end
+
       def initialize
         super
         self.class.controller_path = ""
@@ -74,11 +78,11 @@ module ActionView
         def helper_method(*methods)
           # Almost a duplicate from ActionController::Helpers
           methods.flatten.each do |method|
-            _helpers_for_modification.module_eval <<-end_eval, __FILE__, __LINE__ + 1
+            _helpers_for_modification.module_eval <<~end_eval, __FILE__, __LINE__ + 1
               def #{method}(*args, &block)                    # def current_user(*args, &block)
                 _test_case.send(:'#{method}', *args, &block)  #   _test_case.send(:'current_user', *args, &block)
               end                                             # end
-              ruby2_keywords(:'#{method}') if respond_to?(:ruby2_keywords, true)
+              ruby2_keywords(:'#{method}')
             end_eval
           end
         end

data/lib/action_view/testing/resolvers.rb

@@ -2,12 +2,12 @@
 
 require "action_view/template/resolver"
 
-module ActionView #:nodoc:
+module ActionView # :nodoc:
   # Use FixtureResolver in your tests to simulate the presence of files on the
   # file system. This is used internally by Rails' own test suite, and is
   # useful for testing extensions that have no way of knowing what the file
   # system will look like at runtime.
-  class FixtureResolver < OptimizedFileSystemResolver
+  class FixtureResolver < FileSystemResolver
     def initialize(hash = {})
       super("")
       @hash = hash
@@ -23,23 +23,22 @@ module ActionView #:nodoc:
     end
 
     private
-      def find_candidate_template_paths(path)
-        @hash.keys.select do |fixture|
-          fixture.start_with?(path.virtual)
-        end.map do |fixture|
-          "/#{fixture}"
+      def template_glob(glob)
+        @hash.keys.filter_map do |path|
+          "/#{path}" if File.fnmatch(glob, path)
         end
       end
 
       def source_for_template(template)
-        @hash[template[1..template.size]]
+        @hash[template.from(1)]
       end
   end
 
-  class NullResolver < PathResolver
-    def query(path, exts, _, locals, cache:)
-      handler, format, variant = extract_handler_and_format_and_variant(path)
-      [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant, locals: locals)]
+  class NullResolver < Resolver
+    def find_templates(name, prefix, partial, details, locals = [])
+      path = TemplatePath.build(name, prefix, partial)
+      handler = ActionView::Template::Handlers::Raw
+      [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: nil, variant: nil, locals: locals)]
     end
   end
 end

data/lib/action_view/unbound_template.rb

@@ -4,28 +4,54 @@ require "concurrent/map"
 
 module ActionView
   class UnboundTemplate
-    def initialize(source, identifier, handler, options)
+    attr_reader :virtual_path, :details
+    delegate :locale, :format, :variant, :handler, to: :@details
+
+    def initialize(source, identifier, details:, virtual_path:)
       @source = source
       @identifier = identifier
-      @handler = handler
-      @options = options
+      @details = details
+      @virtual_path = virtual_path
 
       @templates = Concurrent::Map.new(initial_capacity: 2)
+      @write_lock = Mutex.new
     end
 
     def bind_locals(locals)
-      @templates[locals] ||= build_template(locals)
+      if template = @templates[locals]
+        template
+      else
+        @write_lock.synchronize do
+          normalized_locals = normalize_locals(locals)
+
+          # We need ||=, both to dedup on the normalized locals and to check
+          # while holding the lock.
+          @templates[normalized_locals] ||= build_template(normalized_locals)
+
+          # This may have already been assigned, but we've already de-dup'd so
+          # reassignment is fine.
+          @templates[locals.dup] = @templates[normalized_locals]
+        end
+      end
     end
 
     private
       def build_template(locals)
-        options = @options.merge(locals: locals)
         Template.new(
           @source,
           @identifier,
-          @handler,
-          **options
+          details.handler_class,
+
+          format: details.format_or_default,
+          variant: variant&.to_s,
+          virtual_path: @virtual_path,
+
+          locals: locals.map(&:to_s)
         )
       end
+
+      def normalize_locals(locals)
+        locals.map(&:to_sym).sort!.freeze
+      end
   end
 end

data/lib/action_view.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2020 David Heinemeier Hansson
+# Copyright (c) 2004-2021 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -44,6 +44,8 @@ module ActionView
     autoload :Rendering
     autoload :RoutingUrlFor
     autoload :Template
+    autoload :TemplateDetails
+    autoload :TemplatePath
     autoload :UnboundTemplate
     autoload :ViewPaths
 
@@ -59,10 +61,7 @@ module ActionView
 
     autoload_at "action_view/template/resolver" do
       autoload :Resolver
-      autoload :PathResolver
       autoload :FileSystemResolver
-      autoload :OptimizedFileSystemResolver
-      autoload :FallbackFileSystemResolver
     end
 
     autoload_at "action_view/buffers" do

data/lib/assets/compiled/rails-ujs.js

@@ -16,8 +16,8 @@ Released under the MIT license
           exclude: 'form button'
         },
         inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
-        formSubmitSelector: 'form',
-        formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])',
+        formSubmitSelector: 'form:not([data-turbo=true])',
+        formInputClickSelector: 'form:not([data-turbo=true]) input[type=submit], form:not([data-turbo=true]) input[type=image], form:not([data-turbo=true]) button[type=submit], form:not([data-turbo=true]) button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])',
         formDisableSelector: 'input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled',
         formEnableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled, input[data-disable]:disabled, button[data-disable]:disabled, textarea[data-disable]:disabled',
         fileInputSelector: 'input[name][type=file]:not([disabled])',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 6.1.3.1
+  version: 7.0.0.alpha1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -129,6 +129,8 @@ files:
 - lib/action_view/cache_expiry.rb
 - lib/action_view/context.rb
 - lib/action_view/dependency_tracker.rb
+- lib/action_view/dependency_tracker/erb_tracker.rb
+- lib/action_view/dependency_tracker/ripper_tracker.rb
 - lib/action_view/digestor.rb
 - lib/action_view/flows.rb
 - lib/action_view/gem_version.rb
@@ -189,6 +191,7 @@ files:
 - lib/action_view/helpers/tags/translator.rb
 - lib/action_view/helpers/tags/url_field.rb
 - lib/action_view/helpers/tags/week_field.rb
+- lib/action_view/helpers/tags/weekday_select.rb
 - lib/action_view/helpers/text_helper.rb
 - lib/action_view/helpers/translation_helper.rb
 - lib/action_view/helpers/url_helper.rb
@@ -200,6 +203,7 @@ files:
 - lib/action_view/path_set.rb
 - lib/action_view/railtie.rb
 - lib/action_view/record_identifier.rb
+- lib/action_view/render_parser.rb
 - lib/action_view/renderer/abstract_renderer.rb
 - lib/action_view/renderer/collection_renderer.rb
 - lib/action_view/renderer/object_renderer.rb
@@ -209,6 +213,7 @@ files:
 - lib/action_view/renderer/streaming_template_renderer.rb
 - lib/action_view/renderer/template_renderer.rb
 - lib/action_view/rendering.rb
+- lib/action_view/ripper_ast_parser.rb
 - lib/action_view/routing_url_for.rb
 - lib/action_view/tasks/cache_digests.rake
 - lib/action_view/template.rb
@@ -228,6 +233,8 @@ files:
 - lib/action_view/template/sources/file.rb
 - lib/action_view/template/text.rb
 - lib/action_view/template/types.rb
+- lib/action_view/template_details.rb
+- lib/action_view/template_path.rb
 - lib/action_view/test_case.rb
 - lib/action_view/testing/resolvers.rb
 - lib/action_view/unbound_template.rb
@@ -239,10 +246,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.1/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha1/actionview/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.1/actionview
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/actionview
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -251,15 +258,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rendering framework putting the V in MVC (part of Rails).