premailer 1.13.1 → 1.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/premailer/adapter/nokogiri.rb +21 -8
- data/lib/premailer/adapter/nokogiri_fast.rb +20 -5
- data/lib/premailer/adapter/nokogumbo.rb +21 -8
- data/lib/premailer/html_to_plain_text.rb +11 -15
- data/lib/premailer/premailer.rb +3 -9
- data/lib/premailer/version.rb +1 -1
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1cbcf7916881885f8da597bf060d93f4faa9a909051f3be3331d63c01b12d07f
|
4
|
+
data.tar.gz: 9f507ecec471e66009960367a42ffb618a6f9769fa3bc59358c40e9c0e676bd8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 823f4d6c03aaa776cca778046154c5471312ffcd79296801f94b9cc8b06e5e5a5ca79e5a3f668b03e17fa72ec3419250388ce79c4ddf8cc800c6e9554b783b4b
|
7
|
+
data.tar.gz: 43ce39e4a1bc35a4e275072c64ee806b7bb8a735b40eafd67dc2da95671a6299ec9c6df0e35e2d6db86158245b8c9db6815fb96573953a452d95097fa760abe7
|
data/README.md
CHANGED
@@ -68,7 +68,7 @@ Premailer::Adapter.use = :nokogiri_fast
|
|
68
68
|
|
69
69
|
## Ruby Compatibility
|
70
70
|
|
71
|
-
|
71
|
+
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).
|
72
72
|
|
73
73
|
## Premailer-specific CSS
|
74
74
|
|
@@ -55,9 +55,7 @@ class Premailer
|
|
55
55
|
end
|
56
56
|
|
57
57
|
# Remove script tags
|
58
|
-
if @options[:remove_scripts]
|
59
|
-
doc.search("script").remove
|
60
|
-
end
|
58
|
+
doc.search("script").remove if @options[:remove_scripts]
|
61
59
|
|
62
60
|
# Read STYLE attributes and perform folding
|
63
61
|
doc.search("*[@style]").each do |el|
|
@@ -75,18 +73,33 @@ class Premailer
|
|
75
73
|
|
76
74
|
# Duplicate CSS attributes as HTML attributes
|
77
75
|
if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
|
78
|
-
Premailer::RELATED_ATTRIBUTES[el.name].each do |
|
79
|
-
if el[
|
80
|
-
|
81
|
-
|
76
|
+
Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
|
77
|
+
if el[html_attr].nil? and not merged[css_attr].empty?
|
78
|
+
new_val = merged[css_attr].dup
|
79
|
+
|
80
|
+
# Remove url() function wrapper
|
81
|
+
new_val.gsub!(/url\((['"])(.*?)\1\)/, '\2')
|
82
|
+
|
83
|
+
# Remove !important, trailing semi-colon, and leading/trailing whitespace
|
84
|
+
new_val.gsub!(/;$|\s*!important/, '').strip!
|
85
|
+
|
86
|
+
# For width and height tags, remove px units
|
87
|
+
new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
|
88
|
+
|
89
|
+
# For color-related tags, convert RGB to hex if specified by options
|
90
|
+
new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
|
91
|
+
|
92
|
+
el[html_attr] = new_val
|
82
93
|
end
|
94
|
+
|
83
95
|
unless @options[:preserve_style_attribute]
|
84
96
|
merged.instance_variable_get("@declarations").tap do |declarations|
|
85
|
-
|
97
|
+
declarations.delete(css_attr)
|
86
98
|
end
|
87
99
|
end
|
88
100
|
end
|
89
101
|
end
|
102
|
+
|
90
103
|
# Collapse multiple rules into one as much as possible.
|
91
104
|
merged.create_shorthand! if @options[:create_shorthands]
|
92
105
|
|
@@ -77,18 +77,33 @@ class Premailer
|
|
77
77
|
|
78
78
|
# Duplicate CSS attributes as HTML attributes
|
79
79
|
if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
|
80
|
-
Premailer::RELATED_ATTRIBUTES[el.name].each do |
|
81
|
-
if el[
|
82
|
-
|
83
|
-
|
80
|
+
Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
|
81
|
+
if el[html_attr].nil? and not merged[css_attr].empty?
|
82
|
+
new_val = merged[css_attr].dup
|
83
|
+
|
84
|
+
# Remove url() function wrapper
|
85
|
+
new_val.gsub!(/url\((['"])(.*?)\1\)/, '\2')
|
86
|
+
|
87
|
+
# Remove !important, trailing semi-colon, and leading/trailing whitespace
|
88
|
+
new_val.gsub!(/;$|\s*!important/, '').strip!
|
89
|
+
|
90
|
+
# For width and height tags, remove px units
|
91
|
+
new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
|
92
|
+
|
93
|
+
# For color-related tags, convert RGB to hex if specified by options
|
94
|
+
new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
|
95
|
+
|
96
|
+
el[html_attr] = new_val
|
84
97
|
end
|
98
|
+
|
85
99
|
unless @options[:preserve_style_attribute]
|
86
100
|
merged.instance_variable_get("@declarations").tap do |declarations|
|
87
|
-
|
101
|
+
declarations.delete(css_attr)
|
88
102
|
end
|
89
103
|
end
|
90
104
|
end
|
91
105
|
end
|
106
|
+
|
92
107
|
# Collapse multiple rules into one as much as possible.
|
93
108
|
merged.create_shorthand! if @options[:create_shorthands]
|
94
109
|
|
@@ -55,9 +55,7 @@ class Premailer
|
|
55
55
|
end
|
56
56
|
|
57
57
|
# Remove script tags
|
58
|
-
if @options[:remove_scripts]
|
59
|
-
doc.search("script").remove
|
60
|
-
end
|
58
|
+
doc.search("script").remove if @options[:remove_scripts]
|
61
59
|
|
62
60
|
# Read STYLE attributes and perform folding
|
63
61
|
doc.search("*[@style]").each do |el|
|
@@ -75,18 +73,33 @@ class Premailer
|
|
75
73
|
|
76
74
|
# Duplicate CSS attributes as HTML attributes
|
77
75
|
if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
|
78
|
-
Premailer::RELATED_ATTRIBUTES[el.name].each do |
|
79
|
-
if el[
|
80
|
-
|
81
|
-
|
76
|
+
Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
|
77
|
+
if el[html_attr].nil? and not merged[css_attr].empty?
|
78
|
+
new_val = merged[css_attr].dup
|
79
|
+
|
80
|
+
# Remove url() function wrapper
|
81
|
+
new_val.gsub!(/url\((['"])(.*?)\1\)/, '\2')
|
82
|
+
|
83
|
+
# Remove !important, trailing semi-colon, and leading/trailing whitespace
|
84
|
+
new_val.gsub!(/;$|\s*!important/, '').strip!
|
85
|
+
|
86
|
+
# For width and height tags, remove px units
|
87
|
+
new_val.gsub!(/(\d+)px/, '\1') if %w[width height].include?(html_attr)
|
88
|
+
|
89
|
+
# For color-related tags, convert RGB to hex if specified by options
|
90
|
+
new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
|
91
|
+
|
92
|
+
el[html_attr] = new_val
|
82
93
|
end
|
94
|
+
|
83
95
|
unless @options[:preserve_style_attribute]
|
84
96
|
merged.instance_variable_get("@declarations").tap do |declarations|
|
85
|
-
|
97
|
+
declarations.delete(css_attr)
|
86
98
|
end
|
87
99
|
end
|
88
100
|
end
|
89
101
|
end
|
102
|
+
|
90
103
|
# Collapse multiple rules into one as much as possible.
|
91
104
|
merged.create_shorthand! if @options[:create_shorthands]
|
92
105
|
|
@@ -39,25 +39,21 @@ module HtmlToPlainText
|
|
39
39
|
# remove script tags and content
|
40
40
|
txt.gsub!(/<script.*?\/script>/m, '')
|
41
41
|
|
42
|
-
# links
|
43
|
-
txt.gsub!(/<a\s
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
$3.strip + ' ( ' + $2.strip + ' )'
|
42
|
+
# links
|
43
|
+
txt.gsub!(/<a\s+([^>]+)>(.*?)<\/a>/im) do |s|
|
44
|
+
text = $2.strip
|
45
|
+
|
46
|
+
match = /href=(['"])(?:mailto:)?(.+?)\1/.match(s)
|
47
|
+
if match
|
48
|
+
href = match[2]
|
50
49
|
end
|
51
|
-
end
|
52
50
|
|
53
|
-
|
54
|
-
txt.gsub!(/<a\s[^\n]*?href=["'](mailto:)?([^']*)['][^>]*>(.*?)<\/a>/im) do |s|
|
55
|
-
if $3.empty?
|
51
|
+
if text.empty?
|
56
52
|
''
|
57
|
-
elsif
|
58
|
-
|
53
|
+
elsif href.nil? || text.strip.downcase == href.strip.downcase
|
54
|
+
text.strip
|
59
55
|
else
|
60
|
-
|
56
|
+
text.strip + ' ( ' + href.strip + ' )'
|
61
57
|
end
|
62
58
|
end
|
63
59
|
|
data/lib/premailer/premailer.rb
CHANGED
@@ -178,7 +178,7 @@ class Premailer
|
|
178
178
|
# @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.
|
179
179
|
# @option options [Boolean] :create_shorthands Combine several properties into a shorthand one, e.g. font: style weight size. Default is true.
|
180
180
|
# @option options [Boolean] :html_fragment Handle HTML fragment without any HTML content wrappers. Default is false.
|
181
|
-
# @option options [Boolean] :drop_unmergeable_css_rules Do not include unmergeable css rules in a <tt><style><tt> tag. Default is false.
|
181
|
+
# @option options [Boolean] :drop_unmergeable_css_rules Do not include unmergeable css rules in a <tt><style><tt> tag. Default is false.
|
182
182
|
def initialize(html, options = {})
|
183
183
|
@options = {:warn_level => Warnings::SAFE,
|
184
184
|
:line_length => 65,
|
@@ -499,14 +499,8 @@ public
|
|
499
499
|
def self.canonicalize(uri) # :nodoc:
|
500
500
|
u = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI.parse(uri.to_s)
|
501
501
|
u.normalize!
|
502
|
-
|
503
|
-
|
504
|
-
$1 == '..' ? match : ''
|
505
|
-
} do end
|
506
|
-
newpath = newpath.gsub(%r{/\./}, '/').sub(%r{/\.\z}, '/')
|
507
|
-
u.path = newpath
|
508
|
-
u.to_s
|
509
|
-
end
|
502
|
+
u.to_s
|
503
|
+
end
|
510
504
|
|
511
505
|
# Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
|
512
506
|
def check_client_support # :nodoc:
|
data/lib/premailer/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: premailer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.15.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Alex Dunae
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-05-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: css_parser
|
@@ -207,7 +207,8 @@ files:
|
|
207
207
|
- lib/premailer/version.rb
|
208
208
|
- misc/client_support.yaml
|
209
209
|
homepage: https://github.com/premailer/premailer
|
210
|
-
licenses:
|
210
|
+
licenses:
|
211
|
+
- BSD-3-Clause
|
211
212
|
metadata:
|
212
213
|
yard.run: yri
|
213
214
|
post_install_message:
|
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
225
226
|
- !ruby/object:Gem::Version
|
226
227
|
version: '0'
|
227
228
|
requirements: []
|
228
|
-
rubygems_version: 3.
|
229
|
+
rubygems_version: 3.2.16
|
229
230
|
signing_key:
|
230
231
|
specification_version: 4
|
231
232
|
summary: Preflight for HTML e-mail.
|