w_syntax_tree-erb 0.10.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75bcbb66fc50b3559fa73a7ecb906aaa208a16bf041ae95793aed008bdd60f6
-  data.tar.gz: d2f882155d6e2ab774de0367586926c853a367c55123f7bc05edebebbba9fe6d
+  metadata.gz: 459993e3b6d5a09ea5a902d6038acac34eeaddb7fa878cbd41a40039712c2d9a
+  data.tar.gz: 48843275b9b5ab46a23d61677c9e7b8cd93e7e4f5095376d128d9f525408cae9
 SHA512:
-  metadata.gz: d7e9cc9b0c675244216ffd52db0751ee59b6ba79af00cb2b56ff955e351aa51c5a5d25d2737084283fa00707d51f4fb38fb7b6bbddf0c6bcc9f2831afd1fe9e1
-  data.tar.gz: 2cd81b89e3ebdd1b1010f7c7509c9ef9a81eacf30d2285c34c36d3a97b7e86cb8d7d4f460ea3a7ba2ad1dd333b2e2e6a709056d328ff373b8692218701892d57
+  metadata.gz: 373abd1743f157914a3394f127a9e6b7d5c15fce3179894f74de072a220e5a6458fb2d09a25f4b7a2b5764c0f81f870045cba6c6f6756931be8fdbbb23e260eb
+  data.tar.gz: 38d635a29da6044441e6304fd488e8281b6a1ffa0718cea508541c242a9fc9d53d618956185ed1cf8cbf16efa357368ee99c5fb8d6d99a00e212e23eb92ac8a5

data/.github/workflows/main.yml

@@ -16,6 +16,7 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
     name: CI
     runs-on: ubuntu-latest
     env:

data/CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.11.0] - 2024-04-23
+
+- ErbContent now has its value as child_nodes instead of empty array.
+- Allow html void tags and format self-closing tags
+
 ## [0.10.5] - 2023-09-03
 
 - Handle ERB-tags inside HTML-tags, like `<div <%= "class='foo'" %>>`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    w_syntax_tree-erb (0.10.5)
+    w_syntax_tree-erb (0.11.0)
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
 
@@ -9,20 +9,21 @@ GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    minitest (5.19.0)
+    minitest (5.20.0)
     prettier_print (1.2.1)
-    rake (13.0.6)
+    rake (13.1.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (6.1.1)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
   x86_64-darwin-21
   x86_64-darwin-22
   x86_64-linux

data/README.md

@@ -79,6 +79,12 @@ puts failures
 
 ## Development
 
+Install `husky`:
+
+```sh
+npm i -g husky
+```
+
 Setup linting:
 
 ```sh

data/lib/syntax_tree/erb/format.rb

@@ -203,6 +203,10 @@ module SyntaxTree
             q.text(" ")
           end
 
+          # If element is a valid void element, but not currently self-closing
+          # format to be self-closing
+          q.text(" /") if node.is_void_element? and node.closing.value == ">"
+
           visit(node.closing)
         end
       end

data/lib/syntax_tree/erb/nodes.rb

@@ -185,6 +185,25 @@ module SyntaxTree
     # potentially contain an opening tag that self-closes, in which case the
     # content and closing tag will be nil.
     class HtmlNode < Block
+      # These elements do not require a closing tag
+      # https://developer.mozilla.org/en-US/docs/Glossary/Void_element
+      HTML_VOID_ELEMENTS = %w[
+        area
+        base
+        br
+        col
+        embed
+        hr
+        img
+        input
+        link
+        meta
+        param
+        source
+        track
+        wbr
+      ]
+
       # The opening tag of an element. It contains the opening character (<),
       # the name of the element, any optional attributes, and the closing
       # token (either > or />).
@@ -214,6 +233,10 @@ module SyntaxTree
           [opening, name, *attributes, closing]
         end
 
+        def is_void_element?
+          HTML_VOID_ELEMENTS.include?(name.value)
+        end
+
         alias deconstruct child_nodes
 
         def deconstruct_keys(keys)
@@ -253,6 +276,10 @@ module SyntaxTree
         end
       end
 
+      def is_void_element?
+        false
+      end
+
       def without_new_line
         self.class.new(
           **deconstruct_keys([]).merge(
@@ -481,7 +508,7 @@ module SyntaxTree
       end
 
       def child_nodes
-        []
+        [@value].compact
       end
 
       alias deconstruct child_nodes

data/lib/syntax_tree/erb/parser.rb

@@ -419,7 +419,11 @@ module SyntaxTree
       def parse_html_element
         opening = parse_html_opening_tag
 
-        if opening.closing.value == ">"
+        if opening.closing.value == "/>"
+          HtmlNode.new(opening: opening, location: opening.location)
+        elsif opening.is_void_element?
+          HtmlNode.new(opening: opening, location: opening.location)
+        else
           elements = many { parse_any_tag }
           closing = maybe { parse_html_closing }
 
@@ -443,8 +447,6 @@ module SyntaxTree
             closing: closing,
             location: opening.location.to(closing.location)
           )
-        else
-          HtmlNode.new(opening: opening, location: opening.location)
         end
       end
 

data/lib/syntax_tree/erb/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module ERB
-    VERSION = "0.10.5"
+    VERSION = "0.11.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: w_syntax_tree-erb
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Kevin Newton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print
@@ -118,7 +118,6 @@ files:
 - ".github/ISSUE_TEMPLATE/formatting-report.md"
 - ".github/ISSUE_TEMPLATE/general.md"
 - ".github/dependabot.yml"
-- ".github/workflows/auto-merge.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".husky/pre-commit"

data/.github/workflows/auto-merge.yml

@@ -1,22 +0,0 @@
-name: Dependabot auto-merge
-on: pull_request
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.3
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}