RubyGems - premailer - Versions diffs - 1.23.0 → 1.27.0 - Mend

premailer 1.23.0 → 1.27.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
data/README.md +49 -29
data/bin/premailer +1 -1
data/lib/premailer/adapter/nokogiri.rb +11 -8
data/lib/premailer/adapter/nokogiri_fast.rb +12 -10
data/lib/premailer/adapter/nokogumbo.rb +10 -8
data/lib/premailer/adapter/rgb_to_hex.rb +1 -0
data/lib/premailer/adapter.rb +4 -3
data/lib/premailer/cached_rule_set.rb +1 -0
data/lib/premailer/executor.rb +5 -4
data/lib/premailer/html_to_plain_text.rb +4 -3
data/lib/premailer/premailer.rb +22 -20
data/lib/premailer/version.rb +2 -1
data/lib/premailer.rb +1 -0
metadata +21 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6e9ef14eeb9cdffd7e718f976d9e71e50fb1f154c947c9ee9b97399f1aceeb
-  data.tar.gz: 02d8f609acce2abb421f607e1937e35e4d36f12c609386bef808378f56e9753c
+  metadata.gz: 31108244f6afc74508eef1337a9b99adc7f2643b5412e2aacf808ecb8c520101
+  data.tar.gz: b2f10188d4b7143050eb86e04776c38fc220ebb834da7871e838fe47db5fe9c5
 SHA512:
-  metadata.gz: d1e580add5528f240e2170bb2aed29171227d35ce8acc31d5c8ceed7ea3f211072f8db8257f9665bef5838c606c9f77a56a792482c3d5f730025a6448374a4bb
-  data.tar.gz: 3afd5c1330b5b1ddff158e77260c0fc87876779e839f5f1beb641ea4c00d424db97c0b5410a566f08ac97a3615cd125c8d9198a77d5edf3ee5959abcc2058440
+  metadata.gz: 4cd3655f0aa411da6d874dd50e2e1ab1c6f1cae4f9882cfa84a6ec2022174f5d9670d439527bb27618774f7f731f7ac24b35420c58926db159b4f81e85cb660d
+  data.tar.gz: aa583335ee3a7b0de99320aff3c162d233825c99fbfe287ae13f12790c4b54728b7b0460861f928efe9ddae07416aafb229058f698267214e8b740ff94ea20a8

data/README.md CHANGED Viewed

@@ -4,7 +4,7 @@
 For the best HTML e-mail delivery results, CSS should be inline. This is a
 huge pain and a simple newsletter becomes un-managable very quickly. This
-script is my solution.
+gem is a solution.
 * CSS styles are converted to inline style attributes
   - Checks `style` and `link[rel=stylesheet]` tags and preserves existing inline attributes
@@ -12,35 +12,26 @@ script is my solution.
   - Checks links in `href`, `src` and CSS `url('')`
 * CSS properties are checked against e-mail client capabilities
   - Based on the Email Standards Project's guides
