phlex-rails 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00fc3d53f19d10aee8a5a0c3aac7c77d5a753caa641dd92524acf1327a3e6a4f
-  data.tar.gz: b5574038403fbdf9aba3de312446c3fd027f6f2a98c7bffe50f36ee8ab44f09c
+  metadata.gz: 1d500a3ff8d27e51acd27c6901159a5878ee3bf86548d621e4d3deae2d04ad18
+  data.tar.gz: 076fce2ab65191941c6f5f7e72e861e9f0c8768909051977c840661b76811d90
 SHA512:
-  metadata.gz: 68e1dd45327362c06b9cc7b07efcbba51916c34cf3de4e8b42891dee24f20f98a12dec011fe35d7cc6067f5b610339020de43ed6c4ffbc817671a5f1ff8305b1
-  data.tar.gz: f671b7275caf0bb733d385cd7310388ab5a82475131bb08d937692f3ed57aeba7bd8788d2bd23856a5e08435cc21924c733238d5c391b82bf2bee9d281453ce1
+  metadata.gz: a48694a35ddc236320b5467548cf5a509a8cd6cb069277aa39109be4e49f6d299459b14a2c8d8afa3debc559deecdec90743536fbad42b2e2ba4250aadcb7d92
+  data.tar.gz: 3dbd6856b20b5c27471cded9cb6600da3d71de126134564b9367eafa88bdbf3c9e18463c442892d63d58ac118a3c39d91959dd52be6b8aba373071cc4b7d75fb

data/lib/phlex/rails/buffered.rb

@@ -29,7 +29,7 @@ module Phlex::Rails
 
 					case output
 					when ::ActiveSupport::SafeBuffer
-						@view.instance_variable_get(:@_target) << output
+						@view.instance_variable_get(:@_context).target << output
 					end
 
 					nil
@@ -56,7 +56,7 @@ module Phlex::Rails
 
 			case output
 			when ::ActiveSupport::SafeBuffer
-				@view.instance_variable_get(:@_target) << output
+				@view.instance_variable_get(:@_context).target << output
 			end
 
 			nil

data/lib/phlex/rails/helper_macros.rb

@@ -11,7 +11,7 @@ module Phlex::Rails::HelperMacros
 
 				case output
 				when ActiveSupport::SafeBuffer
-					@_target << output
+					@_context.target << output
 				end
 
 				nil
@@ -32,7 +32,7 @@ module Phlex::Rails::HelperMacros
 
 				case output
 				when ActiveSupport::SafeBuffer
-					@_target << output
+					@_context.target << output
 				end
 
 				nil
@@ -85,7 +85,7 @@ module Phlex::Rails::HelperMacros
 
 				case output
 				when ActiveSupport::SafeBuffer
-					@_target << output
+					@_context.target << output
 				end
 
 				nil

data/lib/phlex/rails/helpers/tag.rb

@@ -10,7 +10,7 @@ module Phlex::Rails::Helpers::Tag
 
 		case result
 		when ActiveSupport::SafeBuffer
-			@_target << result
+			@_context.target << result
 		when ActionView::Helpers::TagHelper::TagBuilder
 			Phlex::Rails::Buffered.new(
 				result,

data/lib/phlex/rails/sgml/overrides.rb

@@ -17,9 +17,9 @@ module Phlex
 					return super if renderable.is_a?(Class) && renderable < Phlex::SGML
 
 					if renderable
-						@_target << @_view_context.render(renderable, *args, **kwargs, &block)
+						@_context.target << @_view_context.render(renderable, *args, **kwargs, &block)
 					else
-						@_target << @_view_context.render(*args, **kwargs, &block)
+						@_context.target << @_view_context.render(*args, **kwargs, &block)
 					end
 
 					nil
@@ -28,7 +28,7 @@ module Phlex
 				def render_in(view_context, &block)
 					if block_given?
 						call(view_context: view_context) do |*args|
-							original_length = @_target.length
+							original_length = @_context.target.length
 
 							if args.length == 1 && Phlex::SGML === args[0]
 								output = view_context.capture(
@@ -38,12 +38,12 @@ module Phlex
 								output = view_context.capture(*args, &block)
 							end
 
-							unchanged = (original_length == @_target.length)
+							unchanged = (original_length == @_context.target.length)
 
 							if unchanged
 								case output
 								when ActiveSupport::SafeBuffer
-									@_target << output
+									@_context.target << output
 								end
 							end
 						end.html_safe
@@ -59,7 +59,7 @@ module Phlex
 				def plain(content)
 					case content
 					when ActiveSupport::SafeBuffer
-						@_target << content
+						@_context.target << content
 					else
 						super
 					end

data/lib/phlex/rails/unbuffered_overrides.rb

@@ -8,7 +8,11 @@ module Phlex::Rails::UnbufferedOverrides
 				@object.capture do
 					if b
 						@object.public_send(name, *a, **k) do |*aa|
-							@object.helpers.capture(*aa, &b)
+							if aa.length == 1 && aa[0].is_a?(Phlex::SGML)
+								@object.helpers.capture(aa[0].unbuffered, &b)
+							else
+								@object.helpers.capture(*aa, &b)
+							end
 						end
 					else
 						@object.public_send(name, *a, **k)

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.8.0"
+		VERSION = "0.8.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement