premailer 1.26.0 → 1.28.0

data/lib/premailer/adapter/nokogumbo.rb

@@ -21,19 +21,19 @@ class Premailer
         # Iterate through the rules and merge them into the HTML
         @css_parser.each_selector(:all) do |selector, declaration, specificity, media_types|
           # Save un-mergable rules separately
-          selector.gsub!(/:link([\s]*)+/i) { |m| $1 }
+          selector.gsub!(/:link([\s]*)+/i) { |_m| $1 }
 
           # Convert element names to lower case
-          selector.gsub!(/([\s]|^)([\w]+)/) { |m| $1.to_s + $2.to_s.downcase }
+          selector.gsub!(/([\s]|^)([\w]+)/) { |_m| $1.to_s + $2.to_s.downcase }
 
-          if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
+          if Premailer.media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
             @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if Premailer::RE_RESET_SELECTORS.match?(selector)
+              if Premailer::RE_RESET_SELECTORS.match?(selector) && !!@options[:preserve_reset]
                 # this is in place to preserve the MailChimp CSS reset: http://github.com/mailchimp/Email-Blueprints/
                 # however, this doesn't mean for testing pur
-                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration)) unless !@options[:preserve_reset]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration))
               end
 
               # Change single ID CSS selectors into xpath so that we can match more
@@ -41,14 +41,14 @@ class Premailer
               selector.gsub!(/\A\#([\w_\-]+)\Z/, '*[@id=\1]')
 
               doc.search(selector).each do |el|
-                if el.elem? and (el.name != 'head' and el.parent.name != 'head')
+                if el.elem? && ((el.name != 'head') && (el.parent.name != 'head'))
                   # Add a style attribute or append to the existing one
                   block = "[SPEC=#{specificity}[#{declaration}]]"
                   el['style'] = (el.attributes['style'].to_s ||= '') + ' ' + block
                 end
               end
             rescue ::Nokogiri::SyntaxError, RuntimeError, ArgumentError
-              $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
+              warn "CSS syntax error with selector: #{selector}" if @options[:verbose]
               next
             end
           end
@@ -62,13 +62,11 @@ class Premailer
           style = el.attributes['style'].to_s
 
           declarations = []
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            begin
-              rs = CssParser::RuleSet.new(block: declaration[1].to_s, specificity: declaration[0].to_i)
-              declarations << rs
-            rescue ArgumentError => e
-              raise e if @options[:rule_set_exceptions]
-            end
+          style.scan(/\[SPEC=([\d]+)\[(.[^\]]*)\]\]/m).each do |declaration|
+            rs = CssParser::RuleSet.new(block: declaration[1].to_s, specificity: declaration[0].to_i)
+            declarations << rs
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
           end
 
           # Perform style folding
@@ -80,9 +78,9 @@ class Premailer
           end
 
           # Duplicate CSS attributes as HTML attributes
-          if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
+          if Premailer::RELATED_ATTRIBUTES.key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
-              if el[html_attr].nil? and not merged[css_attr].empty?
+              if el[html_attr].nil? && !merged[css_attr].empty?
                 new_val = merged[css_attr].dup
 
                 # Remove url() function wrapper
@@ -117,9 +115,9 @@ class Premailer
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules) unless @options[:drop_unmergeable_css_rules]
 
-        if @options[:remove_classes] or @options[:remove_comments]
+        if @options[:remove_classes] || @options[:remove_comments]
           doc.traverse do |el|
-            if el.comment? and @options[:remove_comments]
+            if el.comment? && @options[:remove_comments]
               el.remove
             elsif el.element?
               el.remove_attribute('class') if @options[:remove_classes]
@@ -131,7 +129,7 @@ class Premailer
           # find all anchor's targets and hash them
           targets = []
           doc.search("a[@href^='#']").each do |el|
-            target = el.get_attribute('href')[1..-1]
+            target = el.get_attribute('href')[1..]
             targets << target
             el.set_attribute('href', "#" + Digest::SHA256.hexdigest(target))
           end
@@ -153,7 +151,7 @@ class Premailer
         end
 
         @processed_doc = doc