-* A [plain text version](https://premailer.github.io/premailer/HtmlToPlainText.html) is created (optional)
+* A [plain text version](#plain-text-version) is created (optional)
 ## Installation
-Install the Premailer gem from RubyGems.
 ```bash
 gem install premailer
 ```
-or add it to your `Gemfile` and run `bundle`.
 ## Example
 ```ruby
 require 'premailer'
-premailer = Premailer.new('http://example.com/myfile.html', :warn_level => Premailer::Warnings::SAFE)
+premailer = Premailer.new('http://example.com/myfile.html', warn_level: Premailer::Warnings::SAFE)
-# Write the plain-text output
-# This must come before to_inline_css (https://github.com/premailer/premailer/issues/201)
-File.open("output.txt", "w") do |fout|
-  fout.puts premailer.to_plain_text
-end
+# Write the plain-text output (must come before to_inline_css)
+File.write "output.txt", premailer.to_plain_text
 # Write the HTML output
-File.open("output.html", "w") do |fout|
-  fout.puts premailer.to_inline_css
-end
+File.write "output.html", premailer.to_inline_css
 # Output any CSS warnings
 premailer.warnings.each do |w|
@@ -50,17 +41,13 @@ end
 ## Adapters
-Premailer's default adapter is nokogiri if both nokogiri and nokogumbo are included in the Gemfile list. However, if you want to use a different adapter, you can choose to.
-There are three adapters in total (as of premailer 1.10.0)
 1. nokogiri (default)
-2. nokogiri_fast
+2. nokogiri_fast (20x speed, more memory)
 3. nokogumbo
-hpricot adapter removed due to its EOL, please use `~>1.9.0` version if You still need it..
+(hpricot adapter removed, use `~>1.9.0` version if you need it)
-`NokogiriFast` adapter improves the Algorithmic complexity of the running time by 20x with a slight compensation on memory. To switch to any of these adapters, add the following line. For example, if you want to include the `NokogiriFast` adapter,
+Picking an adapter:
 ```ruby
 Premailer::Adapter.use = :nokogiri_fast
@@ -97,22 +84,56 @@ will result in
 <table cellspacing='5' width='500'>
 ```
-## Configuration options
+## Plain text version
+Premailer can generate a plain text version of your HTML. Links and images will be inlined.
-The behavior of Premailer can be configured by passing options in the initializer.
+For example
-For example, the following will accept HTML from a string and will exclude unmergeable css from being added to the `<head>` of the output document.
+```html
+<a href="https://example.com" >
+  <img src="https://github.com/premailer.png" alt="Premailer Logo" />
+</a>
+```
+will become
+```text
+Premailer Logo ( https://example.com )
+```
+To ignore/omit a section of HTML content from the plain text version, wrap it with the following comments.
+```html
+<!-- start text/html -->
+<p>This will be omitted from the plain text version.</p>
+<p>
+  This is extremely helpful for <strong>removing email headers and footers</strong>
+  that aren't needed in the text version.
+</p>
+<!-- end text/html -->
+```
+## Configuration options
+For example:
 ```ruby
-premailer = Premailer.new(html_string, with_html_string: true, drop_unmergeable_css_rules: true)
+Premailer.new(
+  html, # html as string
+  with_html_string: true,
+  drop_unmergeable_css_rules: true
+)
 ```
-[See here for a full list of the available options](https://premailer.github.io/premailer/Premailer.html#initialize-instance_method).
+[available options](https://premailer.github.io/premailer/Premailer.html#initialize-instance_method)
 ## Contributions
-Contributions are most welcome.  Premailer was rotting away in a private SVN repository for too long and could use some TLC.  Fork and patch to your heart's content.  Please don't increment the version numbers, though.
+Contributions are most welcome.
+Premailer was rotting away in a private SVN repository for too long and could use some TLC.
+Fork and patch to your heart's content.
+Please don't increment the version numbers.
 A few areas that are particularly in need of love:
@@ -129,4 +150,3 @@ and to [Campaign Monitor](https://www.campaignmonitor.com/) for supporting the w
 The source code can be found on [GitHub](https://github.com/premailer/premailer).
 Copyright by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-2017.  See [LICENSE.md](https://github.com/premailer/premailer/blob/master/LICENSE.md) for license details.

data/bin/premailer CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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
@@ -61,8 +63,8 @@ class Premailer
         doc.search("*[@style]").each do |el|
           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)
+          declarations = style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/m).filter_map do |declaration|
+            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
@@ -235,6 +237,7 @@ class Premailer
         # Handle HTML entities
         if @options[:replace_html_entities] == true and thing.is_a?(String)
+          thing = +thing
           HTML_ENTITIES.map do |entity, replacement|
             thing.gsub! entity, replacement
           end
@@ -249,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 CHANGED Viewed

@@ -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.
@@ -66,9 +68,9 @@ class Premailer
           style = el.attributes['style'].to_s
           declarations = []
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
+          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/m).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 CHANGED Viewed

@@ -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
@@ -60,9 +62,9 @@ class Premailer
           style = el.attributes['style'].to_s
           declarations = []
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
+          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/m).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 CHANGED Viewed

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

data/lib/premailer/adapter.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'htmlentities'
 # Support functions for Premailer
@@ -13,8 +14,8 @@ 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')
-    txt = html
+  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
@@ -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 CHANGED Viewed

@@ -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>
@@ -15,7 +16,7 @@
 # fout.close
 #
 # # Write the plain-text output
-# fout = File.open("ouput.txt", "w")
+# fout = File.open("output.txt", "w")
 # fout.puts premailer.to_plain_text
 # fout.close
 #
@@ -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)
@@ -264,11 +264,11 @@ class Premailer
 protected
   def load_css_from_local_file!(path)
-    css_block = ''
-    path.gsub!(/\Afile:/, '')
+    css_block = +''
+    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,11 +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.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
@@ -367,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
@@ -390,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
@@ -435,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
@@ -473,9 +474,10 @@ public
   # @private
   def self.resolve_link(path, base_path) # :nodoc:
+    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 CHANGED Viewed

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

data/lib/premailer.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-08-26 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:
     - - ">="