premailer 1.16.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5569e920c965e583c48c9f8501b77b951c73d07c9be2f922ab4924dc1166871
-  data.tar.gz: a8a665fe6ec7ba543b53ca24869e3c73bbf793cb003e4d27e4f854523309b605
+  metadata.gz: ea6e9ef14eeb9cdffd7e718f976d9e71e50fb1f154c947c9ee9b97399f1aceeb
+  data.tar.gz: 02d8f609acce2abb421f607e1937e35e4d36f12c609386bef808378f56e9753c
 SHA512:
-  metadata.gz: 3dc465f0f358d41f34ceef3c35fceda64f18d0b3e6ef27497dd649f4ce775c37a52d0f7ff12e5702e67ba6dc59760cedc5c706e8194a0b3063c9215644299f76
-  data.tar.gz: 78aa6ffd3c33aabc6eab536d09c4f00bb5a775e32db01b3445aa96530af1a1d950760de0cc99609008dd0d1af01d6976eacd298fb4acb705005070faa7c4c747
+  metadata.gz: d1e580add5528f240e2170bb2aed29171227d35ce8acc31d5c8ceed7ea3f211072f8db8257f9665bef5838c606c9f77a56a792482c3d5f730025a6448374a4bb
+  data.tar.gz: 3afd5c1330b5b1ddff158e77260c0fc87876779e839f5f1beb641ea4c00d424db97c0b5410a566f08ac97a3615cd125c8d9198a77d5edf3ee5959abcc2058440

data/lib/premailer/adapter/nokogiri.rb

@@ -61,15 +61,21 @@ class Premailer
         doc.search("*[@style]").each do |el|
           style = el.attributes['style'].to_s
 
-          declarations = []
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-            declarations << rs
+          declarations = style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).filter_map do |declaration|
+            rs = Premailer::CachedRuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+            rs.expand_shorthand!
+            rs
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
           end
 
           # Perform style folding
           merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
+          begin
+            merged.expand_shorthand!
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
+          end
 
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
@@ -233,14 +239,7 @@ class Premailer
             thing.gsub! entity, replacement
           end
         end
-        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-        # However, we really don't want to hardcode this. ASCII-8BIT should be the default, but not the only option.
-        encoding = if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
-          thing = thing.force_encoding(@options[:input_encoding]).encode!
-          @options[:input_encoding]
-        else
-          @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
-        end
+        encoding = @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
         doc = if @options[:html_fragment]
           ::Nokogiri::HTML.fragment(thing, encoding)
         else

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -67,13 +67,21 @@ class Premailer
 
           declarations = []
           style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-            declarations << rs
+            begin
+              rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+              declarations << rs
+            rescue ArgumentError => e
+              raise e if @options[:rule_set_exceptions]
+            end
           end
 
           # Perform style folding
           merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
+          begin
+            merged.expand_shorthand!
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
+          end
 
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
@@ -237,14 +245,7 @@ class Premailer
             thing.gsub! entity, replacement
           end
         end
-        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-        # However, we really don't want to hardcode this. ASCII-8BIT should be the default, but not the only option.
-        encoding = if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
-          thing = thing.force_encoding(@options[:input_encoding]).encode!
-          @options[:input_encoding]
-        else
-          @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
-        end
+        encoding = @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
         doc = if @options[:html_fragment]
           ::Nokogiri::HTML.fragment(thing, encoding)
         else

data/lib/premailer/adapter/nokogumbo.rb

@@ -61,13 +61,21 @@ class Premailer
 
           declarations = []
           style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-            declarations << rs
+            begin
+              rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
+              declarations << rs
+            rescue ArgumentError => e
+              raise e if @options[:rule_set_exceptions]
+            end
           end
 
           # Perform style folding
           merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
+          begin
+            merged.expand_shorthand!
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
+          end
 
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
@@ -231,11 +239,6 @@ class Premailer
             thing.gsub! entity, replacement
           end
         end