-        if is_xhtml?
+        if xhtml?
           # we don't want to encode carriage returns
           @processed_doc.to_xhtml(:encoding => @options[:output_encoding]).gsub(/&\#(xD|13);/i, "\r")
         else
@@ -177,15 +175,14 @@ class Premailer
           else
             style_tag = doc.create_element "style", styles
             head = doc.at_css('head')
-            head ||= doc.root.first_element_child.add_previous_sibling(doc.create_element "head") if doc.root && doc.root.first_element_child
-            head ||= doc.add_child(doc.create_element "head")
+            head ||= doc.root.first_element_child.add_previous_sibling(doc.create_element("head")) if doc.root&.first_element_child
+            head ||= doc.add_child(doc.create_element("head"))
             head << style_tag
           end
         end
         doc
       end
 
-
       # Converts the HTML document to a format suitable for plain-text e-mail.
       #
       # If present, uses the <body> element as its base; otherwise uses the whole document.
@@ -195,17 +192,17 @@ class Premailer
         html_src = ''
         begin
           html_src = @doc.at("body").inner_html
-        rescue;
+        rescue StandardError
         end
 
-        html_src = @doc.to_html unless html_src and not html_src.empty?
+        html_src = @doc.to_html unless html_src && !html_src.empty?
         convert_to_text(html_src, @options[:line_length], @html_encoding)
       end
 
       # Gets the original HTML as a string.
       # @return [String] HTML.
       def to_s
-        if is_xhtml?
+        if xhtml?
           @doc.to_xhtml(:encoding => nil)
         else
           @doc.to_html(:encoding => nil)
@@ -219,13 +216,13 @@ class Premailer
         thing = nil
 
         # TODO: duplicate options
-        if @options[:with_html_string] or @options[:inline] or input.respond_to?(:read)
+        if @options[:with_html_string] || @options[:inline] || input.respond_to?(:read)
           thing = input
         elsif @is_local_file
           @base_dir = File.dirname(input)
           thing = File.open(input, 'r')
         else
-          thing = URI.open(input)
+          thing = URI.parse(input).open
         end
 
         if thing.respond_to?(:read)
@@ -236,7 +233,7 @@ class Premailer
         doc = nil
 
         # Handle HTML entities
-        if @options[:replace_html_entities] == true and thing.is_a?(String)
+        if (@options[:replace_html_entities] == true) && thing.is_a?(String)
           HTML_ENTITIES.map do |entity, replacement|
             thing.gsub! entity, replacement
           end
@@ -252,13 +249,12 @@ class Premailer
         # https://github.com/premailer/premailer/issues/199
         ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
-            child.swap(child.text()) if child.cdata?
+            child.swap(child.text) if child.cdata?
           end
         end
 
         doc
       end
-
     end
   end
 end

data/lib/premailer/adapter/rgb_to_hex.rb

@@ -7,7 +7,7 @@ module AdapterHelper
       str.to_i.to_s(16).rjust(2, '0').upcase
     end
 
-    def is_rgb?(color)
+    def rgb?(color)
       pattern = %r{
       rgb
       \(\s*                    # literal open, with optional whitespace
@@ -16,7 +16,7 @@ module AdapterHelper
       (\d{1,3})                # capture 1-3 digits
       (?:\s*,\s*|\s+)          # comma or whitespacee
       (\d{1,3})                # capture 1-3 digits
-      \s*(?:\/\s*\d*\.?\d*%?)? # optional alpha modifier
+      \s*(?:/\s*\d*\.?\d*%?)? # optional alpha modifier
       \s*\)                    # literal close, with optional whitespace
       }x
 
@@ -24,7 +24,7 @@ module AdapterHelper
     end
 
     def ensure_hex(color)
-      match_data = is_rgb?(color)
+      match_data = rgb?(color)
       if match_data
         "#{to_hex(match_data[1])}#{to_hex(match_data[2])}#{to_hex(match_data[3])}"
       else

data/lib/premailer/adapter.rb

@@ -6,7 +6,6 @@ class Premailer
   # * nokogiri_fast
   # * nokogumbo
   module Adapter
-
     autoload :Nokogiri, 'premailer/adapter/nokogiri'
     autoload :NokogiriFast, 'premailer/adapter/nokogiri_fast'
     autoload :Nokogumbo, 'premailer/adapter/nokogumbo'
@@ -16,12 +15,12 @@ class Premailer
       ["nokogiri", :nokogiri],
       ["nokogiri", :nokogiri_fast],
       ["nokogumbo", :nokogumbo]
-    ]
+    ].freeze
 
     # Returns the adapter to use.
     def self.use
       return @use if @use
-      self.use = self.default
+      self.use = default
       @use
     end
 
@@ -35,12 +34,10 @@ class Premailer
       return :nokogumbo if defined?(::Nokogumbo)
 
       REQUIREMENT_MAP.each do |(library, adapter)|
-        begin
-          require library
-          return adapter
-        rescue LoadError
-          next
-        end
+        require library
+        return adapter
+      rescue LoadError
+        next
       end
 
       raise "No suitable adapter for Premailer was found, please install nokogiri or nokogumbo"
@@ -57,10 +54,9 @@ class Premailer
     def self.find(adapter)
       return adapter if adapter.is_a?(Module)
 
-      Premailer::Adapter.const_get("#{adapter.to_s.split('_').map{|s| s.capitalize}.join}")
+      Premailer::Adapter.const_get(adapter.to_s.split('_').map(&:capitalize).join.to_s)
     rescue NameError
       raise ArgumentError, "Invalid adapter: #{adapter}"
     end
-
   end
 end

data/lib/premailer/executor.rb

@@ -4,12 +4,12 @@ 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
@@ -54,11 +54,11 @@ parser = 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
 
@@ -82,7 +82,7 @@ parser = OptionParser.new do |opts|
 end
 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

data/lib/premailer/html_to_plain_text.rb

@@ -1,10 +1,8 @@
-# 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:
@@ -60,7 +58,7 @@ module HtmlToPlainText
 
     # 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
@@ -69,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
-      when 1   # H1, asterisks above and below
-        htext = ('*' * 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
+      htext =
+        case hlevel
+        when 1   # H1, asterisks above and below
+          ('*' * hlength) + "\n" + htext + "\n" + ('*' * hlength)
+        when 2   # H1, dashes above and below
+          ('-' * hlength) + "\n" + htext + "\n" + ('-' * hlength)
+        else # H3-H6, dashes below
+          htext + "\n" + ('-' * hlength)
+        end
 
       "\n\n" + htext + "\n\n"
     end
@@ -118,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