phlexing 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1f00bbf43b734cd75f369ace78ec7a8e782192fc65b9729c345b16dfb25dd6
-  data.tar.gz: 10985bfa447d6e052b2bfe932ff796bc2465458ca5a7b8f0e77bb089f0372371
+  metadata.gz: 32473f2d62d2af3b3a05ae264b34ed586914fad139c2fa75e92d09560f1d7a12
+  data.tar.gz: 7175a9dc57029272641b7b025304ff87510e459623a77881703d4f55ea981e40
 SHA512:
-  metadata.gz: b9ad394751b8749495198b624ee0b0df792225d62664ef760b98f29ec18f1bc09aeb02b9cd3727e386bcf75fd11409658679e2a69b12709644cfeefc7aea3b3c
-  data.tar.gz: '009f8d61b78789d5f78641c85ef37307661bdcdc5bcf3591032766d3de63a9bb8c6fb4b63c74500b94b8084ebccd6e977f1d7abb883a0e5417e2a915edcad9d3'
+  metadata.gz: ec5c1a3b6cc6d5061b555e328b8bcf4a2e0ea179e2ace84e6fb63ccb97a3a78ba58c2f822646cd94d884eb2b87c90762e05a7afff79cf3086c4b75c3bb052b11
+  data.tar.gz: ce270b4f89019cc589b0823cc3500b36eb25040fe3f19a737dc8676852019598dcd32489437cb1cd19bbf3d02053ef3cacf9156c260563a82e5e06d138769255

data/Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    phlexing (0.4.0)
+    phlexing (0.5.0)
       deface (~> 1.9)
       html_press (~> 0.8.2)
       nokogiri (~> 1.0)
@@ -123,7 +123,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.8.1)
@@ -150,15 +150,15 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2-x86_64-darwin)
+    nio4r (2.5.9)
+    nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
-    phlex (1.6.1)
+    phlex (1.8.1)
       concurrent-ruby (~> 1.2)
       erb (>= 4)
       zeitwerk (~> 2.6)

data/lib/phlexing/helpers.rb

@@ -9,6 +9,8 @@ module Phlexing
       Phlex::HTML::VoidElements.registered_elements.values +
       Phlex::HTML::StandardElements.registered_elements.values
 
+    SVG_ELEMENTS = Phlex::SVG::StandardElements.registered_elements.values.to_h { |element| [element.downcase, element] }
+
     def whitespace
       options.whitespace? ? "whitespace\n" : ""
     end
@@ -59,17 +61,27 @@ module Phlexing
     end
 
     def tag_name(node)
-      return "template_tag" if node.name == "template-tag"
-
       name = node.name.tr("-", "_")
 
-      @converter.custom_elements << name unless KNOWN_ELEMENTS.include?(name)
+      return name if name == "template_tag"
+      return name if name.start_with?("s.")
+      return name if KNOWN_ELEMENTS.include?(name)
+
+      @converter.custom_elements << name
 
       name
     end
 
-    def block
+    def block(params = nil)
       out << " {"
+
+      if params
+        out << " "
+        out << "|"
+        out << params
+        out << "|"
+      end
+
       yield
       out << " }"
     end

data/lib/phlexing/options.rb

@@ -2,16 +2,17 @@
 
 module Phlexing
   class Options
-    attr_accessor :component, :component_name, :parent_component, :whitespace
+    attr_accessor :component, :component_name, :parent_component, :whitespace, :svg_param
 
     alias_method :whitespace?, :whitespace
     alias_method :component?, :component
 
-    def initialize(component: false, component_name: "Component", parent_component: "Phlex::HTML", whitespace: true)
+    def initialize(component: false, component_name: "Component", parent_component: "Phlex::HTML", whitespace: true, svg_param: "s")
       @component = component
       @component_name = safe_constant_name(component_name)
       @parent_component = safe_constant_name(parent_component)
       @whitespace = whitespace
+      @svg_param = svg_param
     end
 
     def safe_constant_name(name)

data/lib/phlexing/template_generator.rb

@@ -54,7 +54,7 @@ module Phlexing
 
       attributes = []
 
-      node.attributes.each_value do |attribute|
+      node.attribute_nodes.each do |attribute|
         attributes << handle_attribute(attribute)
       end
 
@@ -74,7 +74,13 @@ module Phlexing
     def handle_html_attribute_output(attribute)
       String.new.tap { |s|
         s << arg(attribute.name.underscore)
-        s << quote(attribute.value)
+        if attribute.value.blank? && !attribute.to_html.include?("=")
+          # handling boolean attributes
+          # eg. <input required> => input(required: true)
+          s << "true"
+        else
+          s << quote(attribute.value)
+        end
       }
     end
 
@@ -141,8 +147,10 @@ module Phlexing
       out << tag_name(node)
       out << handle_attributes(node)
 
+      params = node.name == "svg" ? options.svg_param : nil
+
       if node.children.any?
-        block { handle_children(node, level) }
+        block(params) { handle_children(node, level) }
       end
 
       out << newline
@@ -183,6 +191,22 @@ module Phlexing
       out << newline if level == 1
     end
 
+    def handle_svg_node(node, level)
+      node.children.each do |child|
+        child.traverse do |subchild|
+          subchild.name = SVG_ELEMENTS[subchild.name] if SVG_ELEMENTS.key?(subchild.name)
+          subchild.name = subchild.name.prepend("#{options.svg_param}.") # rubocop:disable Style/RedundantSelfAssignment
+        end
+      end
+
+      whitespace_before = options.whitespace
+      options.whitespace = false
+
+      handle_element_node(node, level)
+
+      options.whitespace = whitespace_before
+    end
+
     def handle_document_node(node, level)
       handle_children(node, level)
     end
@@ -198,7 +222,11 @@ module Phlexing
       in Nokogiri::XML::Text
         handle_text_node(node)
       in Nokogiri::XML::Element
-        handle_element_node(node, level)
+        if node.name == "svg"
+          handle_svg_node(node, level)
+        else
+          handle_element_node(node, level)
+        end
       in Nokogiri::HTML4::Document | Nokogiri::HTML4::DocumentFragment | Nokogiri::XML::DTD
         handle_document_node(node, level)
       in Nokogiri::XML::Comment

data/lib/phlexing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexing
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marco Roth
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface