actionview 6.1.4.4 → 7.0.0.alpha1

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 6.1.4.4
+  version: 7.0.0.alpha1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-15 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.4.4
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.4
+        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.4.4
+        version: 7.0.0.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.4
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.4
+        version: 7.0.0.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.4
+        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.4.4/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.4/
+  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.4.4/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.2.32
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rendering framework putting the V in MVC (part of Rails).