squoosh 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db4818a215da1002e475a6ab271f274448d983ec4f9b90aff346bd08705c6c2
-  data.tar.gz: 3155d597ba38ce21b1fcb59c6550bff5c76fc50b9b8ab63d251588a83448b063
+  metadata.gz: 8ad27922ec33d0ecfea5e58f69ce3a39ea9b1a62732e8a4db9725443dbdbe97b
+  data.tar.gz: 7dc0576cdd2206091677ee36ea6b836ad537ee5527e83309b649314c51100ddf
 SHA512:
-  metadata.gz: 6f4147816e466cfa7b1da925fb064ea65c3fec6ee3e8678b3afd8a2cb41a2fc40bea9825320fe67d3692dccd2ba14ff913f308672a9575d25e07a84f51a33a13
-  data.tar.gz: 693b6d9d3d20fe099926c67b571b53b9955d2ab2d2700c2b8b912b848729d14a6fda0c04fbc29414a08e43aa7efa29b042f45229021ebcc9493710fd771c639d
+  metadata.gz: 24d38fd5136f531d5ac21aec36fb71b031803f52a6786f313eb5d5aa31469d5fd6cae4d3a873ede1c7404758053e639ec792b1c1d315caaa6470c35443f99897
+  data.tar.gz: 8dac02921bebd2bc963352ce9173dc53b6eae041de2ccc44d4a3fecd8e89de02f3a854cfa91ff24f833f87519675b2f699f41cd3e36ace652110f1323bedc531

data/README.md

@@ -1,10 +1,12 @@
+[![Travis-CI Build
+Status](https://travis-ci.org/stevecheckoway/squoosh.svg)](https://travis-ci.org/stevecheckoway/squoosh)
+[![Coverage
+Status](https://coveralls.io/repos/github/stevecheckoway/squoosh/badge.svg?branch=master)](https://coveralls.io/github/stevecheckoway/squoosh?branch=master)
+
 # Squoosh
 
 Minifies HTML, JavaScript, and CSS, including inline JavaScript and CSS.
 
-[![Travis-CI Build
-Status](https://travis-ci.org/stevecheckoway/squoosh.svg)](https://travis-ci.org/stevecheckoway/squoosh)
-
 CSS minification is handled by [Sassc](http://www.rubydoc.info/gems/sassc)
 whereas JavaScript minification is handled by
 [Uglifier](http://www.rubydoc.info/gems/uglifier) which requires node.js.

data/lib/squoosh.rb

@@ -204,6 +204,7 @@ module Squoosh
       false
     end
 
+    # rubocop:disable Style/StringConcatenation
     EVENT_HANDLERS_XPATH = (
       # Select all attribute nodes whose names start with "on";
       '//@*[starts-with(name(),"on")]' +
@@ -233,6 +234,7 @@ module Squoosh
           ')' \
       ']'
     ).freeze
+    # rubocop:enable Style/StringConcatenation
     private_constant :EVENT_HANDLERS_XPATH
 
     def uglify(content, options)
@@ -345,7 +347,7 @@ module Squoosh
           # value.gsub!(/&([a-zA-Z0-9]+;|#[0-9]+|#[xX][a-fA-F0-9]+)/, '&\1')
           value = (attr.value || '').gsub('&', '&')
           if value.empty?
-            output << ' ' + name
+            output << " #{name}"
           elsif /[\t\n\f\r "'`=<>]/ !~ value
             last_attr_unquoted = true
             output << " #{name}=#{value}"
@@ -391,15 +393,17 @@ module Squoosh
 
       uri = ns.href
       if uri == Nokogiri::HTML5::XML_NAMESPACE
-        'xml:' + attr.name
+        "xml:#{attr.name}"
       elsif uri == Nokogiri::HTML5::XMLNS_NAMESPACE && attr.name == 'xmlns'
         'xmlns'
       elsif uri == Nokogiri::HTML5::XMLNS_NAMESPACE
-        'xmlns:' + attr.name
+        "xmlns:#{attr.name}"
       elsif uri == Nokogiri::HTML5::XLINK_NAMESPACE
-        'xlink:' + attr.name
+        "xlink:#{attr.name}"
       else
+        # :nocov:
         raise 'Unreachable!'
+        # :nocov:
       end
     end
 
@@ -411,6 +415,53 @@ module Squoosh
       foreign_element?(node) && node.children.empty?
     end
 
+    def content_node?(node)
+      # Inter-element whitespace, comment nodes, and processing instruction
+      # nodes must be ignored when establishing whether an element's contents
+      # match the element's content model or not, and must be ignored when
+      # following algorithms that define document and element semantics.
+      !(node.comment? ||
+        node.processing_instruction? ||
+        inter_element_whitespace?(node))
+    end
+
+    def previous_sibling_content_node(node)
+      while (node = node.previous_sibling)
+        return node if content_node?(node)
+      end
+      nil
+    end
+
+    def next_sibling_content_node(node)
+      while (node = node.next_sibling)
+        return node if content_node?(node)
+      end
+      nil
+    end
+
+    def first_child_content_node(node)
+      return nil if node.children.empty?
+
+      node = node.children[0]
+      return node if content_node?(node)
+
+      next_sibling_content_node(node)
+    end
+
+    def next_sibling_is_nil_or_one_of?(node, elements)
+      node = next_sibling_content_node(node)
+      node.nil? || (node.element? && elements.include?(node.name))
+    end
+
+    def next_sibling_is_one_of?(node, elements)
+      node = next_sibling_content_node(node)
+      node&.element? && elements.include?(node.name)
+    end
+
+    def parent_contains_more_content?(node)
+      !next_sibling_content_node(node).nil?
+    end
+
     def omit_start_tag?(node)
       return false unless @options[:omit_tags]
       return false unless node.attributes.empty?
@@ -445,37 +496,26 @@ module Squoosh
         # inside the colgroup element is a col element, and if the element is
         # not immediately preceded by another colgroup element whose end tag
         # has been omitted. (It can't be omitted if the element is empty.)
-        return false if node.children.empty?
-        return false unless node.children[0].name == 'col'
+        child = first_child_content_node(node)
+        return false if child.nil? || !child.element? || child.name != 'col'
 
-        prev_elm = node.previous_element
-        return prev_elm.nil? ||
-               prev_elm.name != 'col' ||
-               !omit_end_tag?(prev_elm)
+        prev_node = previous_sibling_content_node(node)
+        return !(prev_node&.element? &&
+                 prev_node.name == 'colgroup' &&
+                 omit_end_tag?(prev_node))
 
       when 'tbody'
         # A tbody element's start tag may be omitted if the first thing inside
         # the tbody element is a tr element, and if the element is not
         # immediately preceded by a tbody, thead, or tfoot element whose end
         # tag has been omitted. (It can't be omitted if the element is empty.)
-        return false if node.children.empty?
-        return false unless node.children[0].name == 'tr'
+        child = first_child_content_node(node)
+        return false if child.nil? || !child.element? || child.name != 'tr'
 
-        prev_elm = node.previous_element
-        return prev_elm.nil? ||
-               !%w[tbody thead tfoot].include?(prev_elm.name) ||
-               !omit_end_tag?(prev_elm)
-      end
-      false
-    end
-
-    def parent_contains_more_content?(node)
-      while (node = node.next_sibling)
-        next if node.comment?
-        next if node.processing_instruction?
-        next if inter_element_whitespace? node
-
-        return true
+        prev_node = previous_sibling_content_node(node)
+        return !(prev_node&.element? &&
+                 %w[tbody thead tfoot].include?(prev_node.name) &&
+                 omit_end_tag?(prev_node))
       end
       false
     end
@@ -486,7 +526,6 @@ module Squoosh
       return false if node.parent.name == 'noscript'
 
       next_node = node.next_sibling
-      next_elm = node.next_element
       case node.name
       when 'html'
         # An html element's end tag may be omitted if the html element is not
@@ -509,33 +548,40 @@ module Squoosh
         # An li element's end tag may be omitted if the li element is
         # immediately followed by another li element or if there is no more
         # content in the parent element.
-        return next_elm&.name == 'li' || !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, ['li'])
 
       when 'dt'
         # A dt element's end tag may be omitted if the dt element is immediately
         # followed by another dt element or a dd element.
-        return %w[dt dd].include? next_elm&.name
+        return next_sibling_is_one_of?(node, %w[dt dd])
 
       when 'dd'
         # A dd element's end tag may be omitted if the dd element is immediately
         # followed by another dd element or a dt element, or if there is no more
         # content in the parent element.
-        return %w[dt dd].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[dt dd])
 
       when 'p'
-        # A p element's end tag may be omitted if the p element is immediately
-        # followed by an address, article, aside, blockquote, div, dl,
-        # fieldset, footer, form, h1, h2, h3, h4, h5, h6, header, hgroup, hr,
-        # main, nav, ol, p, pre, section, table, or ul, element, or if there
-        # is no more content in the parent element and the parent element is
-        # not an a element.
-        return true if %w[address article aside blockquote div dl
-                          fieldset footer form h1 h2 h3 h4
-                          h5 h6 header hgroup hr main nav ol
-                          p pre section table ul].include? next_elm&.name
-
-        return node.parent.name != 'a' && !parent_contains_more_content?(node)
+        # A p element's end tag can be omitted if the p element is immediately
+        # followed by an address, article, aside, blockquote, details, div,
+        # dl, fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5,
+        # h6, header, hgroup, hr, main, menu, nav, ol, p, pre, section, table,
+        # or ul element, or if there is no more content in the parent element
+        # and the parent element is an HTML element that is not an a, audio,
+        # del, ins, map, noscript, or video element, or an autonomous custom
+        # element.
+        return true if next_sibling_is_one_of?(
+          node,
+          %w[
+            address article aside blockquote details div dl fieldset figcaption
+            figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr main menu nav
+            ol p pre section table ul
+          ]
+        )
+        return false if foreign_element?(node.parent)
+
+        return !parent_contains_more_content?(node) &&
+               !%(a audio del ins map noscript video).include?(node.parent.name)
 
       when 'rb', 'rt', 'rp'
         # An rb element's end tag may be omitted if the rb element is
@@ -549,62 +595,56 @@ module Squoosh
         # An rp element's end tag may be omitted if the rp element is
         # immediately followed by an rb, rt, rtc or rp element, or if there is
         # no more content in the parent element.
-        return %w[rb rt rtc rp].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[rb rt rtc rp])
+
       when 'rtc'
         # An rtc element's end tag may be omitted if the rtc element is
         # immediately followed by an rb, rtc or rp element, or if there is no
         # more content in the parent element.
-        return %w[rb rtc rp].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[rb rtc rp])
 
       when 'optgroup'
         # An optgroup element's end tag may be omitted if the optgroup element
         # is immediately followed by another optgroup element, or if there is
         # no more content in the parent element.
-        return next_elm&.name == 'optgroup' ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, ['optgroup'])
 
       when 'option'
         # An option element's end tag may be omitted if the option element is
         # immediately followed by another option element, or if it is
         # immediately followed by an optgroup element, or if there is no more
         # content in the parent element.
-        return %w[option optgroup].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[option optgroup])
 
       when 'colgroup'
         # A colgroup element's end tag may be omitted if the colgroup element is
         # not immediately followed by a space character or a comment.
-        return next_node.nil? ||
-               (next_node.text? && !next_node.content.start_with(' ')) ||
-               !next_node.comment?
+        return true if next_node.nil?
+        return !next_node.content.start_with?(' ') if next_node.text?
+
+        return !next_node.comment?
 
       when 'thead'
         # A thead element's end tag may be omitted if the thead element is
         # immediately followed by a tbody or tfoot element.
-        return %w[tbody tfoot].include? next_elm&.name
+        return next_sibling_is_one_of?(node, %w[tbody tfoot])
 
       when 'tbody'
         # A tbody element's end tag may be omitted if the tbody element is
         # immediately followed by a tbody or tfoot element, or if there is no
         # more content in the parent element.
-        return %w[tbody tfoot].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[tbody tfoot])
 
       when 'tfoot'
-        # A tfoot element's end tag may be omitted if the tfoot element is
-        # immediately followed by a tbody element, or if there is no more
-        # content in the parent element.
-        return next_elm&.name == 'tbody' ||
-               !parent_contains_more_content?(node)
+        # A tfoot element's end tag can be omitted if there is no more content
+        # in the parent element.
+        return !parent_contains_more_content?(node)
 
       when 'tr'
         # A tr element's end tag may be omitted if the tr element is immediately
         # followed by another tr element, or if there is no more content in the
         # parent element.
-        return next_elm&.name == 'tr' ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, ['tr'])
 
       when 'td', 'th'
         # A td element's end tag may be omitted if the td element is immediately
@@ -614,8 +654,7 @@ module Squoosh
         # A th element's end tag may be omitted if the th element is immediately
         # followed by a td or th element, or if there is no more content in the
         # parent element.
-        return %w[td th].include?(next_elm&.name) ||
-               !parent_contains_more_content?(node)
+        return next_sibling_is_nil_or_one_of?(node, %w[td th])
       end
       false
     end

data/lib/squoosh/version.rb

@@ -2,5 +2,5 @@
 
 module Squoosh
   # The version of squoosh.
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squoosh
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Stephen Checkoway
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-description: 
+description:
 email:
 - s@pahtak.org
 executables: []
@@ -155,7 +169,7 @@ metadata:
   changelog_uri: https://github.com/stevecheckoway/squoosh/blob/master/CHANGELOG.md
   homepage_uri: https://github.com/stevecheckoway/squoosh
   source_code_uri: https://github.com/stevecheckoway/squoosh
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,15 +177,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Minify HTML/CSS/JavaScript files.
 test_files: []