htx 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bb09e36ecc0e6a70df4fed4552ae20a9512eadd3ac57d86bd88fa278c8d6029
-  data.tar.gz: e45e67362bc5422faa7df5330c5bd4940d4973c8ab0303cdd8207f0d7149efed
+  metadata.gz: dc1adc5f7b7b12da438f6c96c5a81b3585a8f9a8b761d54eee3895b5195898ec
+  data.tar.gz: cfc75dd48759fdb2151db74de71ce9c7ae07a73e07d20af415e96a0a37c07bda
 SHA512:
-  metadata.gz: 9eaea052f3b131de348f9ad20de712d55e180820d184a54356935aeacc3f2a7116266f2a4a6ff6e725ca44052a6c15350debcacd250b0f60be5ed0bb586aca26
-  data.tar.gz: f0f3ca8fd975d7bbf3b8d26c65d62cda86caaf245dd8143be571a5a9b28088e2274fb89a04a5fba9c567ef549f1d9d5dbaad8fcbc9db1ee346f395cd863097df
+  metadata.gz: 81660a171c9eb0a384b483f5391bd929bec1833aceef2128ecefcfba1190ea4343efbc02f286f241fcf435dcd3fd860fd7f9844a6c29358d84e5005b10e2a62b
+  data.tar.gz: c8f764200a3e0f5fb19d1c19cc8f8e5a71209b4d0e8e87f7cf27941fbf0595090395ee141a136c67670be865de8dba50235d7f10ce8fc0ccd4a2cd060809af09

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/htx/template.rb

@@ -4,13 +4,13 @@ require('nokogiri')
 
 module HTX
   class Template
-    CHILDLESS  = 0b001
-    TEXT_NODE  = 0b010
-    XMLNS_NODE = 0b100
-    FLAG_BITS  = 3
+    ELEMENT   = 0b001
+    CHILDLESS = 0b010
+    XMLNS     = 0b100
+    FLAG_BITS = 3
 
     INDENT_DEFAULT = '  '
