phlex 0.4.0 → 0.5.1

data/fixtures/{test_helper.rb → rails_helper.rb}

@@ -1,16 +1,11 @@
 # frozen_string_literal: true
 
-require "phlex"
-require "bundler"
-require "view_component"
+require "phlex/rails"
 
-Bundler.require :test
+Bundler.require :rails
 
 Combustion.path = "fixtures/dummy"
+
 Combustion.initialize! :action_controller do
 	config.autoload_paths << "#{root}/app"
 end
-
-require "view_helper"
-
-Zeitwerk::Loader.eager_load_all

data/fixtures/standard_element.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Fixtures
+	module StandardElement
+		class WithParens < Phlex::HTML
+			def template
+				h1()
+			end
+		end
+
+		class WithoutParens < Phlex::HTML
+			def template
+				h1
+			end
+		end
+
+		module WithAttributes
+			class WithParens < Phlex::HTML
+				def template
+					h1(class: "font-bold")
+				end
+			end
+
+			class WithoutParens < Phlex::HTML
+				def template
+					h1 class: "font-bold"
+				end
+			end
+		end
+
+		module WithBraceBlock
+			class WithParens < Phlex::HTML
+				def template
+					h1() { "Hi" }
+				end
+			end
+
+			class WithoutParens < Phlex::HTML
+				def template
+					h1 { "Hi" }
+				end
+			end
+
+			class WithAttributes < Phlex::HTML
+				def template
+					h1(class: "font-bold") { "Hi" }
+				end
+			end
+		end
+
+		module WithDoBlock
+			class WithParens < Phlex::HTML
+				def template
+					h1() do
+						"Hi"
+					end
+				end
+			end
+
+			class WithoutParens < Phlex::HTML
+				def template
+					h1 do
+						"Hi"
+					end
+				end
+			end
+
+			module WithAttributes
+				class WithParens < Phlex::HTML
+					def template
+						h1(class: "font-bold") do
+							"Hi"
+						end
+					end
+				end
+
+				class WithoutParens < Phlex::HTML
+					def template
+						h1 class: "font-bold" do
+							"Hi"
+						end
+					end
+				end
+			end
+		end
+	end
+end

data/fixtures/view_helper.rb

@@ -10,7 +10,7 @@ module ViewHelper
 
 	def view(&block)
 		let :view do
-			Class.new(Phlex::View, &block)
+			Class.new(Phlex::HTML, &block)
 		end
 	end
 end

data/fixtures/void_element.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Fixtures
+	module VoidElement
+		class WithParens < Phlex::HTML
+			def template
+				img()
+			end
+		end
+
+		class WithoutParens < Phlex::HTML
+			def template
+				img
+			end
+		end
+
+		module WithAttributes
+			class WithParens < Phlex::HTML
+				def template
+					img(class: "a b c")
+				end
+			end
+
+			class WithoutParens < Phlex::HTML
+				def template
+					img class: "a b c"
+				end
+			end
+		end
+	end
+end

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

@@ -1,6 +1,7 @@
 <% module_namespacing do -%>
 module Views
-  class <%= class_name %> < ApplicationView
+  class <%= class_name %> < Phlex::HTML
+    include ApplicationView
     include Phlex::Collection
 
     def collection_template(&)

data/lib/generators/phlex/controller/USAGE

