premailer 1.12.0 → 1.29.0

data/lib/premailer/cached_rule_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+class Premailer
+  class CachedRuleSet < CssParser::RuleSet
+    # we call this early to find errors but css-parser calls it in .merge again
+    # so to prevent slowdown and bugs we refuse to run it twice on the same ruleset
+    # ideally should be upstreamed into css-parser
+    def expand_shorthand!
+      super unless @expand_shorthand
+    ensure
+      @expand_shorthand = true
+    end
+  end
+end

data/lib/premailer/executor.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
 require 'optparse'
 require 'premailer'
 
 # defaults
 options = {
-  :base_url          => nil,
+  :base_url => nil,
   :link_query_string => nil,
-  :remove_classes    => false,
-  :verbose           => false,
-  :line_length       => 65,
-  :adapter           => :nokogiri,
+  :remove_classes => false,
+  :verbose => false,
+  :line_length => 65,
+  :adapter => :nokogiri
 }
 
 mode = :html
 
-opts = OptionParser.new do |opts|
+parser = OptionParser.new do |opts|
   opts.banner = "Improve the rendering of HTML emails by making CSS inline among other things. Takes a path to a local file, a URL or a pipe as input.\n\n"
   opts.define_head "Usage: premailer <optional uri|optional path> [options]"
   opts.separator ""
@@ -53,11 +54,11 @@ opts = OptionParser.new do |opts|
     options[:remove_scripts] = true
   end
 
-  opts.on("-l", "--line-length N", Integer, "Line length for plaintext (default: #{options[:line_length].to_s})") do |v|
+  opts.on("-l", "--line-length N", Integer, "Line length for plaintext (default: #{options[:line_length]})") do |v|
     options[:line_length] = v
   end
 
-  opts.on("-e", "--entities", "Output HTML entities instead of UTF-8 when using Nokogiri") do |v|
+  opts.on("-e", "--entities", "Output HTML entities instead of UTF-8 when using Nokogiri") do |_v|
     options[:output_encoding] = "US-ASCII"
   end
 
@@ -79,9 +80,9 @@ opts = OptionParser.new do |opts|
     exit
   end
 end
-opts.parse!
+parser.parse!
 
-$stderr.puts "Processing in #{mode} mode with options #{options.inspect}" if options[:verbose]
+warn "Processing in #{mode} mode with options #{options.inspect}" if options[:verbose]
 
 premailer = nil
 input = nil
@@ -98,7 +99,7 @@ end
 if input
   premailer = Premailer.new(input, options)
 else
-  puts opts
+  puts parser
   exit 1
 end
 

data/lib/premailer/html_to_plain_text.rb

@@ -1,19 +1,19 @@
-# coding: utf-8
+# frozen_string_literal: true
 require 'htmlentities'
 
 # Support functions for Premailer
 module HtmlToPlainText
-
   # Returns the text in UTF-8 format with all HTML tags removed
-  #   
-  # HTML content can be omitted from the output by surrounding it in the following comments:   
+  #
+  # HTML content can be omitted from the output by surrounding it in the following comments:
   #
   # <!-- start text/html -->
   # <!-- end text/html -->
   #
   # TODO: add support for DL, OL
-  def convert_to_text(html, line_length = 65, from_charset = 'UTF-8')
-    txt = html
+  # TODO: this is not safe and needs a real html parser to work
+  def convert_to_text(html, line_length = 65, _from_charset = 'UTF-8')
+    txt = +html
 
     # strip text ignored html. Useful for removing
     # headers and footers that aren't needed in the
@@ -26,43 +26,39 @@ module HtmlToPlainText
     # eg. the following formats:
     # <img alt="" />
     # <img alt="">
-    txt.gsub!(/<img.+?alt=\"([^\"]*)\"[^>]*\>/i, '\1')
+    txt.gsub!(/<img[^>]+?alt="([^"]*)"[^>]*>/i, '\1')
 
     # for img tags with '' for attribute quotes
     # with or without closing tag
     # eg. the following formats:
     # <img alt='' />
     # <img alt=''>
