premailer 1.18.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a7dce51bfedaef59c17b84a78c74af9dbd6af2a32ae2e64bbb8105346a152e
-  data.tar.gz: cc17465063476f728e4dd1308909dfd0c240b32f53d250dafa307da7b1fde01a
+  metadata.gz: 037056bb30a304387a4746310417cbf88c3efa7dc59901989334b6741b1199a7
+  data.tar.gz: 4e92b08924143d560f84f23ca117c29445a3c038d78c09ded7b5e9c0ba7af065
 SHA512:
-  metadata.gz: a402ccb956b7c663190ac6adffdfe56ed38352e58a1dd599d5f1999f7417aeae4e3f820bc1745b32c937be5334b3046fb6fd64be9b42d6dd362b847c49f0ac12
-  data.tar.gz: f9ce454c789ad0082b98bc246cfd055a27d24e2dad37edf95921595ae30c377151f713877c346573a55ac13236fcadfa8912035d3e7efd4cd525b07df5959745
+  metadata.gz: 6e628663bb621b3f5ae5a81855af90455c1ed9eeb6cd154df24d8641d831f617a2f6b5314079f05f4bbed475ea6e9cf1ce66cfa05f49a7d9b268494bb3282509
+  data.tar.gz: 3814f3e413553a54af47c95f21293e58a3a80547983e973deca7360cdaa86e0fe5eccf7abf2c0b67c99d174831ac16c07f384a1fbf5768cd03d7717218f37eae

data/lib/premailer/adapter/nokogiri.rb

@@ -73,7 +73,11 @@ class Premailer
 
           # 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 +241,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

@@ -237,14 +237,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

@@ -231,11 +231,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/premailer.rb

@@ -507,8 +507,8 @@ public
 
   # Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
   def check_client_support # :nodoc:
-    kwargs = RUBY_VERSION >= "3.1.0" ? { aliases: true } : {}
-    @client_support ||= YAML::load(File.open(CLIENT_SUPPORT_FILE), **kwargs)
+    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.18.0'.freeze
+  VERSION = '1.20.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser