squoosh 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d794e4fa97573f5ffe9fbc8339df1fcd8ef91908d743be565345a0e5a7b92f
-  data.tar.gz: 857fb11296b5e4a3989a06d660e44a4c6536780f21d85092e2ab5b11f82bcceb
+  metadata.gz: 315473e08078ff495007f1bfddbdcff65fa705e9a0b1184b94d048278fbbc1f3
+  data.tar.gz: 5459f4ed5ed7803fe14e4f597180bcfee3de40e234f2d3e5792c2a1f31a456a1
 SHA512:
-  metadata.gz: 6487482bb47b8c43b7215ca3d901128fe39abc33044c7ac9cd0d8b2b9f09ac90f9b9ff1d7750bea6ea907b31c4044b0c05e19231871bb9306cb54b508de0dd34
-  data.tar.gz: 3693641100489cc0128c5f0569eca44607ddac2c126b265b0a837653b6e847e04887034dea3a648049a3841e8d6e368f9d628e375b16eb33c22402328c42d0b2
+  metadata.gz: f52727e43f40846d4f2c3e29b0ba8a1d7414908049f7d8e3b82d8f85e32e5842fe573290a5977362992d5e0608b3097844479ba6d72c924a84df4b897bfaa05e
+  data.tar.gz: b468345836215f88ae14a6a6d769a9d57dc796cc3746725ae61f56ad3ad328e5da88713612e99fc29bc9f9aadd3119a47a24c75c1da6dc1a6e480ff65789734b

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016, 2018 Stephen Checkoway
+Copyright (c) 2016, 2018, 2019 Stephen Checkoway
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -54,7 +54,7 @@ Or install it yourself as:
 ## Usage
 
 You can read the documentation
-[here](https://www.rubydoc.info/github/stevecheckoway/squoosh/v0.2.0).
+[here](https://www.rubydoc.info/github/stevecheckoway/squoosh/).
 
 The three basic minification functions are
 
@@ -70,14 +70,20 @@ significantly speed up minifying HTML with repeated scripts and style sheets.
 Create a `_plugins/squoosh.rb` file with the contents
 
 ```ruby
-require 'squoosh'
-
-Jekyll::Hooks.register [:documents, :pages], :post_render, priority: :high do |doc|
-  case File.extname(doc.destination('./'))
-  when '.html', '.htm'
-    doc.output = Squoosh::minify_html doc.output
-  when '.js'
-    doc.output = Squoosh::minify_js doc.output
+# frozen_string_literal: true
+
+if Jekyll.env == 'deploy'
+  require 'squoosh'
+
+  squoosher = Squoosh::Squoosher.new
+  Jekyll::Hooks.register(%i[documents pages],
+                         :post_render, priority: :high) do |doc|
+    case File.extname(doc.destination('./'))
+    when '.html', '.htm'
+      doc.output = squoosher.minify_html(doc.output)
+    when '.js'
+      doc.output = squoosher.minify_js(doc.output)
+    end
   end
 end
 ```

data/lib/squoosh.rb

@@ -74,6 +74,7 @@ module Squoosh
       end
       @options = DEFAULT_OPTIONS.merge(options)
       @js_cache = {}
+      @inline_script_cache = {}
       @css_cache = {}
     end
 
@@ -111,8 +112,7 @@ module Squoosh
     # @param content [String] the JavaScript to minify
     # @return [String] the minified JavaScript
     def minify_js(content)
-      @js_cache[content] ||= \
-        Uglifier.compile(content, @options[:uglifier_options])
+      @js_cache[content] ||= uglify(content, @options[:uglifier_options])
     end
 
     # Element kinds
@@ -124,6 +124,13 @@ module Squoosh
     private_constant :VOID_ELEMENTS, :RAW_TEXT_ELEMENTS
     private_constant :ESCAPABLE_RAW_TEXT_ELEMENTS, :FOREIGN_ELEMENTS
 
+    INLINE_SCRIPT_OPTIONS = {
+      output: {
+        inline_script: true
+      }
+    }.freeze
+    private_constant :INLINE_SCRIPT_OPTIONS
+
     private
 
     def void_element?(node)
@@ -228,13 +235,31 @@ module Squoosh
     ).freeze
     private_constant :EVENT_HANDLERS_XPATH
 
+    def uglify(content, options)
+      js = Uglifier.compile(content, options)
+      js.chomp!(';')
+      js
+    end
+
+    def compress_script(content)
+      @inline_script_cache[content] ||= begin
+        options = @options[:uglifier_options].merge(INLINE_SCRIPT_OPTIONS)
+        uglify(content, options)
+      end
+    end
+
+    def compress_event_handler(content)
+      @event_handler_cache[content] ||= \
+        Uglifier.compile(content, @options[:uglifier_options])
+    end
+
     def compress_javascript(doc)
       # Compress script elements.
       doc.xpath('//script[not(ancestor::math or ancestor::svg)]').each do |node|
         type = node['type']&.downcase
         next unless type.nil? || type == 'text/javascript'
 
-        node.content = minify_js node.content
+        node.content = compress_script(node.content)
       end
       # Compress event handlers.
       doc.xpath(EVENT_HANDLERS_XPATH).each do |attr|
@@ -272,15 +297,7 @@ module Squoosh
         end
       elsif node.element? &&
             (node.name == 'pre' || node.name == 'textarea')
-        # Remove leading newline in pre and textarea tags unless there are two
-        # in a row.
-        if node.children[0]&.text?
-          content = node.children[0].content
-          if content.sub!(/\A\r\n?([^\r]|\z)/, '\1') ||
-             content.sub!(/\A\n([^\n]|\z)/, '\1')
-            node.children[0].content = content
-          end
-        end
+        # Leave the contents of these nodes alone.
       elsif normal_element?(node) || node.name == 'title'
         # Compress spaces in normal elements and title.
         node.children.each { |c| compress_spaces c }
@@ -347,13 +364,23 @@ module Squoosh
         end
 
         # Close start tag.
-        if node_is_self_closing? node
+        if self_closing? node
           output << ' ' if last_attr_unquoted
           output << '/'
         end
         output << '>'
       end
 
+      # If pre or textarea start with a newline, double it because the HTML
+      # parser strips leading newlines.
+      if (node.name == 'pre' || node.name == 'textarea') &&
+         !node.children.empty?
+        first_child = node.children[0]
+        if first_child.text? && first_child.content.start_with?("\n")
+          output << "\n"
+        end
+      end
+
       # Add content.
       output << node.children.map { |c| stringify_node c }.join
 
@@ -362,7 +389,11 @@ module Squoosh
       output.string
     end
 
-    def node_is_self_closing?(node)
+    def self_closing?(node)
+      # If we're not omitting end tags, then don't mark foreign elements as
+      # self closing.
+      return false unless @options[:omit_tags]
+
       foreign_element?(node) && node.children.empty?
     end
 
@@ -436,7 +467,7 @@ module Squoosh
     end
 
     def omit_end_tag?(node)
-      return true if void_element? node
+      return true if void_element?(node) || self_closing?(node)
       return false unless @options[:omit_tags]
       return false if node.parent.name == 'noscript'
 

data/lib/squoosh/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squoosh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephen Checkoway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement