phlexing 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1f00bbf43b734cd75f369ace78ec7a8e782192fc65b9729c345b16dfb25dd6
-  data.tar.gz: 10985bfa447d6e052b2bfe932ff796bc2465458ca5a7b8f0e77bb089f0372371
+  metadata.gz: d34ed0b663f26b7d410f46ce70243f2898a3f4264839a295657fe9b8fea0496b
+  data.tar.gz: dc48ee5ac2f76c30b36b7c56981b42b7b8118cf031673dafdd5f3779b305504d
 SHA512:
-  metadata.gz: b9ad394751b8749495198b624ee0b0df792225d62664ef760b98f29ec18f1bc09aeb02b9cd3727e386bcf75fd11409658679e2a69b12709644cfeefc7aea3b3c
-  data.tar.gz: '009f8d61b78789d5f78641c85ef37307661bdcdc5bcf3591032766d3de63a9bb8c6fb4b63c74500b94b8084ebccd6e977f1d7abb883a0e5417e2a915edcad9d3'
+  metadata.gz: 369ba96c793c148a50cbc94e030d9ae1e25d0666064ca58e6551994972869d7ba308c45a0a18394538f31e3252db1f004805ac5f3129d70e9518a97c72b1b12e
+  data.tar.gz: 81d4ea798067dbf461c9742684e5b4a09b7613dcad388f1f55915ff8914a703d7081c935d344a19357d7afac0fc5cc999b064646a9afbe780b22eb9d213c4c33

data/Gemfile.lock

@@ -17,211 +17,162 @@ GIT
 PATH
   remote: .
   specs:
-    phlexing (0.4.0)
+    phlexing (0.6.0)
       deface (~> 1.9)
       html_press (~> 0.8.2)
       nokogiri (~> 1.0)
       phlex (~> 1.6)
-      phlex-rails (~> 0.9)
+      phlex-rails (>= 0.9, < 2.0)
       syntax_tree (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      globalid (>= 0.6.0)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
-      globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.4.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     builder (3.2.4)
-    cgi (0.3.6)
-    concurrent-ruby (1.2.2)
+    cgi (0.4.1)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
     css_press (0.3.2)
       csspool-st (= 3.1.2)
       json
     csspool-st (3.1.2)
-    date (3.3.3)
     deface (1.9.0)
       actionview (>= 5.2)
       nokogiri (>= 1.6)
       polyglot
       railties (>= 5.2)
       rainbow (>= 2.1.0)
-    erb (4.0.2)
+    drb (2.2.0)
+      ruby2_keywords
+    erb (4.0.4)
       cgi (>= 0.3.3)
     erubi (1.12.0)
     execjs (2.8.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
     html_press (0.8.2)
       htmlentities
       multi_css (>= 0.1.0)
       multi_js (>= 0.1.0)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.11.2)
+      rdoc
+      reline (>= 0.4.2)
     json (2.6.2)
-    loofah (2.19.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.2)
+      nokogiri (>= 1.12.0)
     maxitest (4.4.0)
       minitest (>= 5.0.0, < 5.18.0)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
     minitest (5.17.0)
     multi_css (0.1.0)
       css_press
     multi_js (0.1.0)
       uglifier (~> 2)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2-x86_64-darwin)
+    mutex_m (0.2.0)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.16.2-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.9.1)
       concurrent-ruby (~> 1.2)
       erb (>= 4)
       zeitwerk (~> 2.6)
-    phlex-rails (0.9.0)
-      phlex (~> 1.6)
-      rails (>= 6.1, < 8)
+    phlex-rails (1.1.1)
+      phlex (~> 1.9)
+      railties (>= 6.1, < 8)
       zeitwerk (~> 2.6)
     polyglot (0.3.5)
     prettier_print (1.2.1)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
+    rack (3.0.9.1)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      method_source
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.0.6)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
     regexp_parser (2.6.2)
+    reline (0.4.3)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    stringio (3.1.0)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
-    thor (1.2.1)
-    timeout (0.3.2)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode-display_width (2.4.2)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.7)
+    webrick (1.8.1)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -232,4 +183,4 @@ DEPENDENCIES
   rubocop!
 
 BUNDLED WITH
-   2.3.22
+   2.5.5

data/lib/phlexing/component_generator.rb

@@ -63,7 +63,7 @@ module Phlexing
         out << newline
       end
 
-      out << "def template"
+      out << "def #{options.template_name}"
       out << newline
       out << converter.template_code
       out << newline

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,18 @@
 
 module Phlexing
   class Options
-    attr_accessor :component, :component_name, :parent_component, :whitespace
+    attr_accessor :component, :component_name, :parent_component, :whitespace, :svg_param, :template_name
 
     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", template_name: "view_template")
       @component = component
       @component_name = safe_constant_name(component_name)
       @parent_component = safe_constant_name(parent_component)
       @whitespace = whitespace
+      @svg_param = svg_param
+      @template_name = template_name
     end
 
     def safe_constant_name(name)

data/lib/phlexing/template_generator.rb

@@ -30,7 +30,7 @@ module Phlexing
     end
 
     def handle_text_output(text)
-      output("text", text)
+      output("plain", text)
     end
 
     def handle_html_comment_output(text)
@@ -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.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexing
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Marco Roth
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -70,16 +70,22 @@ dependencies:
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +147,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Simple ERB to Phlex converter