phlex-rails 1.2.1 → 2.0.0.beta2

data/lib/phlex/rails/sgml.rb

@@ -11,7 +11,7 @@ module Phlex
 
 			module Overrides
 				def helpers
-					if defined?(ViewComponent::Base) && @_view_context.is_a?(ViewComponent::Base)
+					if defined?(ViewComponent::Base) && ViewComponent::Base === @_view_context
 						@_view_context.helpers
 					else
 						@_view_context
@@ -22,80 +22,62 @@ module Phlex
 					renderable = args[0]
 
 					case renderable
-					when Phlex::SGML, Proc, Method
+					when Phlex::SGML, Proc, Method, String
 						return super
 					when Class
 						return super if renderable < Phlex::SGML
 					when Enumerable
-						return super unless renderable.is_a?(ActiveRecord::Relation)
-					else
-						if block
-							@_context.target << @_view_context.render(*args, **kwargs) { capture(&block) }
-						else
-							@_context.target << @_view_context.render(*args, **kwargs)
+						return super unless ActiveRecord::Relation === renderable
+					when nil
+						partial = kwargs.delete(:partial)
+
+						if partial # this is a hack to get around https://github.com/rails/rails/issues/51015
+							return raw(
+								@_view_context.render(partial, **kwargs) do |*yielded_args|
+									capture(*yielded_args, &block)
+								end,
+							)
 						end
 					end
 
-					nil
+					output = if block
+						@_view_context.render(*args, **kwargs) do |*yielded_args|
+							if yielded_args.length == 1 && defined?(ViewComponent::Base) && ViewComponent::Base === yielded_args[0]
+								capture(Phlex::Rails::Buffered.new(yielded_args[0], view: self), &block)
+							else
+								capture(*yielded_args, &block)
+							end
+						end
+					else
+						@_view_context.render(*args, **kwargs)
+					end
+
+					raw(output)
 				end
 
-				def render_in(view_context, &block)
+				def render_in(view_context, &erb)
 					fragments = if view_context.request && (fragment_header = view_context.request.headers["X-Fragment"])
 						fragment_header.split
 					end
 
-					if block_given?
-						call(view_context: view_context, fragments: fragments) do |*args|
-							original_length = @_context.target.bytesize
-
-							if args.length == 1 && Phlex::SGML === args[0] && !block.source_location&.[](0)&.end_with?(".rb")
-								output = view_context.capture(
-									args[0].unbuffered, &block
-								)
+					if erb
+						call(view_context:, fragments:) { |*args|
+							if args.length == 1 && Phlex::SGML === args[0] && !erb.source_location&.[](0)&.end_with?(".rb")
+								unbuffered = Phlex::Rails::Unbuffered.new(args[0])
+								raw(helpers.capture(unbuffered, &erb))
 							else
-								output = view_context.capture(*args, &block)
+								raw(helpers.capture(*args, &erb))
 							end
-
-							unchanged = (original_length == @_context.target.bytesize)
-
-							if unchanged
-								case output
-								when ActiveSupport::SafeBuffer
-									@_context.target << output
-								end
-							end
-						end.html_safe
+						}.html_safe
 					else
-						call(view_context: view_context, fragments: fragments).html_safe
+						call(view_context:, fragments:).html_safe
 					end
 				end
 
-				def capture
+				def capture(...)
 					super&.html_safe
 				end
 
-				# @api private
-				def __text__(content)
-					case content
-					when ActiveSupport::SafeBuffer
-						@_context.target << content
-					else
-						super
-					end
-				end
-
-				# TODO: Re-introduce this when we can figure out how to test it
-				# def await(task)
-				# 	case task
-				# 	when ActiveRecord::Relation
-				# 		future = task.instance_variable_get(:@future_result)
-				# 		flush if future && future.pending?
-				# 		task
-				# 	else
-				# 		super
-				# 	end
-				# end
-
 				# Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
 				# @api private
 				def set_original_view_context(view_context)

data/lib/phlex/rails/streaming.rb

@@ -7,17 +7,19 @@ module Phlex::Rails::Streaming
 	private
 
 	def stream(view, last_modified: Time.now.httpdate, filename: nil)
