premailer 1.24.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893f0a35f19920e5a33bbaefc0c1cd2dd8a8fc2f56fc8f11bf7ed3bca2d4d437
-  data.tar.gz: 7d48ed502bc818064241ea372b4e0bdbffd204a845ff5e36a8da38af94a15202
+  metadata.gz: 0e50487681c955ef37736d8db83842cf9578b1f37eac290d77eded552410a92f
+  data.tar.gz: 9fd8a34f3dc6e7c4c2b68cff6d6d1e3137f615e61814b72c2b47b39785f60be6
 SHA512:
-  metadata.gz: d2098aec27cdabce93e5dd144be10e6b090105970f415fd32e3e5d6a9b7f65decf7d1968563e0ecb7ea88a2d74895ad526dc0fd1f72a6d7e2a9029548884157f
-  data.tar.gz: f70007e030983216f7598f387c909cdb0de5c9192f9fe69049ef7da1f307357b9ae79dc2a533b0d2bd5bdbae60de9d1935162ab47b76d8af0c14fa788108e11f
+  metadata.gz: cdfc41db2e437d4d713cf9698e6356626bd4ef1f646bb0aa57c05ca2685f7a79340a2ffeef4e0d85468d55e933e15b6862f8ee01bda497d21d81f31e7826337a
+  data.tar.gz: f98c2f0b2318b547f9f506f136702ebcef4132652455eb9c2f3f7e03ffa1f9d201f1b97779c39c540881d4b86fedc147732441da7cf39997233eaa873d5006b9

data/bin/premailer

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # This binary used in rubygems environment only as part of installed gem
 
 require 'premailer/executor'
-

data/lib/premailer/adapter/nokogiri.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'nokogiri'
 
 class Premailer
   module Adapter
     # Nokogiri adapter
     module Nokogiri
+      WIDTH_AND_HIGHT = ['width', 'height'].freeze
 
       include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
@@ -27,13 +29,13 @@ class Premailer
           selector.gsub!(/([\s]|^)([\w]+)/) { |m| $1.to_s + $2.to_s.downcase }
 
           if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
-            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if selector =~ Premailer::RE_RESET_SELECTORS
+              if Premailer::RE_RESET_SELECTORS.match?(selector)
                 # 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(selector, declaration)) unless !@options[:preserve_reset]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration)) unless !@options[:preserve_reset]
               end
 
               # Change single ID CSS selectors into xpath so that we can match more
@@ -62,7 +64,7 @@ class Premailer
           style = el.attributes['style'].to_s
 
           declarations = style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).filter_map do |declaration|
-            rs = Premailer::CachedRuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+            rs = Premailer::CachedRuleSet.new(block: declaration[1].to_s, specificity: declaration[0].to_i)
             rs.expand_shorthand!
             rs
           rescue ArgumentError => e
@@ -90,7 +92,7 @@ class Premailer
                 new_val.gsub!(/;$|\s*!important/, '').strip!
 
                 # For width and height tags, remove px units
-                new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
+                new_val.gsub!(/(\d+)px/, '\1') if WIDTH_AND_HIGHT.include?(html_attr)
 
                 # For color-related tags, convert RGB to hex if specified by options
                 new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
@@ -99,7 +101,7 @@ class Premailer
               end
 
               unless @options[:preserve_style_attribute]
-                merged.instance_variable_get("@declarations").tap do |declarations|
+                merged.instance_variable_get(:@declarations).tap do |declarations|
                   declarations.delete(css_attr)
                 end
               end
@@ -250,7 +252,7 @@ class Premailer
         # Fix for removing any CDATA tags from both style and script tags inserted per
         # https://github.com/sparklemotion/nokogiri/issues/311 and
         # https://github.com/premailer/premailer/issues/199
-        %w(style script).each do |tag|
+        ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
             child.swap(child.text()) if child.cdata?
           end

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'nokogiri'
 
 class Premailer
   module Adapter
     # NokogiriFast adapter
     module NokogiriFast
+      WIDTH_AND_HEIGHT = ['width', 'height'].freeze
 
       include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
@@ -33,13 +35,13 @@ class Premailer
           selector.gsub!(/([\s]|^)([\w]+)/) { |m| $1.to_s + $2.to_s.downcase }
 
           if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
-            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if selector =~ Premailer::RE_RESET_SELECTORS
+              if Premailer::RE_RESET_SELECTORS.match?(selector)
                 # 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(selector, declaration)) unless !@options[:preserve_reset]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration)) unless !@options[:preserve_reset]
               end
 
               # Try the new index based technique. If not supported, fall back to the old brute force one.
@@ -68,7 +70,7 @@ class Premailer
           declarations = []
           style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
             begin
-              rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+              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]
@@ -96,7 +98,7 @@ class Premailer
                 new_val.gsub!(/;$|\s*!important/, '').strip!
 
                 # For width and height tags, remove px units
-                new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
+                new_val.gsub!(/(\d+)px/, '\1') if WIDTH_AND_HEIGHT.include?(html_attr)
 
                 # For color-related tags, convert RGB to hex if specified by options
                 new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
