phlex-rails 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e809453546abb9a9453eaaa4c11a60cccb9526ccf528b399ca56cdeb70b209
-  data.tar.gz: 3b5902a341273eefb1bc49cdd4cd6bc8767ce68df3eb4d8011479b8e2f1adace
+  metadata.gz: 64bd1c0569d8a687689b1eec091acff484e3c3c7db388f80ddc1cb059881c680
+  data.tar.gz: 282af2d851aaef5e1266519b59ba5ade1360cd13666d629b4109441f16abb6f6
 SHA512:
-  metadata.gz: a056aab2cf31bf38c1ed2eab7f52a8a7b63666219c1bacc2c8353f9a6f97a2ccb2cdf41d0bec8028bda4727b8a980cfe6c46c8a75a94b717bc3855cfa0916cf2
-  data.tar.gz: 57f8936d469a6f821b4f66beb7f7449b1f8b7fca5b750683c1f048ae15d32c052ac3cd84dc9ca87f9b0b4fe92c390d7d45aac512fa71394b1cdaafa0a5f2eb55
+  metadata.gz: e9f65f079a1ec7372692767beb7f7f1f70dac50f4429f429aa0085bbfefcd40675e2933985d728ed2354fb90983d86a707d1f5432c3333f72f843032086c7924
+  data.tar.gz: 7e5f5fe2316c5db3ae8757a67517856ffdebf4f5b03467d17a712eb6c571486f402ceeb993cd1ceba31c3a7cfef37aa104ed297123be43fb30cb2af790775530

data/.rubocop.yml

@@ -6,31 +6,7 @@ AllCops:
   TargetRubyVersion: 2.7
   Exclude:
     - "lib/phlex-rails.rb"
+  SuggestExtensions: false
 
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Layout/CaseIndentation:
-  Enabled: false
-
-Style/StringConcatenation:
-  Enabled: false
-
-Layout/MultilineMethodCallBraceLayout:
-  Enabled: false
-
-
-Security/Eval:
-  Enabled: false
-
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: false
-
-Style/MixinUsage:
-  Enabled: false
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Lint/UnderscorePrefixedVariableName:
+Style/MissingRespondToMissing:
   Enabled: false

data/Appraisals

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 appraise "rails-6" do
-	gem "rails", "~> 6.1"
+	gem "rails", "~> 6"
 end
 
 appraise "rails-7" do
-	gem "rails"
+	gem "rails", "~> 7"
 end
 
 appraise "rails-edge" do

data/README.md

