rbexy 2.0.0.rc2 → 2.0.0.rc4

data/lib/rbexy/rails/component_template_resolver.rb

@@ -18,12 +18,12 @@ module Rbexy
 
           cache.compute_if_absent(ActionView::TemplatePath.virtual(name, prefix, partial)) do
             find_templates(name, prefix, partial, details, locals)
-          end
+          end.map { |t| t.bind_locals(locals) }
         end
       else
         # Rails 6 implements caching at the call-site (find_all)
         def _find_all(name, prefix, partial, details, key, locals)
-          find_templates(name, prefix, partial, details, locals)
+          find_templates(name, prefix, partial, details, locals).map { |t| t.bind_locals(locals) }
         end
       end
 
@@ -50,14 +50,11 @@ module Rbexy
         Dir["#{templates_path}.*{#{extensions}}"].map do |template_path|
           source = File.binread(template_path)
           extension = File.extname(template_path)[1..-1]
-          handler = ActionView::Template.handler_for_extension(extension)
 
-          ActionView::Template.new(
-            "#{source}#{component_class_cachebuster(component_name, extension)}",
-            template_path,
-            handler,
-            format: extension.to_sym,
-            locals: [],
+          build_template(
+            source: "#{source}#{component_class_cachebuster(component_name, extension)}",
+            template_path: template_path,
+            extension: extension.to_sym,
             virtual_path: virtual_path
           )
         end
@@ -68,17 +65,36 @@ module Rbexy
         return [] unless component_class && component_class.call_component?
 
         [
-          ActionView::Template.new(
-            cachebuster_digest_as_comment(component_class.component_file_location, :rbx),
-            "#{templates_path}.rbexycall",
-            ActionView::Template.handler_for_extension(:rbx),
-            format: :rbx,
-            locals: [],
+          build_template(
+            source: cachebuster_digest_as_comment(component_class.component_file_location, :rbx),
+            template_path: "#{templates_path}.rbexycall",
+            extension: :rbx,
             virtual_path: virtual_path
           )
         ]
       end
 
+      if ActionView.version >= Gem::Version.new("7.0.0")
+        def build_template(source:, template_path:, extension:, virtual_path:)
+          ActionView::UnboundTemplate.new(
+            source,
+            template_path,
+            details: ActionView::TemplateDetails.new(nil, extension, extension, nil),
+            virtual_path: virtual_path
+          )
+        end
+      else
+        def build_template(source:, template_path:, extension:, virtual_path:)
+          ActionView::UnboundTemplate.new(
+            source,
+            template_path,
+            ActionView::Template.handler_for_extension(extension),
+            format: extension.to_sym,
+            virtual_path: virtual_path
+          )
+        end
+      end
+
       def component_class_cachebuster(component_name, template_format)
         component_class = find_component_class(component_name)
         return unless component_class

data/lib/rbexy/rails/engine.rb

@@ -1,6 +1,31 @@
 require "rbexy/rails"
 require "action_view/dependency_tracker"
 
+# Rails 7.1 implements development-mode template caching in a way that only works with view paths registered as
+# strings with `prepend_view_path`. Since we register our view paths as `ComponentTemplateResolver` instances (which
+# are subclasses of Rails `FileSytemResolver`), we have to monkey-patch Rails to make it think our custom resolvers
+# are file system resolvers and thus should be supported by its caching mechanism.
+if ActionView.version >= Gem::Version.new("7.1")
+  require "action_view/path_registry"
+  module ActionView
+    module PathRegistry
+      class << self
+        alias_method :_original_cast_file_system_resolvers, :cast_file_system_resolvers
+      end
+
+      def self.cast_file_system_resolvers(paths)
+        Array(paths).each do |path|
+          next unless path.is_a?(Rbexy::Rails::ComponentTemplateResolver)
+          @file_system_resolvers[path] ||= path
+          file_system_resolver_hooks.each(&:call)
+        end
+
+        _original_cast_file_system_resolvers(paths)
+      end
+    end
+  end
+end
+
 module Rbexy
   module Rails
     class Engine < ::Rails::Engine

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.0.rc4"
 end

data/rbexy.gemspec

@@ -25,15 +25,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 6", "< 7.1"
-  spec.add_dependency "actionview", ">= 6", "< 7.1"
+  spec.add_dependency "activesupport", ">= 6", "< 7.2"
+  spec.add_dependency "actionview", ">= 6", "< 7.2"
 
   spec.add_development_dependency "appraisal", "~> 2.2"
-  spec.add_development_dependency "rails", ">= 6", "< 7.1"
+  spec.add_development_dependency "rails", ">= 6", "< 7.2"
   spec.add_development_dependency "sprockets-rails", ">= 2", "< 4"
-  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "rspec", "~> 3.12"
   spec.add_development_dependency "guard-rspec", "~> 4.7", ">= 4.7.3"
-  spec.add_development_dependency "rspec-rails", "~> 4.0", ">= 4.0.1"
+  spec.add_development_dependency "rspec-rails", "~> 6.0", ">= 6.0.3"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.9.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 6.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,8 @@ files:
 - gemfiles/rails_6_1.gemfile.lock
 - gemfiles/rails_7_0.gemfile
 - gemfiles/rails_7_0.gemfile.lock
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_1.gemfile.lock
 - gemfiles/rails_master.gemfile
 - gemfiles/rails_master.gemfile.lock
 - lib/rbexy.rb