phlex-rails 1.2.1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b219be78b50160aa9712bfec6ff25b59c33f512087cda4ee027a1f0f39ff05
-  data.tar.gz: 55c366bb60dc4f5bb343317e9c948642fb5121d9e3ec65372392c2b5a751fe81
+  metadata.gz: 884bb8de02703c59d0756050a402a853af780a4c9bc37805483d3446b17acdb2
+  data.tar.gz: de4bd44c31da7580ec9c158d1d004b03c3be89b419b78abc5c6eb9b67b97e1c0
 SHA512:
-  metadata.gz: 65519c2590bff066155afb33418089c948a4fb7dbdceb9cdfbaac5a2d88a4fa2a86432b19ba9b6f42af8578d84e7469bde1cd66137f572ca84d691031f91de27
-  data.tar.gz: cc3773ccad8dc3bfcc4a3267cc1c78189560e93d0bff31e1930d4cafb036724483f17e4923dc13acbcf3d50b2baa7d92da7f6f694205066bfc3860668983c5bc
+  metadata.gz: 20f911fd5441cbca7281b63c94b4d1f3ef8b604c88550b5e0b1c4889eab9286f827430a7e05cd35b3be8c49d9d0679f781c33ee8d0e7a6d8bdfbf3676d3a54bd
+  data.tar.gz: 0a096db9f03bc6164b5cf951128a2b751d2de052588aea26f1a8c82a36d125798c198fbd32b06ebce2e0b6c65c52158f8d17e0d61586408307cd98808266e84b

data/lib/generators/phlex/component/USAGE

@@ -1,8 +1,8 @@
 Description:
-  Generates a Phlex component with the given name
+  Generates a new Phlex component
 
 Example:
   rails generate phlex:component Sidebar
 
 This will create:
-  app/views/components/sidebar_component.rb
+  app/components/sidebar.rb

data/lib/generators/phlex/component/component_generator.rb

@@ -5,7 +5,7 @@ module Phlex::Generators
 		source_root File.expand_path("templates", __dir__)
 
 		def create_view
-			@path = File.join("app/views/components", class_path, "#{file_name}_component.rb")
+			@path = File.join("app/components", class_path, "#{file_name}.rb")
 			template "component.rb.erb", @path
 		end
 	end

data/lib/generators/phlex/component/templates/component.rb.erb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-<% module_namespacing do -%>
-class <%= class_name %>Component < ApplicationComponent
+class Components::<%= class_name %> < Components::Base
   def view_template
     h1 { "<%= class_name %>" }
     p { "Find me in <%= @path %>" }
   end
-end<% end %>
+end

data/lib/generators/phlex/install/USAGE

@@ -5,4 +5,6 @@ Example:
   rails generate phlex:install
 
 This will create:
-  app/views/application_view.rb
+  app/views/base.rb
+  app/components/base.rb
+	app/initializers/phlex.rb

data/lib/generators/phlex/install/install_generator.rb

@@ -5,56 +5,46 @@ module Phlex::Generators
 		source_root File.expand_path("templates", __dir__)
 
 		APPLICATION_CONFIGURATION_PATH = Rails.root.join("config/application.rb")
-		TAILWIND_CONFIGURATION_PATH = Rails.root.join("tailwind.config.js")
 
-		def autoload_components
-			return unless APPLICATION_CONFIGURATION_PATH.exist?
-
-			inject_into_class(
-				APPLICATION_CONFIGURATION_PATH,
-				"Application",
-				%(    config.autoload_paths << "\#{root}/app/views/components"\n)
-			)
+		def configure_tailwind
+			if tailwind_configuration_path
+				insert_into_file tailwind_configuration_path, after: "content: [" do
+					"\n    './app/views/**/*.rb', // Phlex views" \
+						"\n    './app/components/**/*.rb', // Phlex components" \
+				end
+			end
 		end
 
