Merge pull request #221 from phlex-ruby/prepare-v2

Prepare v2

Author: joeldrapper

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest"]
-        ruby-version: ["2.7", "3.0", "3.1", "3.2", "3.3", "head"]
+        ruby-version: ["3.3", "head"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.rubocop.yml

@@ -3,7 +3,7 @@ inherit_from:
   - "https://www.goodcop.style/tabs.yml"
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3.3
   Exclude:
     - "lib/phlex-rails.rb"
   SuggestExtensions: false

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.5

.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.5

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem "phlex", github: "phlex-ruby/phlex", branch: "1.11"
+gem "phlex", github: "phlex-ruby/phlex"
 gem "rubocop"
 gem "solargraph"
 gem "view_component"

lib/phlex/rails.rb

@@ -11,16 +11,15 @@ module Rails
 		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,8 @@ module Rails
 	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
 end

lib/phlex/rails/buffered.rb

@@ -30,7 +30,7 @@ def #{method_name}(*args, **kwargs, &block)
 
 					case output
 					when ::ActiveSupport::SafeBuffer
-						@view.instance_variable_get(:@_context).target << output
+						@view.instance_variable_get(:@_context).buffer << output
 					end
 
 					nil
@@ -48,15 +48,14 @@ def respond_to_missing?(...)
 			@object.respond_to?(...)
 		end
 
-		def method_missing(*args, **kwargs, &block)
+		def method_missing(*, **, &block)
 			output = if block
-				@object.public_send(*args, **kwargs) { |*a| @view.capture(*a, &block) }
+				@object.public_send(*, **) { |*a| @view.capture(*a, &block) }
 			else
-				@object.public_send(*args, **kwargs)
+				@object.public_send(*, **)
 			end
 
-			case output
-			when ::ActiveSupport::SafeBuffer
+			if ::ActiveSupport::SafeBuffer === output
 				@view.instance_variable_get(:@_context).target << output
 			end
 

lib/phlex/rails/csv.rb

@@ -4,11 +4,11 @@ module Phlex
 	module Rails
 		module CSV
 			module Overrides
-				def each_item(&block)
-					return super unless collection.is_a?(ActiveRecord::Relation)
+				def each_item(&)
+					return super unless ActiveRecord::Relation === collection
 					return super unless collection.arel.orders.empty?
 
-					collection.find_each(&block)
+					collection.find_each(&)
 				end
 			end
 		end

lib/phlex/rails/engine.rb

@@ -4,7 +4,6 @@
 
 module Phlex
 	module Rails
-		# @api private
 		class Engine < ::Rails::Engine
 		end
 	end

lib/phlex/rails/html/method_missing.rb lib/phlex/rails/helper_finder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::HTML::MethodMissing
+module Phlex::Rails::HelperFinder
 	def method_missing(name, *args, **kwargs, &block)
 		return super unless helpers.respond_to?(name)
 

lib/phlex/rails/helpers.rb

@@ -12,8 +12,6 @@ module Phlex::Rails::Helpers
 	autoload :BuildTagValues, "phlex/rails/helpers/build_tag_values"
 	autoload :ButtonTag, "phlex/rails/helpers/button_tag"
 	autoload :ButtonTo, "phlex/rails/helpers/button_to"
-	autoload :CSPMetaTag, "phlex/rails/helpers/csp_meta_tag"
-	autoload :CSRFMetaTags, "phlex/rails/helpers/csrf_meta_tags"
 	autoload :CheckBox, "phlex/rails/helpers/check_box"
 	autoload :CheckBoxTag, "phlex/rails/helpers/check_box_tag"
 	autoload :ClassNames, "phlex/rails/helpers/class_names"
@@ -29,11 +27,11 @@ module Phlex::Rails::Helpers
 	autoload :ContentTag, "phlex/rails/helpers/content_tag"
 	autoload :ControllerName, "phlex/rails/helpers/controller_name"
 	autoload :ControllerPath, "phlex/rails/helpers/controller_path"
+	autoload :CSPMetaTag, "phlex/rails/helpers/csp_meta_tag"
+	autoload :CSRFMetaTags, "phlex/rails/helpers/csrf_meta_tags"
 	autoload :CurrentCycle, "phlex/rails/helpers/current_cycle"
 	autoload :CurrentPage, "phlex/rails/helpers/current_page"
 	autoload :Cycle, "phlex/rails/helpers/cycle"
-	autoload :DOMClass, "phlex/rails/helpers/dom_class"
-	autoload :DOMID, "phlex/rails/helpers/dom_id"
 	autoload :DateField, "phlex/rails/helpers/date_field"
 	autoload :DateFieldTag, "phlex/rails/helpers/date_field_tag"
 	autoload :DateSelect, "phlex/rails/helpers/date_select"
@@ -46,6 +44,8 @@ module Phlex::Rails::Helpers
 	autoload :DefaultURLOptions, "phlex/rails/helpers/default_url_options"
 	autoload :DistanceOfTimeInWords, "phlex/rails/helpers/distance_of_time_in_words"
 	autoload :DistanceOfTimeInWordsToNow, "phlex/rails/helpers/distance_of_time_in_words_to_now"
+	autoload :DOMClass, "phlex/rails/helpers/dom_class"
+	autoload :DOMID, "phlex/rails/helpers/dom_id"
 	autoload :EmailField, "phlex/rails/helpers/email_field"
 	autoload :EmailFieldTag, "phlex/rails/helpers/email_field_tag"
 	autoload :ErrorMessage, "phlex/rails/helpers/error_message"
@@ -55,8 +55,8 @@ module Phlex::Rails::Helpers
 	autoload :FaviconLinkTag, "phlex/rails/helpers/favicon_link_tag"
 	autoload :FieldID, "phlex/rails/helpers/field_id"
 	autoload :FieldName, "phlex/rails/helpers/field_name"
-	autoload :FieldSetTag, "phlex/rails/helpers/field_set_tag"
 	autoload :Fields, "phlex/rails/helpers/fields"
+	autoload :FieldSetTag, "phlex/rails/helpers/field_set_tag"
 	autoload :FieldsFor, "phlex/rails/helpers/fields_for"
 	autoload :FileField, "phlex/rails/helpers/file_field"
 	autoload :FileFieldTag, "phlex/rails/helpers/file_field_tag"
@@ -75,8 +75,8 @@ module Phlex::Rails::Helpers
 	autoload :ImageSubmitTag, "phlex/rails/helpers/image_submit_tag"
 	autoload :ImageTag, "phlex/rails/helpers/image_tag"
 	autoload :ImageURL, "phlex/rails/helpers/image_url"
-	autoload :JavascriptImportModuleTag, "phlex/rails/helpers/javascript_import_module_tag"
 	autoload :JavascriptImportmapTags, "phlex/rails/helpers/javascript_importmap_tags"
+	autoload :JavascriptImportModuleTag, "phlex/rails/helpers/javascript_import_module_tag"
 	autoload :JavascriptIncludeTag, "phlex/rails/helpers/javascript_include_tag"
 	autoload :JavascriptPath, "phlex/rails/helpers/javascript_path"
 	autoload :JavascriptTag, "phlex/rails/helpers/javascript_tag"
@@ -131,7 +131,6 @@ module Phlex::Rails::Helpers
 	autoload :ResetCycle, "phlex/rails/helpers/reset_cycle"
 	autoload :RichTextArea, "phlex/rails/helpers/rich_text_area"
 	autoload :Routes, "phlex/rails/helpers/routes"
-	autoload :SMSTo, "phlex/rails/helpers/sms_to"
 	autoload :Sanitize, "phlex/rails/helpers/sanitize"
 	autoload :SanitizeCSS, "phlex/rails/helpers/sanitize_css"
 	autoload :SearchField, "phlex/rails/helpers/search_field"
@@ -148,6 +147,7 @@ module Phlex::Rails::Helpers
 	autoload :SelectTime, "phlex/rails/helpers/select_time"
 	autoload :SelectYear, "phlex/rails/helpers/select_year"
 	autoload :SimpleFormat, "phlex/rails/helpers/simple_format"
+	autoload :SMSTo, "phlex/rails/helpers/sms_to"
 	autoload :StripLinks, "phlex/rails/helpers/strip_links"
 	autoload :StripTags, "phlex/rails/helpers/strip_tags"
 	autoload :StylesheetLinkTag, "phlex/rails/helpers/stylesheet_link_tag"
@@ -174,9 +174,9 @@ module Phlex::Rails::Helpers
 	autoload :Truncate, "phlex/rails/helpers/truncate"
 	autoload :TurboFrameTag, "phlex/rails/helpers/turbo_frame_tag"
 	autoload :TurboIncludeTags, "phlex/rails/helpers/turbo_include_tags"
+	autoload :TurboRefreshesWith, "phlex/rails/helpers/turbo_refreshes_with"
 	autoload :TurboRefreshMethodTag, "phlex/rails/helpers/turbo_refresh_method_tag"
 	autoload :TurboRefreshScrollTag, "phlex/rails/helpers/turbo_refresh_scroll_tag"
-	autoload :TurboRefreshesWith, "phlex/rails/helpers/turbo_refreshes_with"
 	autoload :TurboStream, "phlex/rails/helpers/turbo_stream"
 	autoload :TurboStreamFrom, "phlex/rails/helpers/turbo_stream_from"
 	autoload :URLField, "phlex/rails/helpers/url_field"
@@ -194,56 +194,10 @@ module Phlex::Rails::Helpers
 	autoload :VideoPath, "phlex/rails/helpers/video_path"
 	autoload :VideoTag, "phlex/rails/helpers/video_tag"
 	autoload :VideoURL, "phlex/rails/helpers/video_url"
-	autoload :WeekField, "phlex/rails/helpers/week_field"
-	autoload :WeekFieldTag, "phlex/rails/helpers/week_field_tag"
 	autoload :WeekdayOptionsForSelect, "phlex/rails/helpers/weekday_options_for_select"
 	autoload :WeekdaySelect, "phlex/rails/helpers/weekday_select"
+	autoload :WeekField, "phlex/rails/helpers/week_field"
+	autoload :WeekFieldTag, "phlex/rails/helpers/week_field_tag"
 	autoload :WithOutputBuffer, "phlex/rails/helpers/with_output_buffer"
 	autoload :WordWrap, "phlex/rails/helpers/word_wrap"
-
-	DEPRECATED = {
-		Checkbox: :CheckBox,
-		CheckboxTag: :CheckBoxTag,
-		CollectionCheckboxes: :CollectionCheckBoxes,
-		DateTimeField: :DatetimeField,
-		PathToJavaScript: :PathToJavascript,
-		DateTimeFieldTag: :DatetimeFieldTag,
-		DateTimeLocalField: :DatetimeLocalField,
-		DateTimeLocalFieldTag: :DatetimeLocalFieldTag,
-		DateTimeSelect: :DatetimeSelect,
-		JavaScriptImportModuleTag: :JavascriptImportModuleTag,
-		JavaScriptImportMapTags: :JavascriptImportmapTags,
-		JavaScriptIncludeTag: :JavascriptIncludeTag,
-		JavaScriptPath: :JavascriptPath,
-		JavaScriptTag: :JavascriptTag,
-		JavaScriptURL: :JavascriptURL,
-		LinkIf: :LinkToIf,
-		PathToStyleSheet: :PathToStylesheet,
-		SanitizeCss: :SanitizeCSS,
-		SelectDateTime: :SelectDatetime,
-		StyleSheetLinkTag: :StylesheetLinkTag,
-		StyleSheetPath: :StylesheetPath,
-		StyleSheetURL: :StylesheetURL,
-		URLToJavaScript: :URLToJavascript,
-		URLToStyleSheet: :URLToStylesheet,
-	}
-
-	def self.const_missing(name)
-		if (helper_module_name = DEPRECATED[name])
-			message = "`Phlex::Rails::Helpers::#{name}` is deprecated. Please use `Phlex::Rails::Helpers::#{helper_module_name}` instead."
-
-			if name.to_s.downcase == helper_module_name.to_s.downcase
-				message << " Note the casing of the module name has changed to match the helper method."
-			end
-
-			Phlex::Rails::Deprecation.warn(message)
-
-			helper_module = const_get(helper_module_name)
-			const_set(name, helper_module)
-
-			helper_module
-		else
-			super
-		end
-	end
 end

lib/phlex/rails/helpers/translate.rb

@@ -15,10 +15,10 @@ def self.included(base)
 		base.extend(ClassMethods)
 	end
 
-	def translate(key, **options)
+	def translate(key, **)
 		key = "#{self.class.translation_path}#{key}" if key.start_with?(".")
 
-		helpers.t(key, **options)
+		helpers.t(key, **)
 	end
 
 	alias_method :t, :translate

lib/phlex/rails/html.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module Phlex::Rails::HTML
-	autoload :MethodMissing, "phlex/rails/html/method_missing"
-
 	module Format
 		def format
 			:html

lib/phlex/rails/layout.rb

@@ -18,8 +18,8 @@ module Layout
 
 		# @api private
 		module Interface
-			def render(view_context, _locals, &block)
-				new.render(view_context, &block)
+			def render(view_context, _locals, &)
+				new.render(view_context, &)
 			end
 
 			def identifier
@@ -49,7 +49,7 @@ def render(view_context, *args, **kwargs, &block)
 			if @_context
 				super
 			else
-				call(view_context: view_context) do |yielded|
+				call(view_context:) do |yielded|
 					case yielded
 					when Symbol
 						output = view_context.view_flow.get(yielded)

lib/phlex/rails/sgml.rb

@@ -11,14 +11,14 @@ def render_in(...)
 
 			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
 					end
 				end
 
-				def render(*args, **kwargs, &block)
+				def render(*args, **, &block)
 					renderable = args[0]
 
 					case renderable
@@ -27,18 +27,18 @@ def render(*args, **kwargs, &block)
 					when Class
 						return super if renderable < Phlex::SGML
 					when Enumerable
-						return super unless renderable.is_a?(ActiveRecord::Relation)
+						return super unless ActiveRecord::Relation === renderable
 					else
 						if block
-							@_context.target << @_view_context.render(*args, **kwargs) do |*yielded_args|
+							@_context.target << @_view_context.render(*args, **) 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
-							@_context.target << @_view_context.render(*args, **kwargs)
+							@_context.target << @_view_context.render(*args, **)
 						end
 					end
 
@@ -51,12 +51,13 @@ def render_in(view_context, &block)
 					end
 
 					if block_given?
-						call(view_context: view_context, fragments: fragments) do |*args|
+						call(view_context:, 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
+									Phlex::Rails::Unbuffered.new(args[0]),
+									&block
 								)
 							else
 								output = view_context.capture(*args, &block)
@@ -72,7 +73,7 @@ def render_in(view_context, &block)
 							end
 						end.html_safe
 					else
-						call(view_context: view_context, fragments: fragments).html_safe
+						call(view_context:, fragments:).html_safe
 					end
 				end