Fix caching (#279)

Author: joeldrapper

Appraisals

@@ -11,7 +11,3 @@ end
 appraise "rails edge" do
 	gem "rails", github: "rails/rails"
 end
-
-appraise "phlex 2.1" do
-	gem "phlex", "~> 2.1.0"
-end

app/components/cache.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Components::Cache < Phlex::HTML
+	def initialize(text)
+		@text = text
+	end
+
+	def cache_store = Rails.cache
+
+	def view_template
+		cache do
+			h1 { @text }
+		end
+	end
+end

lib/phlex/rails/sgml.rb

@@ -136,27 +136,6 @@ def set_original_view_context(view_context)
 		# no-op (see https://github.com/ViewComponent/view_component/issues/2207)
 	end
 
-	def vanish(...)
-		# Quick fix because we need rails to handle the capture now
-		capture(...)
-	end
-
-	def capture(*args, &block)
-		if capture_context
-			return "" unless block
-
-			@_state.around_capture do
-				if args.length == 0
-					capture_context.capture { __yield_content__(&block) }
-				else
-					capture_context.capture(*args) { __yield_content_with_args__(*args, &block) }
-				end
-			end
-		else
-			super
-		end
-	end
-
 	def enable_cache_reloading?
 		Rails.env.development?
 	end

lib/phlex/rails/sgml/state.rb

@@ -5,16 +5,21 @@ def buffer
 		@user_context[:capture_context]&.output_buffer&.raw_buffer || super
 	end
 
-	def around_capture
-		original_capturing = @capturing
-		original_fragments = @fragments
+	def capture
+		if (capture_context = @user_context[:capture_context])
+			original_capturing = @capturing
+			original_fragments = @fragments
 
-		begin
-			@capturing = true
-			yield
-		ensure
-			@capturing = original_capturing
-			@fragments = original_fragments
+			capture_context.capture do
+				@capturing = true
+				@fragments = nil
+				yield
+			ensure
+				@capturing = original_capturing
+				@fragments = original_fragments
+			end
+		else
+			super
 		end
 	end
 end

phlex-rails.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency "phlex", "~> 2.1.0"
+	spec.add_dependency "phlex", "~> 2.1.2"
 	spec.add_dependency "railties", ">= 7.1", "< 9"
 end

test/cache.test.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+test "basic caching test" do
+	assert_equal_html render(Components::Cache.new("Original")), <<~HTML.strip
+		<h1>Original</h1>
+	HTML
+
+	assert_equal_html render(Components::Cache.new("Something else")), <<~HTML.strip
+		<h1>Original</h1>
+	HTML
+end