-		def autoload_layouts
-			return unless APPLICATION_CONFIGURATION_PATH.exist?
-
-			inject_into_class(
-				APPLICATION_CONFIGURATION_PATH,
-				"Application",
-				%(    config.autoload_paths << "\#{root}/app/views/layouts"\n)
-			)
+		def create_application_component
+			template "base_component.rb.erb", Rails.root.join("app/components/base.rb")
 		end
 
-		def autoload_views
-			return unless APPLICATION_CONFIGURATION_PATH.exist?
-
-			inject_into_class(
-				APPLICATION_CONFIGURATION_PATH,
-				"Application",
-				%(    config.autoload_paths << "\#{root}/app/views"\n)
-			)
+		def create_application_view
+			template "base_view.rb.erb", Rails.root.join("app/views/base.rb")
 		end
 
-		def configure_tailwind
-			return unless TAILWIND_CONFIGURATION_PATH.exist?
-
-			insert_into_file TAILWIND_CONFIGURATION_PATH, after: "content: [" do
-				"\n    './app/views/**/*.rb'," \
-			end
+		def create_initializer
+			template "phlex.rb.erb", Rails.root.join("config/initializers/phlex.rb")
 		end
 
-		def create_application_component
-			template "application_component.rb", Rails.root.join("app/views/components/application_component.rb")
-		end
+		private
 
-		def create_application_layout
-			template "application_layout.rb", Rails.root.join("app/views/layouts/application_layout.rb")
+		def tailwind_configuration_path
+			if tailwind_configuration_files.any?
+				Pathname.new(
+					tailwind_configuration_files.first,
+				)
+			end
 		end
 
-		def create_application_view
-			template "application_view.rb", Rails.root.join("app/views/application_view.rb")
+		def tailwind_configuration_files
+			Dir.glob(
+				[
+					"#{Rails.root}/tailwind.config.js",
+					"#{Rails.root}/app/**/tailwind.config.js",
+					"#{Rails.root}/config/**/tailwind.config.js",
+				],
+			)
 		end
 	end
 end

data/lib/generators/phlex/install/templates/base_component.rb.erb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Components::Base < Phlex::HTML
+  include Components
+
+  # Include any helpers you want to be available across all components
+  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/base_view.rb.erb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Views::Base < Components::Base
+  # 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

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Views
+end
+
+module Components
+  extend Phlex::Kit
+end
+
+Rails.autoloaders.main.push_dir(
+  "#{Rails.root}/app/views", namespace: Views
+)
+
+Rails.autoloaders.main.push_dir(
+  "#{Rails.root}/app/components", namespace: Components
+)

data/lib/generators/phlex/view/USAGE

@@ -5,4 +5,4 @@ Example:
   rails generate phlex:view Articles::Index
 
 This will create:
-  app/views/articles/index_view.rb
+  app/views/articles/index.rb

data/lib/generators/phlex/view/templates/view.rb.erb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-<% module_namespacing do -%>
-class <%= class_name %>View < ApplicationView
+class Views::<%= "#{namespace}::" if namespaced? %><%= class_name %> < Views::Base
   def view_template
     h1 { "<%= class_name %>" }
     p { "Find me in <%= @path %>" }
   end
-end<% end %>
+end

data/lib/generators/phlex/view/view_generator.rb

@@ -5,7 +5,7 @@ module Phlex::Generators
 		source_root File.expand_path("templates", __dir__)
 
 		def create_view
-			@path = File.join("app/views", class_path, "#{file_name}_view.rb")
+			@path = File.join("app/views", class_path, "#{file_name}.rb")
 			template "view.rb.erb", @path
 		end
 	end

data/lib/phlex/rails/buffered.rb

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

data/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

data/lib/phlex/rails/engine.rb

@@ -4,7 +4,6 @@ require "rails/engine"
 
 module Phlex
 	module Rails
-		# @api private
 		class Engine < ::Rails::Engine
 		end
 	end

data/lib/phlex/rails/{html/method_missing.rb → 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)
 
@@ -8,6 +8,6 @@ module Phlex::Rails::HTML::MethodMissing
 		module_name = Phlex::Rails::Helpers.constants.find { |mod| mod.to_s.underscore.gsub("domid", "dom_id") == const_name }
 		return super unless module_name
 