@@ -8,7 +8,7 @@ Documentation can be found at [www.phlex.fun](https://www.phlex.fun).
 
 ### Support ✋
 
-If you run into any trouble, please [start a discussion](https://github.com/joeldrapper/phlex/discussions/new), or [open an issue](https://github.com/joeldrapper/phlex/issues/new) if you think you’ve found a bug.
+If you run into any trouble, please [start a discussion](https://github.com/joeldrapper/phlex/discussions/new), or [open an issue](https://github.com/joeldrapper/phlex-rails/issues/new) if you think you’ve found a bug.
 
 ### Community 🙌
 

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/helpers.rb

@@ -1306,6 +1306,13 @@ module Phlex::Rails::Helpers
 		define_output_helper :url_field_tag
 	end
 
+	module URLFor
+		extend Phlex::Rails::HelperMacros
+
+		# @!method url_for(...)
+		define_value_helper :url_for
+	end
+
 	module URLOptions
 		extend Phlex::Rails::HelperMacros
 

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

@@ -12,14 +12,18 @@ module Phlex
 					end
 				end
 
-				def render(renderable = nil, *args, **kwargs, &block)
-					return super if renderable.is_a?(Phlex::SGML)
-					return super if renderable.is_a?(Class) && renderable < Phlex::SGML
-
-					if renderable
-						@_target << @_view_context.render(renderable, *args, **kwargs, &block)
+				def render(*args, **kwargs, &block)
+					renderable = args[0]
+
+					case renderable
+					when Phlex::SGML, Proc
+						return super
+					when Class
+						return super if renderable < Phlex::SGML
+					when Enumerable
+						return super unless renderable.is_a?(ActiveRecord::Relation)
 					else
-						@_target << @_view_context.render(*args, **kwargs, &block)
+						@_context.target << @_view_context.render(*args, **kwargs, &block)
 					end
 
 					nil
@@ -28,92 +32,46 @@ module Phlex
 				def render_in(view_context, &block)
 					if block_given?
 						call(view_context: view_context) do |*args|
-							view_context.with_output_buffer(self) do
-								original_length = @_target.length
-
-								if args.length == 1 && Phlex::SGML === args[0]
-									output = yield(
-										args[0].unbuffered
-									)
-								else
-									output = yield(*args)
-								end
+							original_length = @_context.target.length
+
+							if args.length == 1 && Phlex::SGML === args[0]
+								output = view_context.capture(
+									args[0].unbuffered, &block
+								)
+							else
+								output = view_context.capture(*args, &block)
+							end
 
-								unchanged = (original_length == @_target.length)
+							unchanged = (original_length == @_context.target.length)
 
-								if unchanged
-									if output.is_a?(ActiveSupport::SafeBuffer)
-										unsafe_raw(output)
-									else
-										text(output)
-									end
+							if unchanged
+								case output
+								when ActiveSupport::SafeBuffer
+									@_context.target << output
 								end
 							end
-
-							nil
 						end.html_safe
 					else
 						call(view_context: view_context).html_safe
 					end
 				end
 
-				# @api private
-				def safe_append=(value)
-					return unless value
-
-					@_target << case value
-						when String then value
-						when Symbol then value.name
-						else value.to_s
-					end
+				def capture
+					super&.html_safe
 				end
 
-				# @api private
-				alias_method :safe_concat, :safe_append=
-
-				# @api private
-				def append=(value)
-					case value
+				def plain(content)
+					case content
 					when ActiveSupport::SafeBuffer
-						@_target << value
+						@_context.target << content
 					else
-						@_target << case value
-							when String then ERB::Util.html_escape(value)
-							when Symbol then ERB::Util.html_escape(value.name)
-							else ERB::Util.html_escape(value.to_s)
-						end
+						super
 					end
 				end
 
-				def capture
-					super&.html_safe
-				end
-
 				# Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
 				def set_original_view_context(view_context)
 				end
-
-				private def yield_content(&block)
-					return unless block
-
-					case block.binding.receiver
-					when Phlex::SGML
-						super
-					else
-						@_view_context.with_output_buffer(self) { super }
-					end
-				end
-
-				private def yield_content_with_args(*args, &block)
-					return unless block
-
-					case block.binding.receiver
-					when Phlex::SGML
-						super
-					else
-						@_view_context.with_output_buffer(self) { super }
-					end
-				end
 			end
 		end
 	end

data/lib/phlex/rails/unbuffered_overrides.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Phlex::Rails::UnbufferedOverrides
+	def method_missing(name, *args, **kwargs, &block)
+		if @object.respond_to?(name)
+
+			__class__.define_method(name) do |*a, **k, &b|
+				@object.capture do
+					if b
+						@object.public_send(name, *a, **k) do |*aa|
+							@object.helpers.capture(*aa, &b)
+						end
+					else
+						@object.public_send(name, *a, **k)
+					end
+				end
+			end
+
+			# Now we've defined this missing method, we can call it.
+			__public_send__(name, *args, **kwargs, &block)
+		else
+			super
+		end
+	end
+end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.7.1"
+		VERSION = "0.9.0"
 	end
 end

data/lib/phlex/rails.rb

@@ -18,7 +18,6 @@ module Phlex
 
 	class SGML
 		extend Phlex::Rails::SGML::ClassMethods
-		extend Phlex::Rails::SGML::AppendMethodAddedWarning
 
 		prepend Phlex::Rails::SGML::Overrides
 	end
@@ -27,4 +26,8 @@ module Phlex
 		extend Phlex::Rails::HTML::Format
 		include Phlex::Rails::HTML::Format
 	end
+
+	class Unbuffered
+		prepend ::Phlex::Rails::UnbufferedOverrides
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +111,9 @@ files:
 - lib/phlex/rails/helpers/turbo_stream.rb
 - lib/phlex/rails/html/format.rb
 - lib/phlex/rails/layout.rb
-- lib/phlex/rails/sgml/append_method_added_warning.rb
 - lib/phlex/rails/sgml/class_methods.rb
 - lib/phlex/rails/sgml/overrides.rb
+- lib/phlex/rails/unbuffered_overrides.rb
 - lib/phlex/rails/version.rb
 - lib/phlex/testing/rails/view_helper.rb
 - phlex_logo.png

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

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Rails
-		module SGML
-			module AppendMethodAddedWarning
-				def method_added(name)
-					if name == :append || name == :safe_append= || name == :safe_concat
-						raise Phlex::NameError, "You shouldn't redefine the #{name} method as it's required for safe HTML output."
-					end
-
-					super
-				end
-			end
-		end
-	end
-end