@@ -105,7 +107,7 @@ class Premailer
               end
 
               unless @options[:preserve_style_attribute]
-                merged.instance_variable_get("@declarations").tap do |declarations|
+                merged.instance_variable_get(:@declarations).tap do |declarations|
                   declarations.delete(css_attr)
                 end
               end
@@ -255,7 +257,7 @@ class Premailer
         # Fix for removing any CDATA tags from both style and script tags inserted per
         # https://github.com/sparklemotion/nokogiri/issues/311 and
         # https://github.com/premailer/premailer/issues/199
-        %w(style script).each do |tag|
+        ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
             child.swap(child.text()) if child.cdata?
           end
@@ -314,7 +316,7 @@ class Premailer
         index.default = Set.new
         descendants.default = Set.new
 
-        return index, Set.new(all_nodes), descendants
+        [index, Set.new(all_nodes), descendants]
       end
 
       # @param doc The top level document
@@ -354,7 +356,7 @@ class Premailer
       # It will return nil when such a selector is passed, so you can take
       # action on the falsity of the return value.
       def match_selector(index, all_nodes, descendants, selector)
-        if /[^-a-zA-Z0-9_\s.#]/.match(selector) then
+        if /[^-a-zA-Z0-9_\s.#]/.match?(selector) then
           return nil
         end
 

data/lib/premailer/adapter/nokogumbo.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 class Premailer
   module Adapter
     # Nokogiri adapter
     module Nokogumbo
+      WIDTH_AND_HEIGHT = ['width', 'height'].freeze
 
       include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
@@ -25,13 +27,13 @@ class Premailer
           selector.gsub!(/([\s]|^)([\w]+)/) { |m| $1.to_s + $2.to_s.downcase }
 
           if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
-            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if selector =~ Premailer::RE_RESET_SELECTORS
+              if Premailer::RE_RESET_SELECTORS.match?(selector)
                 # 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(selector, declaration)) unless !@options[:preserve_reset]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration)) unless !@options[:preserve_reset]
               end
 
               # Change single ID CSS selectors into xpath so that we can match more
@@ -62,7 +64,7 @@ class Premailer
           declarations = []
           style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
             begin
-              rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+              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]
@@ -90,7 +92,7 @@ class Premailer
                 new_val.gsub!(/;$|\s*!important/, '').strip!
 
                 # For width and height tags, remove px units
-                new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
+                new_val.gsub!(/(\d+)px/, '\1') if WIDTH_AND_HEIGHT.include?(html_attr)
 
                 # For color-related tags, convert RGB to hex if specified by options
                 new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
@@ -99,7 +101,7 @@ class Premailer
               end
 
               unless @options[:preserve_style_attribute]
-                merged.instance_variable_get("@declarations").tap do |declarations|
+                merged.instance_variable_get(:@declarations).tap do |declarations|
                   declarations.delete(css_attr)
                 end
               end
@@ -248,7 +250,7 @@ class Premailer
         # Fix for removing any CDATA tags from both style and script tags inserted per
         # https://github.com/sparklemotion/nokogiri/issues/311 and
         # https://github.com/premailer/premailer/issues/199
-        %w(style script).each do |tag|
+        ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
             child.swap(child.text()) if child.cdata?
           end

data/lib/premailer/adapter/rgb_to_hex.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # RGB helper for adapters, currently only nokogiri supported
 
 module AdapterHelper

data/lib/premailer/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Premailer
   # Manages the adapter classes. Currently supports:
   #
@@ -14,7 +15,7 @@ class Premailer
     REQUIREMENT_MAP = [
       ["nokogiri", :nokogiri],
       ["nokogiri", :nokogiri_fast],
-      ["nokogumbo", :nokogumbo],
+      ["nokogumbo", :nokogumbo]
     ]
 
     # Returns the adapter to use.
@@ -42,7 +43,7 @@ class Premailer
         end
       end
 
-      raise RuntimeError.new("No suitable adapter for Premailer was found, please install nokogiri or nokogumbo")
+      raise "No suitable adapter for Premailer was found, please install nokogiri or nokogumbo"
     end
 
     # Sets the adapter to use.
@@ -56,7 +57,7 @@ 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{|s| s.capitalize}.join}")
     rescue NameError
       raise ArgumentError, "Invalid adapter: #{adapter}"
     end

data/lib/premailer/cached_rule_set.rb

@@ -1,3 +1,4 @@
+# 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

data/lib/premailer/executor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'optparse'
 require 'premailer'
 
@@ -8,12 +9,12 @@ options = {
   :remove_classes    => false,
   :verbose           => false,
   :line_length       => 65,
-  :adapter           => :nokogiri,
+  :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 ""
@@ -79,7 +80,7 @@ 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]
 
@@ -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,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'htmlentities'
 
 # Support functions for Premailer
@@ -13,7 +14,7 @@ module HtmlToPlainText
   #
   # TODO: add support for DL, OL
   # 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')
+  def convert_to_text(html, line_length = 65, _from_charset = 'UTF-8')
     txt = +html
 
     # strip text ignored html. Useful for removing
