premailer 1.20.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037056bb30a304387a4746310417cbf88c3efa7dc59901989334b6741b1199a7
-  data.tar.gz: 4e92b08924143d560f84f23ca117c29445a3c038d78c09ded7b5e9c0ba7af065
+  metadata.gz: f373e83545e1f1b1ca346a0bfcfe2fa79daf3b0b64e71f2b346e19421495669c
+  data.tar.gz: ba3eb857e1fd0c956489566776b8f911a8da10372aad4932c89fb7c6c0e65d68
 SHA512:
-  metadata.gz: 6e628663bb621b3f5ae5a81855af90455c1ed9eeb6cd154df24d8641d831f617a2f6b5314079f05f4bbed475ea6e9cf1ce66cfa05f49a7d9b268494bb3282509
-  data.tar.gz: 3814f3e413553a54af47c95f21293e58a3a80547983e973deca7360cdaa86e0fe5eccf7abf2c0b67c99d174831ac16c07f384a1fbf5768cd03d7717218f37eae
+  metadata.gz: ba181a7933d0281f01de3b91956282d15b5958ca544e57ed9dc7a79923140f4e6b9c873ee77cd1e84060db624194cbf33cf90078395e66edea714d1ca30d2653
+  data.tar.gz: 7e61434faf7ed25db77f310fb9adc322322deb0dacfc5ec763645920f0d3c51ebefe50dddc58a2591dce99415cc9da7a4fa9b4b484289a1e6934ebdb143a8b14

data/lib/premailer/adapter/nokogiri.rb

@@ -61,14 +61,12 @@ class Premailer
         doc.search("*[@style]").each do |el|
           style = el.attributes['style'].to_s
 
-          declarations = []
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            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
+          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

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]

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]

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/version.rb

@@ -1,4 +1,4 @@
 class Premailer
   # Premailer version.
-  VERSION = '1.20.0'.freeze
+  VERSION = '1.22.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.20.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -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