premailer 1.14.2 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a86c84cdb9f81b643fda4dfd1f724657e73d8ef1ba2775e90e3f38a5e7cbb6
-  data.tar.gz: 2e15c7ed98ec6a73c6c8c1daceef050e86dca1496ff63ff84b91c8ebae0992a6
+  metadata.gz: c5569e920c965e583c48c9f8501b77b951c73d07c9be2f922ab4924dc1166871
+  data.tar.gz: a8a665fe6ec7ba543b53ca24869e3c73bbf793cb003e4d27e4f854523309b605
 SHA512:
-  metadata.gz: be8096560990ffc0fa62ae3593add156970263ea37a72d79ff439cc8cd097e0d293f4997ed82c1e78e02406923bda419693a751a9f4bb149388acec81b9cef2a
-  data.tar.gz: 3df71e24a57e2d65e1a852aa58b5fa90df4c98cd730c537b678564f4e437b75b8e2c1586a56d0ceb6e23b47b42bcc345373a5b711bf3ae5d453dece723b2bc22
+  metadata.gz: 3dc465f0f358d41f34ceef3c35fceda64f18d0b3e6ef27497dd649f4ce775c37a52d0f7ff12e5702e67ba6dc59760cedc5c706e8194a0b3063c9215644299f76
+  data.tar.gz: 78aa6ffd3c33aabc6eab536d09c4f00bb5a775e32db01b3445aa96530af1a1d950760de0cc99609008dd0d1af01d6976eacd298fb4acb705005070faa7c4c747

data/README.md

@@ -1,4 +1,4 @@
-# Premailer README [![Build Status](https://travis-ci.org/premailer/premailer.svg?branch=master)](https://travis-ci.org/premailer/premailer) [![Gem Version](https://badge.fury.io/rb/premailer.svg)](https://badge.fury.io/rb/premailer)
+# Premailer README [![CI](https://github.com/premailer/premailer/actions/workflows/actions.yml/badge.svg)](https://github.com/premailer/premailer/actions/workflows/actions.yml) [![Gem Version](https://badge.fury.io/rb/premailer.svg)](https://badge.fury.io/rb/premailer)
 
 ## What is this?
 
@@ -68,7 +68,7 @@ Premailer::Adapter.use = :nokogiri_fast
 
 ## Ruby Compatibility
 
-See .travis.yml for which ruby versions are tested. JRuby support is close, contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](https://travis-ci.org/#!/premailer/premailer).
+See .github/workflows/actions.yml for which ruby versions are tested. JRuby support is close, contributors are welcome.
 
 ## Premailer-specific CSS
 

data/lib/premailer/adapter/nokogiri.rb

@@ -125,13 +125,13 @@ class Premailer
           doc.search("a[@href^='#']").each do |el|
             target = el.get_attribute('href')[1..-1]
             targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
+            el.set_attribute('href', "#" + Digest::SHA256.hexdigest(target))
           end
           # hash ids that are links target, delete others
           doc.search("*[@id]").each do |el|
             id = el.get_attribute('id')
             if targets.include?(id)
-              el.set_attribute('id', Digest::MD5.hexdigest(id))
+              el.set_attribute('id', Digest::SHA256.hexdigest(id))
             else
               el.remove_attribute('id')
             end

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -129,13 +129,13 @@ class Premailer
           doc.search("a[@href^='#']").each do |el|
             target = el.get_attribute('href')[1..-1]
             targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
+            el.set_attribute('href', "#" + Digest::SHA256.hexdigest(target))
           end
           # hash ids that are links target, delete others
           doc.search("*[@id]").each do |el|
             id = el.get_attribute('id')
             if targets.include?(id)
-              el.set_attribute('id', Digest::MD5.hexdigest(id))
+              el.set_attribute('id', Digest::SHA256.hexdigest(id))
             else
               el.remove_attribute('id')
             end

data/lib/premailer/adapter/nokogumbo.rb

@@ -1,5 +1,3 @@
-require 'nokogumbo'
-
 class Premailer
   module Adapter
     # Nokogiri adapter
@@ -125,13 +123,13 @@ class Premailer
           doc.search("a[@href^='#']").each do |el|
             target = el.get_attribute('href')[1..-1]
             targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
+            el.set_attribute('href', "#" + Digest::SHA256.hexdigest(target))
           end
           # hash ids that are links target, delete others
           doc.search("*[@id]").each do |el|
             id = el.get_attribute('id')
             if targets.include?(id)
-              el.set_attribute('id', Digest::MD5.hexdigest(id))
+              el.set_attribute('id', Digest::SHA256.hexdigest(id))
             else
               el.remove_attribute('id')
             end

data/lib/premailer/html_to_plain_text.rb

@@ -39,25 +39,21 @@ module HtmlToPlainText
     # remove script tags and content
     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.downcase == href.strip.downcase
+        text.strip
       else
-        $3.strip + ' ( ' + $2.strip + ' )'
+        text.strip + ' ( ' + href.strip + ' )'
       end
     end
 

data/lib/premailer/premailer.rb

@@ -178,7 +178,7 @@ class Premailer
   # @option options [String] :output_encoding Output encoding option for Nokogiri adapter. Should be set to "US-ASCII" to output HTML entities instead of Unicode characters.
   # @option options [Boolean] :create_shorthands Combine several properties into a shorthand one, e.g. font: style weight size. Default is true.
   # @option options [Boolean] :html_fragment Handle HTML fragment without any HTML content wrappers. Default is false.
-  # @option options [Boolean] :drop_unmergeable_css_rules Do not include unmergeable css rules in a <tt><style><tt> tag. Default is false.  
+  # @option options [Boolean] :drop_unmergeable_css_rules Do not include unmergeable css rules in a <tt><style><tt> tag. Default is false.
   def initialize(html, options = {})
     @options = {:warn_level => Warnings::SAFE,
                 :line_length => 65,
@@ -499,14 +499,8 @@ public
   def self.canonicalize(uri) # :nodoc:
     u = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI.parse(uri.to_s)
     u.normalize!
-    newpath = u.path
-    while newpath.gsub!(%r{([^/]+)/\.\./?}) { |match|
-        $1 == '..' ? match : ''
-      } do end
-      newpath = newpath.gsub(%r{/\./}, '/').sub(%r{/\.\z}, '/')
-      u.path = newpath
-      u.to_s
-    end
+    u.to_s
+  end
 
   # Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
   def check_client_support # :nodoc:

data/lib/premailer/version.rb

@@ -1,4 +1,4 @@
 class Premailer
   # Premailer version.
-  VERSION = '1.14.2'.freeze
+  VERSION = '1.16.0'.freeze
 end

data/lib/premailer.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 require 'open-uri'
-require 'digest/md5'
+require 'digest/sha2'
 require 'cgi'
 require 'addressable/uri'
 require 'css_parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.16.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +156,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogumbo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +193,8 @@ files:
 - lib/premailer/version.rb
 - misc/client_support.yaml
 homepage: https://github.com/premailer/premailer
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata:
   yard.run: yri
 post_install_message: 
@@ -218,14 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Preflight for HTML e-mail.