web_components_rails 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b09f5c09128952911e23c7d01d9c32a15646d442
-  data.tar.gz: 02876ac28c8bcb83da2530d22e814bf613675e7a
+SHA256:
+  metadata.gz: 6f52ec4b08fcca1e496159e385dee89b3b65e191c4004f1dff6366df870d9f8f
+  data.tar.gz: d9aa536fc574386e5316a0e601a163809c8d8e4286583361b51a376d1e5548d4
 SHA512:
-  metadata.gz: 84aa01e3227cf376f61dc8c4682ccbec450325b014b42946701ea7c9049ba07894ddcc2e4ee9cc776091f3af5407d5991ce0a17d6ab9e371e847587f5ae50990
-  data.tar.gz: be43d982b2c169077db220d449f0be06a91d33ddcb6e3f11a6ff009baab445a9274dc4ab2ce28a02828ac22ad1886aea5509fdb768df91aae5f41f36f4ee44dd
+  metadata.gz: 9fad69eb81f98d615b601c29da13dacbd97a62119203f1d0c23b020a6e38593f5762e7163c2646ec532ea0267dfd711214523c3bede432e2ae64fb1240ab340b
+  data.tar.gz: 4c826159637070c3c8c9dd94f230953541a15f506c68a7fe8fce56e2d8dcf659b8296032a521c3f09c1f18788c87054690cd563142a1cc2c9f418aca525e3d09

data/lib/web_components_rails/html_import_processor.rb

@@ -6,7 +6,56 @@ require 'securerandom'
 #   https://github.com/rails/sprockets/blob/3.x/lib/sprockets/directive_processor.rb
 class WebComponentsRails::HTMLImportProcessor
 
-  VERSION = '9'
+  VERSION = '10'
+  XML_SAVE_OPTIONS = {
+    save_with: ::Nokogiri::XML::Node::SaveOptions::DEFAULT_XML | ::Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS
+  }
+
+  # URI attributes are determined by using the attributes list at https://html.spec.whatwg.org/#attributes-3
+  # and looking for attributes that specify "Valid URL" as their values
+  URI_ATTRIBUTES = %w(
+    action
+    cite
+    data
+    formaction
+    href
+    itemid
+    manifest
+    ping
+    poster
+    src
+  ).freeze
+
+  # URI attributes are determined by using the attributes list at https://html.spec.whatwg.org/#attributes-3
+  # and looking for attributes that specify "Boolean attribute" as their values
+  BOOLEAN_ATTRIBUTES = %w(
+    allowfullscreen
+    allowpaymentrequest
+    allowusermedia
+    async
+    autofocus
+    autoplay
+    checked
+    controls
+    default
+    defer
+    disabled
+    formnovalidate
+    hidden
+    ismap
+    itemscope
+    loop
+    multiple
+    muted
+    nomodule
+    novalidate
+    open
+    playsinline
+    readonly
+    required
+    reversed
+    selected
+  ).freeze
 
   def self.instance
     @instance ||= new
@@ -21,25 +70,30 @@ class WebComponentsRails::HTMLImportProcessor
   end
 
   def self.doc_to_html(doc)
-    # Nokogiri/Nokogumbo are hard-coded to URI-escape certain attributes (src, href, action, and a[name]),
-    # so we have to put in placeholders, and fix the values in the HTML string output afterwards
-    # This doesn't work so well with framework-specific syntax (eg. <foo src="{{bar}}">)
-    placeholder_mapping = {}
-    %w(src href action).each do |name|
-      doc.css("[#{name}]").each do |node|
-        # The placeholders are just random strings
-        placeholder = SecureRandom.hex(40)
-        attr = node.attributes[name]
-        placeholder_mapping[placeholder] = attr.value
-        attr.value = placeholder
-      end
-    end
-    new_html = doc.to_html
-    placeholder_mapping.each do |placeholder, value|
-      new_html.sub!(placeholder, value)
+    doc_html = doc.to_html(encoding: 'UTF-8')
+
+    uri_regex = Regexp.union(URI_ATTRIBUTES)
+    square_brackets_regex = Regexp.new("(#{uri_regex})=\"%5B%5B(.+?)%5D%5D\"", 'i')
+    curly_braces_regex = Regexp.new("(#{uri_regex})=\"%7B%7B(.+?)%7D%7D\"", 'i')
+
+    selectors = (URI_ATTRIBUTES + BOOLEAN_ATTRIBUTES).map { |attribute| "*[#{attribute}]"}
+    doc.css(selectors.join(',')).each do |node|
+      # Nokogiri only writes out valid HTML so this outputs some nodes that would not be valid HTML
+      # (e.g. nodes with boolean attributes that have values, or nodes that have unescaped URI attributes)
+      # as both HTML and XML, and uses swap out the HTML for XML in the complete document HTML.
+      pattern = node.to_html
+      replacement = node.to_xml(XML_SAVE_OPTIONS)
+
+      # Nokogiri/Nokogumbo are hard-coded to URI-escape certain attributes (src, href, action, and a[name]),
+      # so we have to put in placeholders, and fix the values in the HTML string output afterwards
+      # This doesn't work so well with framework-specific syntax (eg. <foo src="{{bar}}">)
+      replacement.gsub!(square_brackets_regex, '\1="[[\2]]"')
+      replacement.gsub!(curly_braces_regex, '\1="{{\2}}"')
+
+      doc_html.gsub!(pattern, replacement)
     end
 
-    new_html
+    doc_html
   end
 
 

data/lib/web_components_rails/version.rb

@@ -1,3 +1,3 @@
 module WebComponentsRails
-  VERSION = '2.1.2'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_components_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Jon Botelho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Web components utils for rails