phlex 0.3.1 → 0.4.0

data/lib/phlex/rails/helpers.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Rails
+		module Helpers
+			module CSPMetaTag
+				def csp_meta_tag(**options)
+					if (output = @_view_context.csp_meta_tag(**options))
+						@_target << output
+					end
+				end
+			end
+
+			module CSRFMetaTags
+				def csrf_meta_tags
+					if (output = @_view_context.csrf_meta_tags)
+						@_target << output
+					end
+				end
+			end
+
+			module ActionCableMetaTag
+				def action_cable_meta_tag
+					if (output = @_view_context.action_cable_meta_tag)
+						@_target << output
+					end
+				end
+			end
+
+			module FormWith
+				def form_with(*args, **kwargs, &block)
+					raw @_view_context.form_with(*args, **kwargs) { |form|
+						capture do
+							yield(
+								Phlex::Buffered.new(form, buffer: @_target)
+							)
+						end
+					}
+				end
+			end
+
+			module StylesheetLinkTag
+				def stylesheet_link_tag(*sources)
+					if (output = @_view_context.stylesheet_link_tag(*sources))
+						@_target << output
+					end
+				end
+			end
+
+			module FaviconLinkTag
+				def favicon_link_tag(*args)
+					if (output = @_view_context.favicon_link_tag(*args))
+						@_target << output
+					end
+				end
+			end
+
+			module PreloadLinkTag
+				def preload_link_tag(*args)
+					if (output = @_view_context.preload_link_tag(*args))
+						@_target << output
+					end
+				end
+			end
+
+			module JavaScriptIncludeTag
+				def javascript_include_tag(*sources)
+					if (output = @_view_context.javascript_include_tag(*sources))
+						@_target << output
+					end
+				end
+			end
+
+			module ContentFor
+				def content_for(slot, &block)
+					@_view_context.content_for(slot, capture(&block))
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/layout.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Rails
+		module Layout
+			include Helpers::CSPMetaTag
+			include Helpers::CSRFMetaTags
+			include Helpers::FaviconLinkTag
+			include Helpers::PreloadLinkTag
+			include Helpers::StylesheetLinkTag
+			include Helpers::ActionCableMetaTag
+			include Helpers::JavaScriptIncludeTag
+		end
+	end
+end

data/lib/phlex/table.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Table
+		include Collection
+
+		module ClassMethods
+			attr_accessor :header
+
+			def property(header = nil, **attributes, &body)
+				if header.is_a?(String)
+					header_text = header
+					header = -> { head_header(scope: "col") { header_text } }
+				end
+
+				properties << {
+					header: header,
+					body: body,
+					attributes: attributes,
+				}
+			end
+
+			def properties
+				@properties ||= []
+			end
+		end
+
+		def self.included(child)
+			child.extend ClassMethods
+
+			child.alias_method :head, :thead
+			child.alias_method :body, :tbody
+			child.alias_method :foot, :tfoot
+
+			child.alias_method :row, :tr
+
+			child.alias_method :header, :th
+			child.alias_method :cell, :td
+
+			child.alias_method :head_row, :row
+			child.alias_method :body_row, :row
+			child.alias_method :foot_row, :row
+
+			child.alias_method :head_header, :header
+			child.alias_method :foot_header, :header
+
+			child.alias_method :head_cell, :cell
+			child.alias_method :body_cell, :cell
+			child.alias_method :foot_cell, :cell
+		end
+
+		private
+
+		def properties
+			self.class.properties
+		end
+
+		def collection_template(&block)
+			table do
+				head_template
+				body_template(&block)
+				foot_template
+			end
+		end
+
+		def item_template
+			row_template
+		end
+
+		def head_template
+			if self.class.properties.any? { |p| p[:header] }
+				head do
+					head_row do
+						self.class.properties.each do |property|
+							case property[:header]
+							when Proc
+								instance_exec(&property[:header])
+							when Symbol
+								send(property[:header])
+							end
+						end
+					end
+				end
+			end
+		end
+
+		def body_template
+			body { yield_items }
+		end
+
+		def foot_template
+		end
+
+		def row_template
+			body_row do
+				self.class.properties.each do |property|
+					body_cell(**property[:attributes]) do
+						instance_exec(@item, &property[:body])
+					end
+				end
+			end
+		end
+	end
+end

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "0.3.1"
+	VERSION = "0.4.0"
 end

data/lib/phlex/view.rb

@@ -97,8 +97,8 @@ module Phlex
 			nil
 		end
 
-		def raw(content)
-			@_target << content
+		def raw(content = nil, &block)
+			@_target << (content || instance_exec(&block))
 			nil
 		end
 
@@ -144,7 +144,13 @@ module Phlex
 		end
 
 		def classes(*tokens, **conditional_tokens)
-			{ class: self.tokens(*tokens, **conditional_tokens) }
+			tokens = self.tokens(*tokens, **conditional_tokens)
+
+			if tokens.present?
+				{ class: tokens }
+			else
+				{}
+			end
 		end
 
 		def tokens(*tokens, **conditional_tokens)
@@ -159,7 +165,7 @@ module Phlex
 				case token
 				when Symbol then tokens << token.name
 				when String then tokens << token