-        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-        # However, we really don't want to hardcode this. ASCII-8BIT should be the default, but not the only option.
-        if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
-          thing = thing.force_encoding(@options[:input_encoding]).encode!
-        end
         doc = if @options[:html_fragment]
           ::Nokogiri::HTML5.fragment(thing)
         else

data/lib/premailer/adapter/rgb_to_hex.rb

@@ -9,13 +9,14 @@ module AdapterHelper
     def is_rgb?(color)
       pattern = %r{
       rgb
-      \(\s*    # literal open, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*,\s*     # comma, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*,\s*     # comma, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*\)       # literal close, with optional whitespace
+      \(\s*                    # literal open, with optional whitespace
+      (\d{1,3})                # capture 1-3 digits
+      (?:\s*,\s*|\s+)          # comma or whitespace
+      (\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*\)                    # literal close, with optional whitespace
       }x
 
       pattern.match(color)

data/lib/premailer/cached_rule_set.rb

@@ -0,0 +1,12 @@
+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/premailer.rb

@@ -168,7 +168,8 @@ class Premailer
   # @option options [Boolean] :preserve_reset Whether to preserve styles associated with the MailChimp reset code. Default is true.
   # @option options [Boolean] :with_html_string Whether the html param should be treated as a raw string. Default is false.
   # @option options [Boolean] :verbose Whether to print errors and warnings to <tt>$stderr</tt>.  Default is false.
-  # @option options [Boolean] :io_exceptions Throws exceptions on I/O errors.
+  # @option options [Boolean] :io_exceptions Throws exceptions on I/O errors. Default is false.
+  # @option options [Boolean] :rule_set_exceptions Throws exceptions on invalid values in CSS Parser rule sets. Default is true.
   # @option options [Boolean] :include_link_tags Whether to include css from <tt>link rel=stylesheet</tt> tags.  Default is true.
   # @option options [Boolean] :include_style_tags Whether to include css from <tt>style</tt> tags.  Default is true.
   # @option options [String] :input_encoding Manually specify the source documents encoding. This is a good idea. Default is ASCII-8BIT.
@@ -200,6 +201,7 @@ class Premailer
                 :verbose => false,
                 :debug => false,
                 :io_exceptions => false,
+                :rule_set_exceptions => true,
                 :include_link_tags => true,
                 :include_style_tags => true,
                 :input_encoding => 'ASCII-8BIT',
@@ -233,7 +235,8 @@ class Premailer
     @css_parser = CssParser::Parser.new({
       :absolute_paths => true,
       :import => true,
-      :io_exceptions => @options[:io_exceptions]
+      :io_exceptions => @options[:io_exceptions],
+      :rule_set_exceptions => @options[:rule_set_exceptions]
     })
 
     @adapter_class = Adapter.find @options[:adapter]
@@ -504,7 +507,8 @@ public
 
   # Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
   def check_client_support # :nodoc:
-    @client_support ||= YAML::load(File.open(CLIENT_SUPPORT_FILE))
+    kwargs = Psych::VERSION >= '4' ? { aliases: true } : {}
+    @client_support ||= Psych.load(File.open(CLIENT_SUPPORT_FILE), **kwargs)
 
     warnings = []
     properties = []

data/lib/premailer/version.rb

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

data/lib/premailer.rb

@@ -9,3 +9,4 @@ require 'premailer/adapter'
 require 'premailer/adapter/rgb_to_hex'
 require 'premailer/html_to_plain_text'
 require 'premailer/premailer'
+require 'premailer/cached_rule_set'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Alex Dunae
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2024-03-05 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.6.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - lib/premailer/adapter/nokogiri_fast.rb
 - lib/premailer/adapter/nokogumbo.rb
 - lib/premailer/adapter/rgb_to_hex.rb
+- lib/premailer/cached_rule_set.rb
 - lib/premailer/executor.rb
 - lib/premailer/html_to_plain_text.rb
 - lib/premailer/premailer.rb
@@ -197,7 +198,8 @@ licenses:
 - BSD-3-Clause
 metadata:
   yard.run: yri
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,15 +207,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Preflight for HTML e-mail.
 test_files: []