-		set_stream_headers(last_modified: last_modified)
+		__phlex_set_stream_headers__(last_modified:)
 
 		case view
 		when Phlex::HTML
-			stream_html(view)
+			__phlex_stream_html__(view)
 		when Phlex::CSV
-			stream_csv(view, filename: filename)
+			__phlex_stream_csv__(view, filename:)
+		else
+			raise Phlex::ArgumentError
 		end
 	end
 
-	def set_stream_headers(last_modified:)
+	def __phlex_set_stream_headers__(last_modified:)
 		headers.delete("Content-Length")
 
 		headers["X-Accel-Buffering"] = "no"
@@ -25,16 +27,16 @@ module Phlex::Rails::Streaming
 		headers["Last-Modified"] = last_modified
 	end
 
-	def stream_csv(view, filename:)
+	def __phlex_stream_csv__(view, filename:)
 		headers["Content-Type"] = "text/csv; charset=utf-8"
 		headers["Content-Disposition"] = "attachment; filename=\"#{filename || view.filename}\""
 
 		self.response_body = Enumerator.new do |buffer|
-			view.call(buffer, view_context: view_context)
+			view.call(buffer, view_context:)
 		end
 	end
 
-	def stream_html(view)
+	def __phlex_stream_html__(view)
 		headers["Content-Type"] = "text/html; charset=utf-8"
 
 		# Ensure we have a session id.
@@ -45,13 +47,13 @@ module Phlex::Rails::Streaming
 		end
 
 		self.response_body = Enumerator.new do |buffer|
-			view.call(buffer, view_context: view_context)
+			view.call(buffer, view_context:)
 		rescue => e
 			raise(e) if Rails.env.test?
 
 			debug_middleware = ActionDispatch::DebugExceptions.new(
 				proc { |_env| raise(e) },
-				response_format: :html
+				response_format: :html,
 			)
 
 			_debug_status, _debug_headers, debug_body = debug_middleware.call(request.env)

data/lib/phlex/rails/testing.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "phlex/rails"
+require "phlex/testing"
+
+module Phlex::Testing::RailsContext
+	def view_context
+		controller.view_context
+	end
+
+	def controller
+		@controller ||= ActionView::TestCase::TestController.new
+	end
+end
+
+Phlex::Testing::SGML.include(
+	Phlex::Testing::RailsContext,
+)

data/lib/phlex/rails/unbuffered.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# @api private
+class Phlex::Rails::Unbuffered
+	def initialize(component)
+		@component = component
+	end
+
+	def respond_to_missing?(...)
+		@component.respond_to?(...)
+	end
+
+	def method_missing(method_name, *, **, &erb)
+		if @component.respond_to?(method_name)
+			output = @component.capture do
+				if erb
+					@component.public_send(method_name, *, **) do |*a, **kw|
+						@component.raw(
+							@component.helpers.capture(
+								*a,
+								**kw,
+								&erb
+							),
+						)
+					end
+				else # no erb block
+					@component.public_send(method_name, *, **)
+				end
+			end
+		else
+			super
+		end
+	end
+
+	def inspect
+		"Unbuffered(#{@component.inspect})"
+	end
+
+	def call(...)
+		@component.call(...)
+	end
+
+	def send(...)
+		@component.__send__(...)
+	end
+
+	def public_send(...)
+		@component.public_send(...)
+	end
+end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "1.2.1"
+		VERSION = "2.0.0.beta2"
 	end
 end

data/lib/phlex/rails.rb

@@ -11,16 +11,15 @@ module Phlex
 		autoload :BufferedLabelBuilder, "phlex/rails/buffered_label_builder"
 		autoload :BufferedRadioButtonBuilder, "phlex/rails/buffered_radio_button_builder"
 		autoload :CSV, "phlex/rails/csv"
-		autoload :HTML, "phlex/rails/html"
+		autoload :FragmentFinder, "phlex/rails/fragment_finder"
+		autoload :HelperFinder, "phlex/rails/helper_finder"
 		autoload :HelperMacros, "phlex/rails/helper_macros"
 		autoload :Helpers, "phlex/rails/helpers"