@@ -0,0 +1,10 @@
+Description:
+  Generates a Rails controller with Phlex views for the supplied actions
+
+Example:
+  rails generate phlex:controller Articles index show
+
+This will create:
+  app/controllers/articles_controller.rb
+  app/views/articles/index.rb
+  app/views/articles/show.rb

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Generators
+		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"
+
+			check_class_collision suffix: "Controller"
+
+			def create_controller_files
+				template "controller.rb.erb", File.join("app/controllers", class_path, "#{file_name}_controller.rb")
+			end
+
+			def copy_view_files
+				base_path = File.join("app/views", class_path, file_name)
+				empty_directory base_path
+
+				actions.each do |action|
+					Rails::Generators.invoke("phlex:view", [remove_possible_suffix(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")
+				route routing_code, namespace: regular_class_path
+			end
+
+			hook_for :test_framework, as: :controller do |generator|
+				invoke generator, [remove_possible_suffix(name), actions]
+			end
+
+			private
+
+			def parent_class_name
+				options[:parent]
+			end
+
+			def file_name
+				@_file_name ||= remove_possible_suffix(super)
+			end
+
+			def remove_possible_suffix(name)
+				name.sub(/_?controller$/i, "")
+			end
+		end
+	end
+end

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

@@ -0,0 +1,10 @@
+<% module_namespacing do -%>
+class <%= class_name %>Controller < <%= parent_class_name.classify %>
+<% actions.each do |action| -%>
+  def <%= action %>
+    render Views::<%= class_name %>::<%= action.camelize %>.new
+  end
+<%= "\n" unless action == actions.last -%>
+<% end -%>
+end
+<% end -%>

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

@@ -0,0 +1,14 @@
+<% module_namespacing do -%>
+module Views
+  class <%= class_name %>::<%= @action.camelize %> < Phlex::HTML
+    include ApplicationView
+
+    def template
+      <%= "# " unless @has_layout %>render Layout.new(title: "<%= class_name.gsub("::", " ").titlecase %> - <%= @action.titlecase %>") do
+        h1 { "<%= class_name %>#<%= @action %>" }
+        p { "Find me in <%= @path %>" }
+      <%= "# " unless @has_layout %>end
+    end
+  end
+end
+<% end %>

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

@@ -1,6 +1,7 @@
 <% module_namespacing do -%>
 module Views
-  class <%= class_name %> < ApplicationView
+  class <%= class_name %> < Phlex::HTML
+    include ApplicationView
     include Phlex::Rails::Layout
 
     def initialize(title:)

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

@@ -1,6 +1,8 @@
 <% module_namespacing do -%>
 module Views
-  class <%= class_name %> < ApplicationView
+  class <%= class_name %> < Phlex::HTML
+    include ApplicationView
+
     def template
       render Layout.new(title: "<%= class_name.gsub("::", " ") %>") do
         h1 { "👋 Hello World!" }

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

@@ -1,7 +1,9 @@
 <% module_namespacing do -%>
 module Views
-  class <%= class_name %> < ApplicationView
+  class <%= class_name %> < Phlex::HTML
+    include ApplicationView
     include Phlex::Table
+
     <% options["properties"].each do |property| %>
     property "<%= property.humanize %>", &:<%= property.underscore %><% end %>
   end

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

@@ -1,7 +1,13 @@
 <% module_namespacing do -%>
 module Views
-  class <%= class_name %> < ApplicationView
+  class <%= class_name %> < Phlex::HTML
+    include ApplicationView
+
     def template
+      <%= "# " unless @layout %>render Layout.new(title: "<%= class_name.gsub("::", " ").titlecase %>") do
+        h1 { "<%= class_name %>" }
+        p { "Find me in <%= @path %>" }
+      <%= "# " unless @layout %>end
     end
   end
 end

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

@@ -6,7 +6,15 @@ module Phlex
 			source_root File.expand_path("templates", __dir__)
 
 			def create_view
-				template "view.rb.erb", File.join("app/views", class_path, "#{file_name}.rb")
+				@layout = layout
+				@path = File.join("app/views", class_path, "#{file_name}.rb")
+				template "view.rb.erb", @path
+			end
+
+			private
+
+			def layout
+				Rails.root.join("app/views/layout.rb").exist?
 			end
 		end
 	end

data/lib/install/phlex.rb

@@ -20,11 +20,20 @@ unless Rails.root.join("app/views/application_view.rb").exist?
 		# frozen_string_literal: true
 
 		module Views
-		  class ApplicationView < Phlex::View
+		  module ApplicationView
 		    include Rails.application.routes.url_helpers
+		    include Phlex::Translation
 		  end
 		end
 	RUBY
 end
 
+tailwind_config_path = Rails.root.join("config/tailwind.config.js")
+
+if tailwind_config_path.exist?
+	insert_into_file tailwind_config_path, after: "content: [" do
+		"\n    './app/views/**/*.rb',"
+	end
+end
+
 say "Phlex successfully installed!"

data/lib/phlex/block.rb

@@ -2,15 +2,13 @@
 
 module Phlex
 	class Block
+		include Callable
+
 		def initialize(context, &block)
 			@context = context
 			@block = block
 		end
 
-		def to_proc
-			method(:call).to_proc
-		end
-
 		def call(*args, **kwargs)
 			@context.instance_exec(*args, **kwargs, &@block)
 		end

data/lib/phlex/buffered.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
 module Phlex
-	class Buffered
+	class Buffered < SimpleDelegator
 		def initialize(object, buffer:)
-			@object, @buffer = object, buffer
+			super(object)
+			@buffer = buffer
 		end
 
-		def method_missing(name, *args, **kwargs, &block)
-			output = @object.public_send(name, *args, **kwargs, &block)
+		# Alias output methods to this
+		def __output_method__(*args, **kwargs, &block)
+			output = __getobj__.public_send(__callee__, *args, **kwargs, &block)
 			@buffer << output if output.is_a? String
 			nil
 		end
-
-		def respond_to_missing?(name)
-			@object.respond_to?(name)
-		end
 	end
 end

data/lib/phlex/callable.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Callable
+		def to_proc
+			method(:call).to_proc
+		end
+	end
+end

data/lib/phlex/collection.rb

@@ -12,11 +12,7 @@ module Phlex
 		end
 
 		def template
-			if @item
-				item_template
-			else
-				collection_template { yield_items }
-			end
+			@item ? item_template : collection_template { yield_items }
 		end
 
 		private
@@ -26,33 +22,12 @@ module Phlex
 				raise ArgumentError, "You can only yield_items when rendering a collection. You are currently rendering an item."
 			end
 
-			@collection.each_with_index do |item, index|
+			@collection.each do |item|
 				@item = item
-				@index = index
-				@position = (index + 1)
-				@first = (index == 0)
-				@last = (@position == @collection.size)
-
 				item_template
 			end
 
 			@item = nil
-			@index = nil
-			@first = nil
-			@last = nil
-			@position = nil
-		end
-
-		def first?
-			raise ArgumentError unless @item
-
-			@first
-		end
-
-		def last?
-			raise ArgumentError unless @item
-
-			@last
 		end
 	end
 end

data/lib/phlex/compiler/elements.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Elements
+	module VCall
+		def format(formatter)
+			Phlex::Compiler::Generators::Element.new(
+				Phlex::Compiler::Nodes::VCall.new(self),
+				formatter: formatter
+			).call
+		end
+	end
+
+	module FCall
+		def format(formatter)
+			Phlex::Compiler::Generators::Element.new(
+				Phlex::Compiler::Nodes::FCall.new(self),
+				formatter: formatter
+			).call
+		end
+	end
+
+	module Command
+		def format(formatter)
+			Phlex::Compiler::Generators::Element.new(
+				Phlex::Compiler::Nodes::Command.new(self),
+				formatter: formatter
+			).call
+		end
+	end
+
+	module MutatingMethodAddBlock
+		def format(formatter)
+			Phlex::Compiler::Generators::Element.new(
+				Phlex::Compiler::Nodes::MethodAddBlock.new(self),
+				formatter: formatter,
+				mutating: true
+			).call
+		end
+	end
+
+	module MethodAddBlock
+		def format(formatter)
+			Phlex::Compiler::Generators::Element.new(
+				Phlex::Compiler::Nodes::MethodAddBlock.new(self),
+				formatter: formatter
+			).call
+		end
+	end
+end

data/lib/phlex/compiler/generators/content.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Phlex
+	class Compiler
+		module Generators
+			class Content
+				def initialize(formatter, content:, mutating: false)
+					@formatter = formatter
+					@content = content
+					@mutating = mutating
+				end
+
+				def call
+					return if nil_value?
+					return bare_string_value if bare_string_value?
+					return symbol_value if symbol_value?
+					return numeric_value if numeric_value?
+					return variable_value if variable_value?
+
+					unknown_value
+				end
+
+				private
+
+				def nil_value?
+					case @content
+					in SyntaxTree::VarRef[value: SyntaxTree::Kw[value: "nil"]]
+						true
+					else
+						false
+					end
+				end
+
+				def bare_string_value?
+					case @content
+					in SyntaxTree::StringLiteral[parts: [SyntaxTree::TStringContent]]
+						true
+					else
+						false
+					end
+				end
+
+				def symbol_value?
+					@content.is_a?(SyntaxTree::SymbolLiteral)
+				end
+
+				def numeric_value?
+					@content.is_a?(SyntaxTree::Int) || @content.is_a?(SyntaxTree::FloatLiteral)
+				end
+
+				def variable_value?
+					@content.is_a?(SyntaxTree::VarRef)
+				end
+
+				def bare_string_value
+					@formatter.append do |f|
+						f.text Hescape.escape_html(
+							@content.parts.first.value
+						)
+					end
+				end
+
+				def symbol_value
+					@formatter.append do |f|
+						f.text Hescape.escape_html(
+							@content.value.value
+						)
+					end
+				end
+
+				def numeric_value
+					@formatter.append do |f|
+						f.text Hescape.escape_html(
+							@content.value
+						)
+					end
+				end
+
+				def variable_value
+					@formatter.chain_append do |f|
+						f.text "Hescape.escape_html("
+						@content.format(f)
+						f.text ")"
+					end
+				end
+
+				def unknown_value
+					@formatter.breakable(force: true)
+					if @mutating
+						@content.format(@formatter)
+					else
+						@formatter.text "yield_content {"
+						@formatter.breakable(force: true)
+						@content.format(@formatter)
+						@formatter.breakable(force: true)
+						@formatter.text "}"
+					end
+					@formatter.breakable(force: true)
+				end
+			end
+		end
+	end
+end

data/lib/phlex/compiler/generators/element.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Phlex
+	class Compiler
+		module Generators
+			class Element
+				def initialize(node, formatter:, mutating: false)
+					@node = node
+					@formatter = formatter
+					@mutating = mutating
+				end
+
+				def call
+					@formatter.append do |f|
+						f.text "<"
+						f.text tag
+					end
+
+					if @node.arguments&.parts&.any?
+						@formatter.chain_append do |f|
+							f.text "_attributes("
+							@node.arguments.format(@formatter)
+							f.text ")"
+						end
+					end
+
+					@formatter.append do |f|
+						f.text ">"
+					end
+
+					return if void?
+
+					case @node.content
+					in SyntaxTree::Statements[body: [c]]
+						Content.new(@formatter, content: c, mutating: @mutating).call
+					in nil
+						nil
+					else
+						@node.content.format(@formatter)
+					end
+
+					@formatter.append do |f|
+						f.text "</"
+						f.text tag
+						f.text ">"
+					end
+				end
+
+				private
+
+				def tag
+					HTML::STANDARD_ELEMENTS[@node.name] || HTML::VOID_ELEMENTS[@node.name]
+				end
+
+				def void?
+					HTML::VOID_ELEMENTS.key?(@node.name)
+				end
+			end
+		end
+	end
+end

data/lib/phlex/compiler/nodes/base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+	class Base
+		def initialize(node)
+			@node = node
+		end
+
+		attr_accessor :node
+
+		def arguments
+			nil
+		end
+
+		def content
+			nil
+		end
+	end
+end

data/lib/phlex/compiler/nodes/call.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+	class Call < Base
+		def name
+			nil
+		end
+	end
+end