-		raise NoMethodError, "Try including `Phlex::Rails::Helpers::#{module_name}` in #{self.class.name}."
+		raise NoMethodError.new("Try including `Phlex::Rails::Helpers::#{module_name}` in #{self.class.name}.")
 	end
 end

data/lib/phlex/rails/helper_macros.rb

@@ -16,12 +16,7 @@ module Phlex::Rails::HelperMacros
 					helpers.#{method_name}(*args, **kwargs)
 				end
 
-				case output
-				when ActiveSupport::SafeBuffer
-					@_context.target << output
-				end
-
-				nil
+				raw(output)
 			end
 		RUBY
 	end
@@ -63,12 +58,7 @@ module Phlex::Rails::HelperMacros
 					helpers.#{method_name}(*args, **kwargs)
 				end
 
-				case output
-				when ActiveSupport::SafeBuffer
-					@_context.target << output
-				end
-
-				nil
+				raw(output)
 			end
 		RUBY
 	end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Phlex::Rails::Helpers::Notice
+	extend Phlex::Rails::HelperMacros
+
+	# @!method notice(...)
+	register_value_helper :notice
+end

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

@@ -5,6 +5,7 @@ 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 Rails.application.routes.mounted_helpers
 
 		include URLOptions
 		include DefaultURLOptions

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

@@ -10,11 +10,11 @@ module Phlex::Rails::Helpers::Tag
 
 		case result
 		when ActiveSupport::SafeBuffer
-			@_context.target << result
+			@_context.buffer << result
 		when ActionView::Helpers::TagHelper::TagBuilder
 			Phlex::Rails::Buffered.new(
 				result,
-				view: self
+				view: self,
 			)
 		end
 	end

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

@@ -15,10 +15,10 @@ module Phlex::Rails::Helpers::Translate
 		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

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

@@ -8,7 +8,7 @@ module Phlex::Rails::Helpers::TurboStream
 	def turbo_stream(...)
 		Phlex::Rails::Buffered.new(
 			helpers.turbo_stream(...),
-			view: self
+			view: self,
 		)
 	end
 end

data/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"
@@ -93,6 +93,7 @@ module Phlex::Rails::Helpers
 	autoload :MailTo, "phlex/rails/helpers/mail_to"
 	autoload :MonthField, "phlex/rails/helpers/month_field"
 	autoload :MonthFieldTag, "phlex/rails/helpers/month_field_tag"
+	autoload :Notice, "phlex/rails/helpers/notice"
 	autoload :NumberField, "phlex/rails/helpers/number_field"
 	autoload :NumberFieldTag, "phlex/rails/helpers/number_field_tag"
 	autoload :NumberToCurrency, "phlex/rails/helpers/number_to_currency"
@@ -130,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"
@@ -147,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"
@@ -173,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"
@@ -193,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

data/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

data/lib/phlex/rails/layout.rb

@@ -14,11 +14,12 @@ module Phlex::Rails
 		include Helpers::JavascriptImportModuleTag
 		include Helpers::TurboRefreshMethodTag
 		include Helpers::TurboRefreshScrollTag
+		include Helpers::TurboRefreshesWith
 
 		# @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
@@ -38,18 +39,17 @@ module Phlex::Rails
 
 		def self.included(klass)
 			unless klass < Phlex::HTML
-				raise Phlex::ArgumentError,
-					"👋 #{name} should only be included into Phlex::HTML classes."
+				raise Phlex::ArgumentError.new("👋 #{name} should only be included into Phlex::HTML classes.")
 			end
 
 			klass.extend(Interface)
 		end
 
-		def render(view_context, *args, **kwargs, &block)
+		def render(view_context = nil, *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)
@@ -57,7 +57,7 @@ module Phlex::Rails
 						output = view_context.capture(&block)
 					end
 
-					unsafe_raw output
+					raw output
 				end
 			end
 		end