htx 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd968d3152b9ef4c7813f1e08139a4dc386ae99f8822758a0eb2574eb8beab5
-  data.tar.gz: e2fa1f7035a09e3518be5e3fe5f8c053fd4d7d8022f6f3d121e8caecea180d6a
+  metadata.gz: d869f62a146bed898334d085ce1dc507d214950d166454b65e502058bc68e6b6
+  data.tar.gz: fd81c8b3b82f2bd95e85899f14ee35f881f11a8b0f8b07b38af1f5b0ee599a87
 SHA512:
-  metadata.gz: 3c15b1d31a60c7447137bd599bb2e7e767896d4f8ebef93878efb5981138beddd7a712744a974ea4150edd9b511593acf1d8ca0cb6754ae04f17ffbc85ce9ed1
-  data.tar.gz: adab39540cfe4261e26697a0a6af1081a620ab55305b38abcae5e446a919dfd5a5ac96cc01b5fa3cdd28bbbd3e6755c1c00a98f492530333ef102da43b4c5381
+  metadata.gz: bd23ac9b3363d467c1e47258654ed3d9a136e32e66379374b2d33a1abeeb358a1957de66364ad5af3dd20768a4ace5226ccb57c256b18b232de0381fe3144d25
+  data.tar.gz: e304e3e8b87c093eabc07628c0179c15eef76d9870483d96a129ce9f2f1358d0ec50df14e369e2c052aa59b992bcae2647753f3cb62f9e37de1d06b221332f4b

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019-2023 Nate Pickens
+Copyright 2019-2024 Nate Pickens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without

data/VERSION

@@ -1 +1 @@
-0.1.1
+1.0.0

data/lib/htx/template.rb

@@ -20,8 +20,8 @@ module HTX
     INDENT_GUESS = /^( +|\t+)(?=\S)/.freeze
     INDENT_REGEX = /\n(?=[^\n])/.freeze
 
-    NO_SEMICOLON_BEGIN = /\A\s*[\n;}]/.freeze
-    NO_SEMICOLON_END = /(\A|[\n;{}][^\S\n]*)\z/.freeze
+    AUTO_SEMICOLON_BEGIN = /\A\s*[\n;}]/.freeze
+    AUTO_SEMICOLON_END = /(\A|[\n;{}][^\S\n]*)\z/.freeze
 
     NEWLINE_BEGIN = /\A\s*\n/.freeze
     NEWLINE_END = /\n[^\S\n]*\z/.freeze
@@ -182,6 +182,7 @@ module HTX
     # * +xmlns+ - True if node is the descendant of a node with an xmlns attribute.
     #
     def process_element_node(node, xmlns: false)
+      is_template = node.name == 'template'
       children = node.children
       childless = children.empty? || (children.size == 1 && self.class.formatting_node?(children.first))
       dynamic_key = self.class.attribute_value(node.attr(DYNAMIC_KEY_ATTR))
@@ -201,19 +202,21 @@ module HTX
           dynamic_key: dynamic_key,
         )
       else
-        append_htx_node(
-          "'#{self.class.tag_name(node.name)}'",
-          *attributes,
-          dynamic_key,
-          ELEMENT | (childless ? CHILDLESS : 0) | (xmlns ? XMLNS : 0),
-        )
+        unless is_template
+          append_htx_node(
+            "'#{self.class.tag_name(node.name)}'",
+            *attributes,
+            dynamic_key,
+            ELEMENT | (childless ? CHILDLESS : 0) | (xmlns ? XMLNS : 0),
+          )
+        end
 
         unless childless
           children.each do |child|
             process(child, xmlns: xmlns)
           end
 
-          @close_count += 1
+          @close_count += 1 unless is_template
         end
       end
     end
@@ -281,8 +284,14 @@ module HTX
 
       if (confirmed_newline || @statement_buff.match?(NEWLINE_END)) && !text.match?(NEWLINE_BEGIN)
         @statement_buff << @indent
-      elsif !@statement_buff.match?(NO_SEMICOLON_END) && !text.match?(NO_SEMICOLON_BEGIN)
-        @statement_buff << ";#{' ' unless text.match?(WHITESPACE_BEGIN)}"
+      else
+        unless @statement_buff.match?(AUTO_SEMICOLON_END) || text.match?(AUTO_SEMICOLON_BEGIN)
+          @statement_buff << ";"
+        end
+
+        unless @statement_buff.empty? || text.match?(WHITESPACE_BEGIN)
+          @statement_buff << ' '
+        end
       end
 
       flush if text.match?(NON_WHITESPACE)
