phlex-rails 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79356655cf4e2bc12cd4cdfcca54c1c5e5a22b1ec9990216bb0a447b0049f4e
-  data.tar.gz: f3649f01f6cb2184a0171fbda687e4bc84293a5bfacfbea6177d187603dece4a
+  metadata.gz: 1c05b7f36804eb576eb2c017a8566e6e15e9dfdc96a80bffe566d6fe1bf90edf
+  data.tar.gz: 901dbd435636eb4823cacfef7b42b0281165ad7f4cae0553a070d8592270637b
 SHA512:
-  metadata.gz: 3839e661932161404c5442f6a26d8395e8caeef8148b7ae77f4b302fac017271c18836e9bbe2624e7443714793a0669871997fd69b46adf8c0be48b969338ef3
-  data.tar.gz: 3ca6bc3e0b688591d4fb40e7918fbfd5d6d887ac076bdee1af58c0f4d3343e22f84a61d4d0e5b2390ce23eaedbb7f4dda51394e4b12c23e1536a12e5a822dcb7
+  metadata.gz: 58dba0d9f85f66d2b0b8d9a72f211aa685e150bb62646330dcfce230d36fec088f4dd1b81125a23104bf2cfee9d80d1d01e23c240406478df0c15289e3189033
+  data.tar.gz: 1ca4bed35a09f31065fb08cf1905942a2f5e6ac468b7a66d5589666957a50361af6269efa2eaf20259fd861efac92884edb2455a111ca83076aa606af1e6f83e

data/Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem "phlex", github: "joeldrapper/phlex"
+gem "phlex", github: "joeldrapper/phlex", branch: "main"
 gem "sus"
 gem "combustion"
 gem "rubocop"

data/config/sus.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require "phlex/rails"
+
+Zeitwerk::Loader.eager_load_all

data/fixtures/dummy/app/views/articles/blog.html.erb

@@ -0,0 +1,14 @@
+<%= render Views::Blog.new do |v| %>
+
+  hidden
+
+  <% v.with_post do %><%= link_to "First Post", "/posts/1" %><% end %>
+
+  content
+
+  <% v.with_header do %><%= link_to "My blog", "/" %><% end %>
+
+  here
+
+  <% v.with_post do %><%= link_to "Last Post", "/posts/2" %><% end %>
+<% end %>

data/fixtures/dummy/app/views/blog.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Views
+	class Blog < ApplicationView
+		def initialize
+			@posts = []
+		end
+
+		def template(&block)
+			capture(&block)
+
+			h3(class: "font-bold") { @header }
+
+			@posts.each do |post|
+				article(class: "drop-shadow p-5 rounded") { post }
+			end
+		end
+
+		def with_header(&block)
+			@header = capture(&block)
+		end
+
+		def with_post(&block)
+			@posts << capture(&block)
+		end
+	end
+end

data/lib/phlex/rails/helpers.rb

@@ -92,6 +92,30 @@ module Phlex
 				end
 			end
 
+			module ImageTag
+				def image_tag(*args)
+					if (output = @_view_context.image_tag(*args))
+						@_target << output
+					end
+				end
+			end
+
+			module AudioTag
+				def audio_tag(*args)
+					if (output = @_view_context.audio_tag(*args))
+						@_target << output
+					end
+				end
+			end
+
+			module VideoTag
+				def video_tag(*args)
+					if (output = @_view_context.video_tag(*args))
+						@_target << output
+					end
+				end
+			end
+
 			module PreloadLinkTag
 				def preload_link_tag(*args)
 					if (output = @_view_context.preload_link_tag(*args))

data/lib/phlex/rails/renderable.rb

@@ -19,7 +19,7 @@ module Phlex
 			def render_in(view_context, &block)
 				if block_given?
 					call(view_context: view_context) do |*args|
-						view_context.with_output_buffer(OutputBuffer.new(@_target)) do
+						view_context.with_output_buffer(self) do
 							original_length = @_target.length
 							output = yield(*args)
 							unchanged = (original_length == @_target.length)
@@ -37,6 +37,34 @@ module Phlex
 					call(view_context: view_context).html_safe
 				end
 			end
+
+			def safe_append=(value)
+				return unless value
+
+				@_target << 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
+					@_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
+				end
+			end
+
+			def capture
+				super.html_safe
+			end
 		end
 	end
 end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.3.1"
+		VERSION = "0.4.0"
 	end
 end

data/lib/phlex/rails.rb

@@ -4,8 +4,9 @@ require "phlex"
 require "phlex/rails/engine"
 
 module Phlex::Rails
-	Loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false).tap do |loader|
+	Loader = Zeitwerk::Loader.new.tap do |loader|
 		loader.push_dir("#{__dir__}/rails", namespace: Phlex::Rails)
+		loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
 		loader.setup
 	end
 

data/lib/phlex/testing/{rails.rb → rails/view_helper.rb}

@@ -5,7 +5,7 @@ require "phlex/testing/view_helper"
 module Phlex::Testing
 	module Rails
 		module ViewHelper
-			include Phlex::Testing::ViewHelper
+			include ::Phlex::Testing::ViewHelper
 
 			def view_context
 				controller.view_context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -80,6 +80,7 @@ files:
 - LICENSE.txt
 - README.md
 - SECURITY.md
+- config/sus.rb
 - fixtures/dummy/app/assets/config/manifest.js
 - fixtures/dummy/app/components/comment_component.html.erb
 - fixtures/dummy/app/components/comment_component.rb
@@ -88,9 +89,11 @@ files:
 - fixtures/dummy/app/controllers/articles_controller.rb
 - fixtures/dummy/app/controllers/comments_controller.rb
 - fixtures/dummy/app/views/application_view.rb
+- fixtures/dummy/app/views/articles/blog.html.erb
 - fixtures/dummy/app/views/articles/form.rb
 - fixtures/dummy/app/views/articles/index.html.erb
 - fixtures/dummy/app/views/articles/new.html.erb
+- fixtures/dummy/app/views/blog.rb
 - fixtures/dummy/app/views/card.rb
 - fixtures/dummy/app/views/comments/comment.rb
 - fixtures/dummy/app/views/comments/index.html.erb
@@ -135,10 +138,9 @@ files:
 - 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
+- lib/phlex/testing/rails/view_helper.rb
 - lib/tasks/phlex_tasks.rake
 - phlex_logo.png
 homepage: https://www.phlex.fun

data/lib/phlex/rails/output_buffer.rb

@@ -1,33 +0,0 @@
-# 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