+		autoload :HTML, "phlex/rails/html"
 		autoload :Layout, "phlex/rails/layout"
 		autoload :SGML, "phlex/rails/sgml"
-		autoload :UnbufferedOverrides, "phlex/rails/unbuffered_overrides"
 		autoload :Streaming, "phlex/rails/streaming"
-		autoload :FragmentFinder, "phlex/rails/fragment_finder"
-
-		Deprecation = ActiveSupport::Deprecation.new("2.0", "Phlex::Rails")
+		autoload :Unbuffered, "phlex/rails/unbuffered"
 	end
 
 	CSV.extend Phlex::Rails::HelperMacros
@@ -29,10 +28,10 @@ module Phlex
 	SGML.extend Phlex::Rails::SGML::ClassMethods
 	SGML.extend Phlex::Rails::HelperMacros
 	SGML.prepend Phlex::Rails::SGML::Overrides
+	SGML.include Phlex::Rails::HelperFinder
 
 	HTML.extend Phlex::Rails::HTML::Format
 	HTML.include Phlex::Rails::HTML::Format
-	HTML.include Phlex::Rails::HTML::MethodMissing
 
-	Unbuffered.prepend Phlex::Rails::UnbufferedOverrides
+	ActiveSupport::SafeBuffer.include(Phlex::SGML::SafeObject)
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -44,33 +44,23 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
-description: A high-performance view framework optimised for developer happiness.
+description: A high-performance view framework optimised for fun.
 email:
 - joel@drapper.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".yardopts"
-- Appraisals
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- SECURITY.md
-- config.ru
 - lib/generators/phlex/component/USAGE
 - lib/generators/phlex/component/component_generator.rb
 - lib/generators/phlex/component/templates/component.rb.erb
 - lib/generators/phlex/install/USAGE
 - lib/generators/phlex/install/install_generator.rb
-- lib/generators/phlex/install/templates/application_component.rb
-- lib/generators/phlex/install/templates/application_layout.rb
-- lib/generators/phlex/install/templates/application_view.rb
+- lib/generators/phlex/install/templates/base_component.rb.erb
+- lib/generators/phlex/install/templates/base_view.rb.erb
+- lib/generators/phlex/install/templates/phlex.rb.erb
 - lib/generators/phlex/view/USAGE
 - lib/generators/phlex/view/templates/view.rb.erb
 - lib/generators/phlex/view/view_generator.rb
@@ -84,6 +74,7 @@ files:
 - lib/phlex/rails/csv.rb
 - lib/phlex/rails/engine.rb
 - lib/phlex/rails/fragment_finder.rb
+- lib/phlex/rails/helper_finder.rb
 - lib/phlex/rails/helper_macros.rb
 - lib/phlex/rails/helpers.rb
 - lib/phlex/rails/helpers/action_cable_meta_tag.rb
@@ -177,6 +168,7 @@ files:
 - lib/phlex/rails/helpers/mail_to.rb
 - lib/phlex/rails/helpers/month_field.rb
 - lib/phlex/rails/helpers/month_field_tag.rb
+- lib/phlex/rails/helpers/notice.rb
 - lib/phlex/rails/helpers/number_field.rb
 - lib/phlex/rails/helpers/number_field_tag.rb
 - lib/phlex/rails/helpers/number_to_currency.rb
@@ -284,14 +276,12 @@ files:
 - lib/phlex/rails/helpers/with_output_buffer.rb
 - lib/phlex/rails/helpers/word_wrap.rb
 - lib/phlex/rails/html.rb
-- lib/phlex/rails/html/method_missing.rb
 - lib/phlex/rails/layout.rb
 - lib/phlex/rails/sgml.rb
 - lib/phlex/rails/streaming.rb
-- lib/phlex/rails/unbuffered_overrides.rb
+- lib/phlex/rails/testing.rb
+- lib/phlex/rails/unbuffered.rb
 - lib/phlex/rails/version.rb
