premailer 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b62798f9ef3929357e4fe01538d05615f37b9b3
-  data.tar.gz: f0224b7a6a42b88ebea688cf9d55fe30504f9751
+  metadata.gz: 0c41d00b9329efc665261de336e908985573ae9c
+  data.tar.gz: e1dec81980ea9f8abde0e30c0044937fdf5a7472
 SHA512:
-  metadata.gz: 96bfa7a6374f3cd91f6004a8a988d46e789bd2cce29e12f595fee64c0e86244236e77766b1380a347329dbd71866f487ca23f9aedab0d600b2cf1a54a1c3253f
-  data.tar.gz: 09148edbb09bee950ad6e5c7c97709587b862136a38b5f484ab8e5f039f92f137ce7b948303796480004b31018e0f4ebe488d68c4ae1767f0f61d141d11f8db7
+  metadata.gz: 761dc0a5f8ec61ad3997aa8a6d2042de955ff81531e02d4bfb4beb27915e98b059f39f2d2428e491c5a998c5de2bac7846ce902472c0c0da014ea70cb8b91d21
+  data.tar.gz: d2e8af67edf061916446e7ba4172f0b6befebd68d6b6c2815acc06f7c10d5a6b10951637ba07eb3f1a7c6bbaf072e1a39b45c102243d54427878c33259f4d7c1

data/README.md

@@ -52,12 +52,14 @@ end
 
 Premailer's default adapter is nokogiri if both nokogiri and nokogumbo are included in the Gemfile list. However, if you want to use a different adapter, you can choose to.
 
-There are three adapters in total (as of premailer 1.9.1)
+There are three adapters in total (as of premailer 1.10.0)
 
 1. nokogiri (default)
 2. nokogiri_fast
 3. nokogumbo
 
