phlex-rails 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef3316773401cb9a664f24dfaf751f282bdceafc22db5d5aa59173d96b0794c
-  data.tar.gz: 253849ceeeb4af1c1a3dd673c6e862cb17f8b1c3a13695556ccfc5b8d2855ce0
+  metadata.gz: d270dd49cf94953641c2f7987f05c3a4904b3e6c39983884b6c6dca60bd89a78
+  data.tar.gz: ee571c67532384b55c641777c42d295820f3ec00b5a48fb8bb3b331f3539009d
 SHA512:
-  metadata.gz: 5e3cedfb00ab5762f2ffeeecf66e59a28dd8eac55d44272521c3c4094f0bd66d41d6a64925242cf429678417e87c536d644b3da0ebc0a566900665fb8863e894
-  data.tar.gz: a88ea4826134ece2cda7cfae473e362dc1571822a4e27865e99b695bbdcf5bf2cd4d745334d6a1927a10cd463c7ccac54244af99d7255be6b28a144b5f6020e3
+  metadata.gz: b8bdc497af4542412f8addfda2b7cdb3602448df6867010a2352d7ed66e862073eb3cce54167ddf1cda8d8f7ad5a7f528f6a90987ad51107987fe7dcced8074b
+  data.tar.gz: 597a9cd87505991851beeaa69a3c41453b476a0e4d7b5709d8a3b6c9ab7ddd5df5b50bfe2a673c6c9ec62ba5c0bc2aa822315f8be5dec62cbf1e96fc9bcd8b8c

data/lib/generators/phlex/controller/controller_generator.rb

@@ -5,9 +5,19 @@ module Phlex
 		class ControllerGenerator < ::Rails::Generators::NamedBase # :nodoc:
 			source_root File.expand_path("templates", __dir__)
 
-			argument :actions, type: :array, default: [], banner: "action action"
-			class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb."
-			class_option :parent, type: :string, default: "ApplicationController", desc: "The parent class for the generated controller"
+			argument :actions,
+				type: :array,
+				default: [],
+				banner: "action action"
+
+			class_option :skip_routes,
+				type: :boolean,
+				desc: "Don't add routes to config/routes.rb."
+
+			class_option :parent,
+				type: :string,
+				default: "ApplicationController",
+				desc: "The parent class for the generated controller"
 
 			check_class_collision suffix: "Controller"
 
@@ -20,15 +30,19 @@ module Phlex
 				empty_directory base_path
 
 				actions.each do |action|
-					Rails::Generators.invoke("phlex:view", [remove_possible_suffix(name) + "/" + action])
+					::Rails::Generators.invoke("phlex:page", [name + "/" + action])
 				end
 			end
 
 			def add_routes
 				return if options[:skip_routes]
-				return if actions.empty?
 
-				routing_code = actions.map { |action| "get '#{file_name}/#{action}'" }.join("\n")
+				routing_code = "resources :#{file_name}"
+
+				if actions.any?
+					routing_code << ", only: [#{actions.map { ":#{_1}" }.join(', ')}]"
+				end
+
 				route routing_code, namespace: regular_class_path
 			end
 
@@ -43,7 +57,11 @@ module Phlex
 			end
 
 			def file_name
-				@_file_name ||= remove_possible_suffix(super)
+				remove_possible_suffix(super)
+			end
+
+			def name
+				remove_possible_suffix(super)
 			end
 
 			def remove_possible_suffix(name)

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

@@ -17,7 +17,7 @@ module Phlex
 				::Rails.root.join("app/views/layout.rb").exist?
 			end
 
-			hook_for :test_framework
+			# hook_for :test_framework
 		end
 	end
 end

data/lib/phlex/rails/output_buffer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module Phlex
+	module Rails
+		class OutputBuffer < SimpleDelegator
+			def safe_append=(value)
+				return unless value
+
+				self << case value
+					when String then value
+					when Symbol then value.name
+					else value.to_s
+				end
+			end
+
+			def append=(value)
+				return unless value
+
+				if value.html_safe?
+					self.safe_append = value
+				else
+					self << case value
+						when String then CGI.escape_html(value)
+						when Symbol then CGI.escape_html(value.name)
+						else CGI.escape_html(value.to_s)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/renderable.rb

@@ -17,18 +17,25 @@ module Phlex
 			end
 
 			def render_in(view_context, &block)
-				output_buffer = view_context.output_buffer
-
-				# Since https://github.com/rails/rails/pull/45731
-				if output_buffer.respond_to?(:raw_buffer)
-					buffer = output_buffer.raw_buffer
+				if block_given?
+					call(view_context: view_context) do |*args|
+						view_context.with_output_buffer(OutputBuffer.new(@_target)) do
+							original_length = @_target.length
+							output = yield(*args)
+							unchanged = (original_length == @_target.length)
+
+							if unchanged
+								if output.is_a?(ActiveSupport::SafeBuffer)
+									unsafe_raw(output)
+								else
+									text(output)
+								end
+							end
+						end
+					end.html_safe
 				else
-					buffer = Buffer.new(output_buffer)
+					call(view_context: view_context).html_safe
 				end
-
-				call(buffer, view_context: view_context, &block)
-
-				nil
 			end
 		end
 	end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.2.0"
+		VERSION = "0.2.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -125,11 +125,11 @@ files:
 - lib/install/phlex.rb
 - lib/phlex-rails.rb
 - lib/phlex/rails.rb
-- lib/phlex/rails/buffer.rb
 - lib/phlex/rails/engine.rb
 - lib/phlex/rails/form.rb
 - lib/phlex/rails/helpers.rb
 - lib/phlex/rails/layout.rb
+- lib/phlex/rails/output_buffer.rb
 - lib/phlex/rails/renderable.rb
 - lib/phlex/rails/version.rb
 - lib/phlex/testing/rails.rb

data/lib/phlex/rails/buffer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Rails
-		# A wrapper for Rails’ OutputBuffer that acts like a Phlex buffer.
-
-		class Buffer < SimpleDelegator
-			def <<(value)
-				__getobj__.safe_append = (value)
-				self
-			end
-
-			def length
-				__getobj__.length
-			end
-		end
-	end
-end