@@ -410,24 +419,100 @@ module HTX
 
     # Source: https://developer.mozilla.org/en-US/docs/Web/SVG/Element
     TAG_MAP = %w[
-      animateMotion animateTransform clipPath feBlend feColorMatrix feComponentTransfer feComposite
-      feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feDropShadow feFlood feFuncA
-      feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight
-      feSpecularLighting feSpotLight feTile feTurbulence foreignObject linearGradient radialGradient
+      animateMotion
+      animateTransform
+      clipPath
+      feBlend
+      feColorMatrix
+      feComponentTransfer
+      feComposite
+      feConvolveMatrix
+      feDiffuseLighting
+      feDisplacementMap
+      feDistantLight
+      feDropShadow
+      feFlood
+      feFuncA
+      feFuncB
+      feFuncG
+      feFuncR
+      feGaussianBlur
+      feImage
+      feMerge
+      feMergeNode
+      feMorphology
+      feOffset
+      fePointLight
+      feSpecularLighting
+      feSpotLight
+      feTile
+      feTurbulence
+      foreignObject
+      linearGradient
+      radialGradient
       textPath
     ].map { |tag| [tag.downcase, tag] }.to_h.freeze
 
     # Source: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute
     ATTR_MAP = %w[
-      attributeName attributeType baseFrequency baseProfile calcMode clipPathUnits contentScriptType
-      contentStyleType diffuseConstant edgeMode filterRes filterUnits glyphRef gradientTransform
-      gradientUnits kernelMatrix kernelUnitLength keyPoints keySplines keyTimes lengthAdjust
-      limitingConeAngle markerHeight markerUnits markerWidth maskContentUnits maskUnits numOctaves
-      pathLength patternContentUnits patternTransform patternUnits pointsAtX pointsAtY pointsAtZ
-      preserveAlpha preserveAspectRatio primitiveUnits refX refY referrerPolicy repeatCount repeatDur
-      requiredExtensions requiredFeatures specularConstant specularExponent spreadMethod startOffset
-      stdDeviation stitchTiles surfaceScale systemLanguage tableValues targetX targetY textLength viewBox
-      viewTarget xChannelSelector yChannelSelector zoomAndPan
+      attributeName
+      attributeType
+      baseFrequency
+      baseProfile
+      calcMode
+      clipPathUnits
+      diffuseConstant
+      edgeMode
+      filterUnits
+      glyphRef
+      gradientTransform
+      gradientUnits
+      kernelMatrix
+      kernelUnitLength
+      keyPoints
+      keySplines
+      keyTimes
+      lengthAdjust
+      limitingConeAngle
+      markerHeight
+      markerUnits
+      markerWidth
+      maskContentUnits
+      maskUnits
+      numOctaves
+      pathLength
+      patternContentUnits
+      patternTransform
+      patternUnits
+      pointsAtX
+      pointsAtY
+      pointsAtZ
+      preserveAlpha
+      preserveAspectRatio
+      primitiveUnits
+      refX
+      refY
+      referrerPolicy
+      repeatCount
+      repeatDur
+      requiredExtensions
+      requiredFeatures
+      specularConstant
+      specularExponent
+      spreadMethod
+      startOffset
+      stdDeviation
+      stitchTiles
+      surfaceScale
+      systemLanguage
+      tableValues
+      targetX
+      targetY
+      textLength
+      viewBox
+      xChannelSelector
+      yChannelSelector
+      zoomAndPan
     ].map { |attr| [attr.downcase, attr] }.to_h.freeze
   end
 end

data/lib/htx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTX
-  VERSION = '0.1.1'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,22 +42,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '5.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '5.21'
 description: HTX is a full-featured HTML template system that is simple, lightweight,
   and highly performant. This library is a Ruby implementation of the HTX template
   compiler--it converts HTX templates to their compiled JavaScript form.
@@ -78,9 +72,9 @@ homepage: https://github.com/npickens/htx
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/npickens/htx
-  source_code_uri: https://github.com/npickens/htx
+  bug_tracker_uri: https://github.com/npickens/htx/issues
+  documentation_uri: https://github.com/npickens/htx/blob/1.0.0/README.md
+  source_code_uri: https://github.com/npickens/htx/tree/1.0.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -89,14 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A Ruby compiler for HTX templates.