phlex-rails 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ff15970d3e9f51641fcf4739a1ce10cf7d026a3e11bacf88892372a5aa8180
-  data.tar.gz: dcd2019092caec7c33a8fb837396d072b2894e13819074423c679a6555809f47
+  metadata.gz: a3e59108c4a90e8c202407fd7a154b9548060da6f3f561360ea8ed6b43b3f66b
+  data.tar.gz: 18b8485b72c7a435045033d8fa630c29a5fb79bb668432e45ecccf44372e807a
 SHA512:
-  metadata.gz: f60d2e3e17bafb9d40ac0e7287346cd97146954e2a3901e45c82d5d937bea4eb9468d7d573bceff4043a7244834426a0cf8c35065027582901534c68e9e8911d
-  data.tar.gz: 6b4141a6ffc3a44c294370ba17cf15a8e9d683e6beeae00fd1b7045f842820155d1c8de8e396892f991af4eec5ca5759012ca606009213dc30bdf727669ed9ab
+  metadata.gz: 2a23afd4cc366ad642d2eb8c3aaefcb9cdc4913a886439aefbfb729ff3afc547096fbd455a34b9f7f569edbf7e7708c36880b8ca1bd0a6965161e424a4ab9adf
+  data.tar.gz: de2e90c2da14ca3aa70dc0e265b8a3449a2cb6f25eb58e6fcadc37c2b88420ebcc61269553482bf487b2ccc3c946cfc1409c78ad5ed82dd6f7f5f0cc8a69ca93

data/lib/generators/phlex/view/view_generator.rb

@@ -17,7 +17,7 @@ module Phlex
 				::Rails.root.join("app/views/layout.rb").exist?
 			end
 
-			hook_for :test_framework
+			# hook_for :test_framework
 		end
 	end
 end

data/lib/phlex/rails/output_buffer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module Phlex
+	module Rails
+		class OutputBuffer < SimpleDelegator
+			def safe_append=(value)
+				return unless value
+
+				self << case value
+					when String then value
+					when Symbol then value.name
+					else value.to_s
+				end
+			end
+
+			def append=(value)
+				return unless value
+
+				if value.html_safe?
+					self.safe_append = value
+				else
+					self << case value
+						when String then CGI.escape_html(value)
+						when Symbol then CGI.escape_html(value.name)
+						else CGI.escape_html(value.to_s)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/renderable.rb

@@ -17,18 +17,25 @@ module Phlex
 			end
 
 			def render_in(view_context, &block)
-				output_buffer = view_context.output_buffer
-
-				# Since https://github.com/rails/rails/pull/45731
-				if output_buffer.respond_to?(:raw_buffer)
-					buffer = output_buffer.raw_buffer
+				if block_given?
+					call(view_context: view_context) do |*args|
+						view_context.with_output_buffer(OutputBuffer.new(@_target)) do
+							original_length = @_target.length
+							output = yield(*args)
+							unchanged = (original_length == @_target.length)
+
+							if unchanged
+								if output.is_a?(ActiveSupport::SafeBuffer)
+									unsafe_raw(output)
+								else
+									text(output)
+								end
+							end
+						end
+					end.html_safe
 				else
-					buffer = Buffer.new(output_buffer)
+					call(view_context: view_context).html_safe
 				end
-
-				call(buffer, view_context: view_context, &block)
-
-				nil
 			end
 		end
 	end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.2.1"
+		VERSION = "0.3.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.0.0.rc1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.0.0.rc1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -125,11 +131,11 @@ files:
 - lib/install/phlex.rb
 - lib/phlex-rails.rb
 - lib/phlex/rails.rb
-- lib/phlex/rails/buffer.rb
 - lib/phlex/rails/engine.rb
 - lib/phlex/rails/form.rb
 - lib/phlex/rails/helpers.rb
 - lib/phlex/rails/layout.rb
+- lib/phlex/rails/output_buffer.rb
 - lib/phlex/rails/renderable.rb
 - lib/phlex/rails/version.rb
 - lib/phlex/testing/rails.rb

data/lib/phlex/rails/buffer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Rails
-		# A wrapper for Rails’ OutputBuffer that acts like a Phlex buffer.
-
-		class Buffer < SimpleDelegator
-			def <<(value)
-				__getobj__.safe_append = (value)
-				self
-			end
-
-			def length
-				__getobj__.length
-			end
-		end
-	end
-end