-				when Array then tokens.concat(t)
+				when Array then tokens.concat(token)
 				else raise ArgumentError,
 					"Conditional classes must be Symbols, Strings, or Arrays of Symbols or Strings."
 				end

data/lib/phlex.rb

@@ -6,6 +6,7 @@ require "syntax_tree"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/generators")
+loader.ignore("#{__dir__}/install")
 loader.inflector.inflect("html" => "HTML")
 loader.inflector.inflect("vcall" => "VCall")
 loader.inflector.inflect("fcall" => "FCall")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 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-09-30 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 description: A high-performance view framework optimised for developer happiness.
 email:
 - joel@drapper.me
@@ -52,6 +66,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
+- Procfile.dev
 - README.md
 - Rakefile
 - SECURITY.md
@@ -62,26 +77,45 @@ files:
 - docs/build.rb
 - docs/components/callout.rb
 - docs/components/code_block.rb
+- docs/components/code_span.rb
 - docs/components/example.rb
 - docs/components/heading.rb
 - docs/components/layout.rb
 - docs/components/markdown.rb
+- docs/components/nav.rb
+- docs/components/nav/item.rb
 - docs/components/tabs.rb
 - docs/components/tabs/tab.rb
 - docs/components/title.rb
 - docs/page_builder.rb
 - docs/pages/application_page.rb
+- docs/pages/helpers.rb
 - docs/pages/index.rb
+- docs/pages/library/collections.rb
+- docs/pages/rails/getting_started.rb
+- docs/pages/rails/helpers.rb
+- docs/pages/rails/layouts.rb
+- docs/pages/rails/migrating.rb
+- docs/pages/rails/rendering_views.rb
 - docs/pages/rails_integration.rb
 - docs/pages/templates.rb
 - docs/pages/views.rb
 - fixtures/compilation/vcall.rb
 - fixtures/dummy/app/assets/config/manifest.js
+- fixtures/dummy/app/components/comment_component.html.erb
+- fixtures/dummy/app/components/comment_component.rb
+- fixtures/dummy/app/components/reaction_component.html.erb
+- fixtures/dummy/app/components/reaction_component.rb
 - fixtures/dummy/app/controllers/articles_controller.rb
+- fixtures/dummy/app/controllers/comments_controller.rb
 - 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/card.rb
+- fixtures/dummy/app/views/comments/comment.rb
+- fixtures/dummy/app/views/comments/index.html.erb
+- fixtures/dummy/app/views/comments/reaction.rb
+- fixtures/dummy/app/views/comments/show.html.erb
 - fixtures/dummy/app/views/heading.rb
 - fixtures/dummy/config/database.yml
 - fixtures/dummy/config/routes.rb
@@ -93,6 +127,18 @@ files:
 - fixtures/page.rb
 - fixtures/test_helper.rb
 - fixtures/view_helper.rb
+- lib/generators/phlex/collection/USAGE
+- lib/generators/phlex/collection/collection_generator.rb
+- lib/generators/phlex/collection/templates/collection.rb.erb
+- lib/generators/phlex/layout/USAGE
+- lib/generators/phlex/layout/layout_generator.rb
+- lib/generators/phlex/layout/templates/layout.rb.erb
+- lib/generators/phlex/page/USAGE
+- lib/generators/phlex/page/page_generator.rb
+- lib/generators/phlex/page/templates/page.rb.erb
+- lib/generators/phlex/table/USAGE
+- lib/generators/phlex/table/table_generator.rb
+- lib/generators/phlex/table/templates/table.rb.erb
 - lib/generators/phlex/view/USAGE
 - lib/generators/phlex/view/templates/view.rb.erb
 - lib/generators/phlex/view/view_generator.rb
@@ -101,6 +147,7 @@ files:
 - lib/phlex.rb
 - lib/phlex/block.rb
 - lib/phlex/buffered.rb
+- lib/phlex/collection.rb
 - lib/phlex/compiler.rb
 - lib/phlex/compiler/formatter.rb
 - lib/phlex/compiler/generators/standard_element.rb
@@ -114,8 +161,10 @@ files:
 - lib/phlex/configuration.rb
 - lib/phlex/engine.rb
 - lib/phlex/html.rb
-- lib/phlex/rails/tag_helpers.rb
+- lib/phlex/rails/helpers.rb
+- lib/phlex/rails/layout.rb
 - lib/phlex/renderable.rb
+- lib/phlex/table.rb
 - lib/phlex/version.rb
 - lib/phlex/view.rb
 - lib/tasks/phlex_tasks.rake

data/lib/phlex/rails/tag_helpers.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Rails
-		module TagHelpers
-			def form_with(*args, **kwargs, &block)
-				raw @_view_context.form_with(*args, **kwargs) { |form|
-					capture do
-						yield(
-							Phlex::Buffered.new(form, buffer: @_target)
-						)
-					end
-				}
-			end
-
-			def csp_meta_tag
-				if (output = @_view_context.csp_meta_tag)
-					@_target << output
-				end
-			end
-
-			def csrf_meta_tags
-				if (output = @_view_context.csrf_meta_tags)
-					@_target << output
-				end
-			end
-		end
-	end
-end