-- lib/phlex/testing/rails/view_helper.rb
-- phlex_logo.png
 homepage: https://www.phlex.fun
 licenses:
 - MIT
@@ -309,14 +299,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: A Phlex adapter for Rails

data/.editorconfig

@@ -1,13 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 2
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.erb]
-indent_style = space
-indent_size = 2

data/.rubocop.yml

@@ -1,15 +0,0 @@
-inherit_from:
-  - "https://www.goodcop.style/rubocop.yml"
-  - "https://www.goodcop.style/tabs.yml"
-
-AllCops:
-  TargetRubyVersion: 2.7
-  Exclude:
-    - "lib/phlex-rails.rb"
-  SuggestExtensions: false
-
-Style/MissingRespondToMissing:
-  Enabled: false
-
-Style/RescueStandardError:
-  Enabled: false

data/.ruby-version

@@ -1 +0,0 @@
-3.2.2

data/.yardopts

@@ -1 +0,0 @@
---private --hide-api private --markup markdown --exclude lib/generators

data/Appraisals

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-appraise "rails-7" do
-	gem "rails", "~> 7"
-end
-
-if RUBY_VERSION >= "3.1.0"
-	appraise "rails-edge" do
-		gem "rails", github: "rails/rails"
-	end
-end

data/CHANGELOG.md

@@ -1,38 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-
-# [1.1.1] 2023-11-27
-
-- Fixed a bug where Phlex would try to capture `nil` when rendered from ActionView without a block.
-
-## [1.1.0] 2023-11-24
-
-- Dropped dependency on `rails` and now only depends on `railties`
-- Fix an out of order rendering issue when yielding from a partial rendered with a block delegated from a component’s content block
-- Added `flash` helper adapter in `Phlex::Rails::Helpers::Flash`
-- Removed experimental form component
-- Updated `phlex` dependency to `~> 1.9`
-
-## [1.0.0] 2023-04-19
-
-### Added
-
-- Added an adapter for the pluralize view helper.
-
-## 0.10.0
-
-### Added
-
-- You can now render procs and lambdas and enumerables of renderables.
-- Experimental streaming interface
-
-### Fixed
-
-- Escaped ERB captures
-- Use buffered component unless renderin in a template
-
-***
-
-Before this changelog was introduced, changes were logged in the [release notes](https://github.com/phlex-ruby/phlex-rails/releases).

data/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at joel@drapper.me. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gemspec
-
-gem "phlex", github: "phlex-ruby/phlex", branch: "1.10"
-gem "rubocop"
-gem "solargraph"
-gem "view_component"
-gem "appraisal", github: "excid3/appraisal", branch: "fix-bundle-env"
-gem "yard"
-
-gem "rails"
-gem "puma"
-gem "sqlite3"

data/SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-If you found a possible security vulnerability in Phlex, please email security@phlex.fun.

data/config.ru

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems"
-require "bundler"
-
-Bundler.require :default, :development
-
-Combustion.initialize! :all
-run Combustion::Application

data/lib/generators/phlex/install/templates/application_component.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationComponent < Phlex::HTML
-	include Phlex::Rails::Helpers::Routes
-
-	if Rails.env.development?
-		def before_template
-			comment { "Before #{self.class.name}" }
-			super
-		end
-	end
-end

data/lib/generators/phlex/install/templates/application_layout.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationLayout < ApplicationView
-	include Phlex::Rails::Layout
-
-	def view_template(&block)
-		doctype
-
-		html do
-			head do
-				title { "You're awesome" }
-				meta name: "viewport", content: "width=device-width,initial-scale=1"
-				csp_meta_tag
-				csrf_meta_tags
-				stylesheet_link_tag "application", data_turbo_track: "reload"
-				javascript_importmap_tags
-			end
-
-			body do
-				main(&block)
-			end
-		end
-	end
-end

data/lib/generators/phlex/install/templates/application_view.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationView < ApplicationComponent
-	# The ApplicationView is an abstract class for all your views.
-
-	# By default, it inherits from `ApplicationComponent`, but you
-	# can change that to `Phlex::HTML` if you want to keep views and
-	# components independent.
-end