@@ -50,7 +51,7 @@ module HtmlToPlainText
 
       if text.empty?
         ''
-      elsif href.nil? || text.strip.downcase == href.strip.downcase
+      elsif href.nil? || text.strip.casecmp(href.strip) == 0
         text.strip
       else
         text.strip + ' ( ' + href.strip + ' )'

data/lib/premailer/premailer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Premailer processes HTML and CSS to improve e-mail deliverability.
 #
 # Premailer's main function is to render all CSS as inline <tt>style</tt>
@@ -141,7 +142,7 @@ class Premailer
   include Warnings
 
   # Waning level names
-  WARN_LABEL = %w(NONE SAFE POOR RISKY)
+  WARN_LABEL = ['NONE', 'SAFE', 'POOR', 'RISKY']
 
   # Create a new Premailer object.
   #
@@ -212,8 +213,7 @@ class Premailer
                 :create_shorthands => true,
                 :html_fragment => false,
                 :adapter => Adapter.use,
-                :drop_unmergeable_css_rules => false
-                }.merge(options)
+                :drop_unmergeable_css_rules => false}.merge(options)
 
     @html_file = html
     @is_local_file = @options[:with_html_string] || Premailer.local_data?(html)
@@ -265,10 +265,10 @@ class Premailer
 protected
   def load_css_from_local_file!(path)
     css_block = +''
-    path.gsub!(/\Afile:/, '')
+    path.delete_prefix!('file:')
     begin
       File.open(path, "r") do |file|
-        while line = file.gets
+        while (line = file.gets)
           css_block << line
         end
       end
@@ -355,12 +355,12 @@ public
     media_types.split(/[\s]+|,/).any? { |media_type| media_type.strip =~ /screen|handheld|all/i }
   end
 
-  def append_query_string(doc, qs)
-    return doc if qs.nil?
+  def append_query_string(doc, queries)
+    return doc if queries.nil?
 
-    qs = +qs
-    qs.to_s.gsub!(/^[\?]*/, '').strip!
-    return doc if qs.empty?
+    queries = +queries
+    queries.to_s.gsub!(/^[\?]*/, '').strip!
+    return doc if queries.empty?
 
     begin
       current_host = @base_url.host
@@ -368,18 +368,18 @@ public
       current_host = nil
     end
 
-    $stderr.puts "Attempting to append_query_string: #{qs}" if @options[:verbose]
+    $stderr.puts "Attempting to append_query_string: #{queries}" if @options[:verbose]
 
-    doc.search('a').each do|el|
+    doc.search('a').each do |el|
       href = el.attributes['href'].to_s.strip
       next if href.nil? or href.empty?
 
-      next if href[0,1] =~ /[\#\{\[\<\%]/ # don't bother with anchors or special-looking links
+      next if /[\#\{\[\<\%]/.match?(href[0,1]) # don't bother with anchors or special-looking links
 
       begin
         href = Addressable::URI.parse(href)
 
-        if current_host and href.host != nil and href.host != current_host
+        if current_host and !href.host.nil? and href.host != current_host
           $stderr.puts "Skipping append_query_string for: #{href.to_s} because host is no good" if @options[:verbose]
           next
         end
@@ -391,9 +391,9 @@ public
 
         if href.query and not href.query.empty?
           amp = @options[:unescaped_ampersand] ? '&' : '&amp;'
-          href.query = href.query + amp + qs
+          href.query = href.query + amp + queries
         else
-          href.query = qs
+          href.query = queries
         end
 
         el['href'] = href.to_s
@@ -436,11 +436,11 @@ public
       tags.each do |tag|
         # skip links that look like they have merge tags
         # and mailto, ftp, etc...
-        if tag.attributes[attribute].to_s =~ /^([\%\<\{\#\[]|data:|tel:|file:|sms:|callto:|facetime:|mailto:|ftp:|gopher:|cid:)/i
+        if /^([\%\<\{\#\[]|data:|tel:|file:|sms:|callto:|facetime:|mailto:|ftp:|gopher:|cid:)/i.match?(tag.attributes[attribute].to_s)
           next
         end
 
-        if tag.attributes[attribute].to_s =~ /^http/i
+        if /^http/i.match?(tag.attributes[attribute].to_s)
           begin
             merged = Addressable::URI.parse(tag.attributes[attribute])
           rescue; next; end
@@ -477,7 +477,7 @@ public
     path = +path
     path.strip!
     resolved = nil
-    if path =~ /\A(?:(https?|ftp|file):)\/\//i
+    if /\A(?:(https?|ftp|file):)\/\//i.match?(path)
       resolved = path
       Premailer.canonicalize(resolved)
     elsif base_path.kind_of?(Addressable::URI)

data/lib/premailer/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 class Premailer
   # Premailer version.
-  VERSION = '1.24.0'.freeze
+  VERSION = '1.26.0'
 end

data/lib/premailer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'yaml'
 require 'open-uri'
 require 'digest/sha2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +157,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.62.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.62.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="