phlex-rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e5d36afb3e649892cc3e9c72fb4f5f9e7b6638ae50c95a0791ede0afe4355b
-  data.tar.gz: 22ae3aecb60afc9e72be8bc5e7b13736e9901ccb0ada86d5a2dbfa5a69319166
+  metadata.gz: 00fc3d53f19d10aee8a5a0c3aac7c77d5a753caa641dd92524acf1327a3e6a4f
+  data.tar.gz: b5574038403fbdf9aba3de312446c3fd027f6f2a98c7bffe50f36ee8ab44f09c
 SHA512:
-  metadata.gz: 833b460794df4a260a766ebbf226b62d8b482e6c62a0c847499c9f59ce2a6b620e626885a8bd0ace726046ee095d32d95673c0fa5ad2a62d0c929520c6989710
-  data.tar.gz: 995bce4e399888efb0c35fd3f6a0d5c8c6fab5a7b230b613b4c61e71946c4380643dae8273e1ad4cab86a61c04f7a1d43b7229b86c4c0817e42b84a7db8f06fe
+  metadata.gz: 68e1dd45327362c06b9cc7b07efcbba51916c34cf3de4e8b42891dee24f20f98a12dec011fe35d7cc6067f5b610339020de43ed6c4ffbc817671a5f1ff8305b1
+  data.tar.gz: f671b7275caf0bb733d385cd7310388ab5a82475131bb08d937692f3ed57aeba7bd8788d2bd23856a5e08435cc21924c733238d5c391b82bf2bee9d281453ce1

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

@@ -3,8 +3,10 @@
 # An adapter for Rails routing helpers, such as <code>article_path</code>.
 module Phlex::Rails::Helpers
 	module Routes
+		# This must be included first because it defines `url_options` rather than delegating it to the view context.
+		include Rails.application.routes.url_helpers
+
 		include URLOptions
 		include DefaultURLOptions
-		include Rails.application.routes.url_helpers
 	end
 end

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

@@ -28,92 +28,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 = @_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 == @_target.length)
 
-								if unchanged
-									if output.is_a?(ActiveSupport::SafeBuffer)
-										unsafe_raw(output)
-									else
-										text(output)
-									end
+							if unchanged
+								case output
+								when ActiveSupport::SafeBuffer
+									@_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
+						@_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.0"
+		VERSION = "0.8.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.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-03-06 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.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !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