-    txt.gsub!(/<img.+?alt=\'([^\']*)\'[^>]*\>/i, '\1')
+    txt.gsub!(/<img[^>]+?alt='([^']*)'[^>]*>/i, '\1')
 
     # remove script tags and content
-    txt.gsub!(/<script.*\/script>/m, '')
+    txt.gsub!(/<script.*?\/script>/m, '')
 
-    # links with double quotes
-    txt.gsub!(/<a\s[^\n]*?href=["'](mailto:)?([^"]*)["][^>]*>(.*?)<\/a>/im) do |s|
-      if $3.empty?
-        ''
-      elsif $3.strip.downcase == $2.strip.downcase
-        $3.strip
-      else
-        $3.strip + ' ( ' + $2.strip + ' )'
+    # links
+    txt.gsub!(/<a\s+([^>]+)>(.*?)<\/a>/im) do |s|
+      text = $2.strip
+
+      match = /href=(['"])(?:mailto:)?(.+?)\1/.match(s)
+      if match
+        href = match[2]
       end
-    end
 
-    # links with single quotes
-    txt.gsub!(/<a\s[^\n]*?href=["'](mailto:)?([^']*)['][^>]*>(.*?)<\/a>/im) do |s|
-      if $3.empty?
+      if text.empty?
         ''
-      elsif $3.strip.downcase == $2.strip.downcase
-        $3.strip
+      elsif href.nil? || text.strip.casecmp(href.strip) == 0
+        text.strip
       else
-        $3.strip + ' ( ' + $2.strip + ' )'
+        text.strip + ' ( ' + href.strip + ' )'
       end
     end
 
     # handle headings (H1-H6)
     txt.gsub!(/(<\/h[1-6]>)/i, "\n\\1") # move closing tags to new lines
-    txt.gsub!(/[\s]*<h([1-6]+)[^>]*>[\s]*(.*)[\s]*<\/h[1-6]+>/i) do |s|
+    txt.gsub!(/[\s]*<h([1-6]+)[^>]*>[\s]*(.*)[\s]*<\/h[1-6]+>/i) do |_s|
       hlevel = $1.to_i
 
       htext = $2
@@ -71,17 +67,21 @@ module HtmlToPlainText
 
       # determine maximum line length
       hlength = 0
-      htext.each_line { |l| llength = l.strip.length; hlength = llength if llength > hlength }
+      htext.each_line do |l|
+        llength = l.strip.length
+        hlength = llength if llength > hlength
+      end
       hlength = line_length if hlength > line_length
 
-      case hlevel
+      htext =
+        case hlevel
         when 1   # H1, asterisks above and below
-          htext = ('*' * hlength) + "\n" + htext + "\n" + ('*' * hlength)
+          ('*' * hlength) + "\n" + htext + "\n" + ('*' * hlength)
         when 2   # H1, dashes above and below
-          htext = ('-' * hlength) + "\n" + htext + "\n" + ('-' * hlength)
-        else     # H3-H6, dashes below
-          htext = htext + "\n" + ('-' * hlength)
-      end
+          ('-' * hlength) + "\n" + htext + "\n" + ('-' * hlength)
+        else # H3-H6, dashes below
+          htext + "\n" + ('-' * hlength)
+        end
 
       "\n\n" + htext + "\n\n"
     end
@@ -120,8 +120,8 @@ module HtmlToPlainText
     txt.gsub!(/[\n]{3,}/, "\n\n")
 
     # the word messes up the parens
-    txt.gsub!(/\(([ \n])(http[^)]+)([\n ])\)/) do |s|
-      ($1 == "\n" ? $1 : '' ) + '( ' + $2 + ' )' + ($3 == "\n" ? $1 : '' )
+    txt.gsub!(/\(([ \n])(http[^)]+)([\n ])\)/) do |_s|
+      ($1 == "\n" ? $1 : '') + '( ' + $2 + ' )' + ($3 == "\n" ? $1 : '')
     end
 
     txt.strip