+hpricot adapter removed due to its EOL, please use `~>1.9.0` version if You still need it..
+
 `NokogiriFast` adapter improves the Algorithmic complexity of the running time by 20x with a slight compensation on memory. To switch to any of these adapters, add the following line. For example, if you want to include the `NokogiriFast` adapter,
 
 ```ruby
@@ -66,7 +68,7 @@ Premailer::Adapter.use = :nokogiri_fast
 
 ## Ruby Compatibility
 
-Premailer is tested on Ruby 2.x.0. JRuby support is close; contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](https://travis-ci.org/#!/premailer/premailer).
+Premailer is tested on Ruby 2.1 and above. JRuby support is close; contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](https://travis-ci.org/#!/premailer/premailer).
 
 ## Premailer-specific CSS
 

data/lib/premailer.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'open-uri'
 require 'digest/md5'
 require 'cgi'
+require 'addressable'
 require 'css_parser'
 
 require 'premailer/adapter'

data/lib/premailer/adapter/nokogiri.rb

@@ -77,12 +77,12 @@ class Premailer
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
               if el[html_att].nil? and not merged[css_att].empty?
-                new_html_att = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
+                new_html_att = merged[css_att].gsub(/url\(['"](.*)['"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
                 el[html_att] = css_att.end_with?('color') && @options[:rgb_to_hex_attributes] ? ensure_hex(new_html_att) : new_html_att
               end
-              merged.instance_variable_get("@declarations").tap do |declarations|
-                unless @options[:preserve_style_attribute]
-                  declarations.delete(css_att)
+              unless @options[:preserve_style_attribute]
+                merged.instance_variable_get("@declarations").tap do |declarations|
+                    declarations.delete(css_att)
                 end
               end
             end
@@ -91,10 +91,7 @@ class Premailer
           merged.create_shorthand! if @options[:create_shorthands]
 
           # write the inline STYLE attribute
-          # split by ';' but ignore those in brackets
-          attributes = Premailer.escape_string(merged.declarations_to_s).split(/;(?![^(]*\))/).map(&:strip)
-          attributes = attributes.map { |attr| [attr.split(':').first, attr] }.sort_by { |pair| pair.first }.map { |pair| pair[1] }
-          el['style'] = attributes.join('; ') + ";"
+          el['style'] = merged.declarations_to_s
         end
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules)

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -79,12 +79,12 @@ class Premailer
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
               if el[html_att].nil? and not merged[css_att].empty?
-                new_html_att = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
+                new_html_att = merged[css_att].gsub(/url\(['"](.*)['"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
                 el[html_att] = css_att.end_with?('color') && @options[:rgb_to_hex_attributes] ? ensure_hex(new_html_att) : new_html_att
               end
-              merged.instance_variable_get("@declarations").tap do |declarations|
-                unless @options[:preserve_style_attribute]
-                  declarations.delete(css_att)
+              unless @options[:preserve_style_attribute]
+                merged.instance_variable_get("@declarations").tap do |declarations|
+                    declarations.delete(css_att)
                 end
               end
             end
@@ -93,10 +93,7 @@ class Premailer
           merged.create_shorthand! if @options[:create_shorthands]
 
           # write the inline STYLE attribute
-          # split by ';' but ignore those in brackets
-          attributes = Premailer.escape_string(merged.declarations_to_s).split(/;(?![^(]*\))/).map(&:strip)
-          attributes = attributes.map { |attr| [attr.split(':').first, attr] }.sort_by { |pair| pair.first }.map { |pair| pair[1] }
-          el['style'] = attributes.join('; ') + ";"
+          el['style'] = merged.declarations_to_s
         end
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules)

data/lib/premailer/adapter/nokogumbo.rb

@@ -77,12 +77,12 @@ class Premailer
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
               if el[html_att].nil? and not merged[css_att].empty?
-                new_html_att = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
+                new_html_att = merged[css_att].gsub(/url\(['"](.*)['"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
                 el[html_att] = css_att.end_with?('color') && @options[:rgb_to_hex_attributes] ? ensure_hex(new_html_att) : new_html_att
               end
-              merged.instance_variable_get("@declarations").tap do |declarations|
-                unless @options[:preserve_style_attribute]
-                  declarations.delete(css_att)
+              unless @options[:preserve_style_attribute]
+                merged.instance_variable_get("@declarations").tap do |declarations|
+                    declarations.delete(css_att)
                 end
               end
             end
@@ -91,9 +91,7 @@ class Premailer
           merged.create_shorthand! if @options[:create_shorthands]
 
           # write the inline STYLE attribute
-          attributes = Premailer.escape_string(merged.declarations_to_s).split(';').map(&:strip)
-          attributes = attributes.map { |attr| [attr.split(':').first, attr] }.sort_by { |pair| pair.first }.map { |pair| pair[1] }
-          el['style'] = attributes.join('; ') + ";"
+          el['style'] = merged.declarations_to_s
         end
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules)

data/lib/premailer/premailer.rb

@@ -221,9 +221,9 @@ class Premailer
     @unmergable_rules = nil
 
     if @options[:base_url]
-      @base_url = URI.parse(@options.delete(:base_url))
+      @base_url = Addressable::URI.parse(@options.delete(:base_url))
     elsif not @is_local_file
-      @base_url = URI.parse(@html_file)
+      @base_url = Addressable::URI.parse(@html_file)
     end
 
     @css_parser = CssParser::Parser.new({
@@ -369,7 +369,7 @@ public
       next if href[0,1] =~ /[\#\{\[\<\%]/ # don't bother with anchors or special-looking links
 
       begin
-        href = URI.parse(href)
+        href = Addressable::URI.parse(href)
 
         if current_host and href.host != nil and href.host != current_host
           $stderr.puts "Skipping append_query_string for: #{href.to_s} because host is no good" if @options[:verbose]
@@ -389,7 +389,7 @@ public
         end
 
         el['href'] = href.to_s
-      rescue URI::Error => e
+      rescue Addressable::URI::InvalidURIError => e
         $stderr.puts "Skipping append_query_string for: #{href.to_s} (#{e.message})" if @options[:verbose]
         next
       end
@@ -415,7 +415,7 @@ public
   #
   # Returns a document.
   def convert_inline_links(doc, base_uri) # :nodoc:
-    base_uri = URI.parse(base_uri) unless base_uri.kind_of?(URI)
+    base_uri = Addressable::URI.parse(base_uri) unless base_uri.kind_of?(Addressable::URI)
 
     append_qs = @options[:link_query_string] || ''
     escape_attrs = @options[:escape_url_attributes]
@@ -434,7 +434,7 @@ public
 
         if tag.attributes[attribute].to_s =~ /^http/i
           begin
-            merged = URI.parse(tag.attributes[attribute])
+            merged = Addressable::URI.parse(tag.attributes[attribute])
           rescue; next; end
         else
           begin
@@ -442,13 +442,13 @@ public
           rescue
             begin
               next unless escape_attrs
-              merged = Premailer.resolve_link(URI.escape(tag.attributes[attribute].to_s), base_uri)
+              merged = Premailer.resolve_link(Addressable::URI.escape(tag.attributes[attribute].to_s), base_uri)
             rescue; end
           end
         end
 
         # make sure 'merged' is a URI
-        merged = URI.parse(merged.to_s) unless merged.kind_of?(URI)
+        merged = Addressable::URI.parse(merged.to_s) unless merged.kind_of?(Addressable::URI)
         tag[attribute] = merged.to_s
       end # end of each tag
     end # end of each attrs
@@ -476,12 +476,12 @@ public
     if path =~ /\A(?:(https?|ftp|file):)\/\//i
       resolved = path
       Premailer.canonicalize(resolved)
-    elsif base_path.kind_of?(URI)
-      resolved = base_path.merge(path)
+    elsif base_path.kind_of?(Addressable::URI)
+      resolved = base_path.join(path)
       Premailer.canonicalize(resolved)
     elsif base_path.kind_of?(String) and base_path =~ /\A(?:(?:https?|ftp|file):)\/\//i
-      resolved = URI.parse(base_path)
-      resolved = resolved.merge(path)
+      resolved = Addressable::URI.parse(base_path)
+      resolved = resolved.join(path)
       Premailer.canonicalize(resolved)
     else
       File.expand_path(path, File.dirname(base_path))
@@ -500,7 +500,7 @@ public
 
   # from http://www.ruby-forum.com/topic/140101
   def self.canonicalize(uri) # :nodoc:
-    u = uri.kind_of?(URI) ? uri : URI.parse(uri.to_s)
+    u = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI.parse(uri.to_s)
     u.normalize!
     newpath = u.path
     while newpath.gsub!(%r{([^/]+)/\.\./?}) { |match|

data/lib/premailer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-09 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.4.9
+        version: 1.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.4.10
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Preflight for HTML e-mail.