-    TEXT_NODE_TAG = 'htx-text'
+    CONTENT_TAG = 'htx-content'
     DYNAMIC_KEY_ATTR = 'htx-key'
 
     DEFAULT_XMLNS = {
@@ -35,11 +35,12 @@ module HTX
     HTML_ENTITY = /&([a-zA-Z]+|#\d+|x[0-9a-fA-F]+);/.freeze
     NON_CONTROL_STATEMENT = /#{INTERPOLATION}|(#{HTML_ENTITY})/.freeze
     CONTROL_STATEMENT = /[{}();]/.freeze
+    UNESCAPED_BACKTICK = /(?<!\\)((\\\\)*)`/.freeze
     CLOSE_STATEMENT = /;?\s*htx\.close\((\d*)\);?(\s*)\z/.freeze
 
     ##
     # Returns false. In the near future when support for the <:> tag has been dropped (in favor of
-    # <htx-text>), will return true if Nokogiri's HTML5 parser is available. To use it now, monkey patch
+    # <htx-content>), will return true if Nokogiri's HTML5 parser is available. To use it now, monkey patch
     # this method to return true.
     #
     def self.html5_parser?
@@ -116,20 +117,25 @@ module HTX
     #
     # * +base+ - Base Nokogiri node to start from.
     #
-    def process(base)
+    def process(base, xmlns: false)
       base.children.each do |node|
         next unless node.element? || node.text?
 
         dynamic_key = process_value(node.attr(DYNAMIC_KEY_ATTR), :attr)
 
-        if node.text? || node.name == TEXT_NODE_TAG || node.name == ':'
-          if node.name == ':'
-            warn("#{@name}:#{node.line}: The <:> tag has been deprecated. Please use <#{TEXT_NODE_TAG}> "\
-              'for identical functionality.')
+        if node.text? || node.name == CONTENT_TAG || node.name == 'htx-text' || node.name == ':'
+          if !node.text? && node.name != CONTENT_TAG
+            warn("#{@name}:#{node.line}: The <#{node.name}> tag has been deprecated. Please use "\
+              "<#{CONTENT_TAG}> for identical functionality.")
+          end
+
+          if (node.attributes.size - (dynamic_key ? 1 : 0)) != 0
+            raise(MalformedTemplateError.new("<#{node.name}> tags may not have attributes other than "\
+              "#{DYNAMIC_KEY_ATTR}", @name, node))
           end
 
           if (non_text_node = node.children.find { |n| !n.text? })
-            raise(MalformedTemplateError.new('text node tags may not contain child tags', @name,
+            raise(MalformedTemplateError.new("<#{node.name}> tags may not contain child tags", @name,
               non_text_node))
           end
 
@@ -141,7 +147,7 @@ module HTX
               "htx.node(#{[
                 value,
                 dynamic_key,
-                ((@static_key += 1) << FLAG_BITS) | TEXT_NODE,
+                (@static_key += 1) << FLAG_BITS,
               ].compact.join(', ')})"\
               "#{indent(text[TRAILING_WHITESPACE])}"
             )
@@ -150,17 +156,18 @@ module HTX
           end
         else
           childless = node.children.empty? || (node.children.size == 1 && node.children[0].text.strip == '')
-          attrs, xmlns = process_attrs(node)
+          attrs, explicit_xmlns = process_attrs(node)
+          xmlns ||= explicit_xmlns
 
           append("htx.node(#{[
             "'#{tag_name(node.name)}'",
             attrs,
             dynamic_key,
-            ((@static_key += 1) << FLAG_BITS) | (childless ? CHILDLESS : 0) | (xmlns ? XMLNS_NODE : 0),
+            ((@static_key += 1) << FLAG_BITS) | ELEMENT | (childless ? CHILDLESS : 0) | (xmlns ? XMLNS : 0),
           ].compact.flatten.join(', ')})")
 
           unless childless
-            process(node)
+            process(node, xmlns: xmlns)
 
             count = ''
             @compiled.sub!(CLOSE_STATEMENT) do
@@ -220,13 +227,16 @@ module HTX
         # Entire text is enclosed in ${...}.
         value.strip!
         quote = false
+        escape_quotes = false
       elsif (value = text[TEMPLATE_STRING, 1])
         # Entire text is enclosed in backticks (template string).
         quote = true
+        escape_quotes = false
       elsif is_attr || text.gsub(NON_CONTROL_STATEMENT, '') !~ CONTROL_STATEMENT
         # Text is an attribute value or doesn't match control statement pattern.
         value = text.dup
         quote = true
+        escape_quotes = true
       else
         return nil
       end
@@ -235,6 +245,7 @@ module HTX
       # calculation ignores everything before the first newline in its search for the least-indented line.
       outdent = value.scan(NON_BLANK_NON_FIRST_LINE).min
       value.gsub!(/#{LEADING_WHITESPACE}|#{TRAILING_WHITESPACE}|^#{outdent}/, '')
+      value.gsub!(UNESCAPED_BACKTICK, '\1\\\`') if escape_quotes
       value.insert(0, '`').insert(-1, '`') if quote
 
       # Ensure any Unicode characters get converted to Unicode escape sequences. Also note that since
@@ -300,9 +311,9 @@ module HTX
     #
     # Note: Nokogiri's newer HTML5 parser resulting from the Nokogumbo merge fixes this issue, but it is
     # currently not available for JRuby. It also does not parse <:> as a tag, which is why it's been
-    # deprecated in favor of <htx-text>. Once support for <:> has been completely removed, the HTML5 parser
-    # will be used for regular Ruby and this tag and attribute mapping hack reserved for JRuby (and any
-    # other potential environments where the HTML5 parser is not available).
+    # deprecated in favor of <htx-content>. Once support for <:> has been completely removed, the HTML5
+    # parser will be used for regular Ruby and this tag and attribute mapping hack reserved for JRuby (and
+    # any other potential environments where the HTML5 parser is not available).
 
     # Source: https://developer.mozilla.org/en-US/docs/Web/SVG/Element
     TAG_MAP = %w[

data/lib/htx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htx
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri