premailer 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05556033aa604e7c14baa5250b5d7d5baf90e1e
-  data.tar.gz: 302aff11e259bce3d183f3ec57c387da51ad67a8
+  metadata.gz: 4df1d858e475536189c6e91cb30d72194cf8d88b
+  data.tar.gz: 39daad276db1125fc182e4da80ce8635debe9959
 SHA512:
-  metadata.gz: 78658bc3655cf3eae6f2c11e1bd2cd9974b1eda62518818620e84d222429cbe6bab8e2f827962342059c19df7179d26e534d54f169b3c6adcc6c564473b88594
-  data.tar.gz: 981be77ba31ab22cb7199c8b885a75be53d28c79f1c8e1c9a38d0dd29d2a74763236c9824ebfbc16464b18c1f485d0f26e1fa4ea4865ca4997ee3bf851c19e6e
+  metadata.gz: 335cb3dc57599aba6fe75eba289a250abed56b9180ffc11feb129a0b90f49d9845f92d475329dfc2ba9ec9623e69f295bc844af35a66ca790914988e0f733620
+  data.tar.gz: d7401533fdfda12a308377cf6719e38461aafdf4c7f9b3c0eedef3998e8ef27c2126671e077d20e70aea82bb1dec3ee492b4b60545b5590e921bfb4a85628407

data/LICENSE.md

@@ -1,6 +1,6 @@
 # Premailer License
 
-Copyright (c) 2007-2012, Alex Dunae.  All rights reserved.
+Copyright (c) 2007-2017, Alex Dunae.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/README.md

@@ -2,8 +2,8 @@
 
 ## What is this?
 
-For the best HTML e-mail delivery results, CSS should be inline. This is a 
-huge pain and a simple newsletter becomes un-managable very quickly. This 
+For the best HTML e-mail delivery results, CSS should be inline. This is a
+huge pain and a simple newsletter becomes un-managable very quickly. This
 script is my solution.
 
 * CSS styles are converted to inline style attributes
@@ -14,10 +14,6 @@ script is my solution.
   - Based on the Email Standards Project's guides
 * A plain text version is created (optional)
 
-## Premailer 2.0 is coming
-
-I'm looking for input on a version 2.0 update to Premailer. Please visit the [Premailer 2.0 Planning Page](https://github.com/premailer/premailer/wiki/New-Premailer-2.0-Planning) and give me your feedback.
-
 ## Installation
 
 Install the Premailer gem from RubyGems.
@@ -31,7 +27,6 @@ or add it to your `Gemfile` and run `bundle`.
 ## Example
 
 ```ruby
-require 'rubygems' # optional for Ruby 1.9 or above.
 require 'premailer'
 
 premailer = Premailer.new('http://example.com/myfile.html', :warn_level => Premailer::Warnings::SAFE)
@@ -53,9 +48,26 @@ premailer.warnings.each do |w|
 end
 ```
 
+## Adapters
+
+Premailer's default adapter is nokogiri if both nokogiri and hpricot are included in the Gemfile list. However, if you want to use a different adapter, you can choose to.
+
+There are four adapters in total (as of premailer 1.9.1)
+
+1. nokogiri (default)
+2. nokogiri_fast
+3. nokogumbo
+4. hpricot (deprecated and will be removed in future premailer releases)
+
+`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
+Premailer::Adapter.use = :nokogiri_fast
+```
+
 ## Ruby Compatibility
 
-Premailer is tested on Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3, and Ruby 2.x.0 . It also works on REE. 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.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-specific CSS
 
@@ -77,7 +89,7 @@ For example
 table { -premailer-cellspacing: 5; -premailer-width: 500; }
 ```
 
-will result in 
+will result in
 
 ```html
 <table cellspacing='5' width='500'>
@@ -99,9 +111,7 @@ Thanks to [all the wonderful contributors](https://github.com/premailer/premaile
 Thanks to [Greenhood + Company](http://www.greenhood.com/) for sponsoring some of the 1.5.6 updates,
 and to [Campaign Monitor](https://www.campaignmonitor.com/) for supporting the web interface.
 
-The web interface can be found at [premailer.dialect.ca](http://premailer.dialect.ca).
-
-The source code can be found on [GitHub](https://github.com/alexdunae/premailer).
+The source code can be found on [GitHub](https://github.com/premailer/premailer).
 
-Copyright by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-2012.  See [LICENSE.md](https://github.com/alexdunae/premailer/blob/master/LICENSE.md) for license details.
+Copyright by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-2017.  See [LICENSE.md](https://github.com/alexdunae/premailer/blob/master/LICENSE.md) for license details.
 

data/lib/premailer.rb

@@ -5,5 +5,6 @@ require 'cgi'
 require 'css_parser'
 
 require 'premailer/adapter'
+require 'premailer/adapter/rgb_to_hex'
 require 'premailer/html_to_plain_text'
 require 'premailer/premailer'

data/lib/premailer/adapter.rb

@@ -1,5 +1,3 @@
-
-
 class Premailer
   # Manages the adapter classes. Currently supports:
   #

data/lib/premailer/adapter/hpricot.rb

@@ -4,6 +4,8 @@ class Premailer
   module Adapter
     # Hpricot adapter
     module Hpricot
+      include AdapterHelper::RgbToHex
+
       def self.included(base)
         warn <<eos
 [DEPRECATED] Premailer's Hpricot adapter will be removed with the next major \
@@ -87,9 +89,14 @@ eos
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-              el[html_att] = merged[css_att].gsub(/url\('(.*)'\)/,'\1').gsub(/;$|\s*!important/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+              if el[html_att].nil? and not merged[css_att].empty?
+                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|
-                declarations.delete(css_att)
+                unless @options[:preserve_style_attribute]
+                  declarations.delete(css_att)
+                end
               end
             end
           end

data/lib/premailer/adapter/nokogiri.rb

@@ -5,6 +5,7 @@ class Premailer
     # Nokogiri adapter
     module Nokogiri
 
+      include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
       #
       # @return [String] an HTML.
@@ -75,9 +76,14 @@ class Premailer
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-              el[html_att] = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+              if el[html_att].nil? and not merged[css_att].empty?
+                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|
-                declarations.delete(css_att)
+                unless @options[:preserve_style_attribute]
+                  declarations.delete(css_att)
+                end
               end
             end
           end

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -5,6 +5,7 @@ class Premailer
     # NokogiriFast adapter
     module NokogiriFast
 
+      include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
       #
       # @return [String] an HTML.
@@ -77,9 +78,14 @@ class Premailer
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-              el[html_att] = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+              if el[html_att].nil? and not merged[css_att].empty?
+                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|
-                declarations.delete(css_att)
+                unless @options[:preserve_style_attribute]
+                  declarations.delete(css_att)
+                end
               end
             end
           end
@@ -241,12 +247,12 @@ class Premailer
         doc
       end
 
-      private 
+      private
 
       # For very large documents, it is useful to trade off some memory for performance.
       # We can build an index of the nodes so we can quickly select by id/class/tagname
-      # instead of search the tree again and again. 
-      # 
+      # instead of search the tree again and again.
+      #
       # @param page The Nokogiri HTML document to index.
       # @return [index, set_of_all_nodes, descendants] The index is a hash from key to set of nodes.
       #         The "descendants" is a hash mapping a node to the set of its descendant nodes.
@@ -311,7 +317,7 @@ class Premailer
 
       # @param index An index hash returned by make_index
       # @param base The base set of nodes within which the given spec is to be matched.
-      # @param intersection_selector A CSS intersection selector string of the form 
+      # @param intersection_selector A CSS intersection selector string of the form
       #             "hello.world" or "#blue.diamond". This should not contain spaces.
       # @return Set of nodes matching the given spec that are present in the base set.
       def narrow_down_nodes(index, base, intersection_selector)

data/lib/premailer/adapter/nokogumbo.rb

@@ -5,6 +5,7 @@ class Premailer
     # Nokogiri adapter
     module Nokogumbo
 
+      include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
       #
       # @return [String] an HTML.
@@ -75,9 +76,14 @@ class Premailer
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
             Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-              el[html_att] = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+              if el[html_att].nil? and not merged[css_att].empty?
+                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|
-                declarations.delete(css_att)
+                unless @options[:preserve_style_attribute]
+                  declarations.delete(css_att)
+                end
               end
             end
           end

data/lib/premailer/adapter/rgb_to_hex.rb

@@ -0,0 +1,33 @@
+# RGB helper for adapters, currently only nokogiri supported
+
+module AdapterHelper
+  module RgbToHex
+    def to_hex(str)
+      str.to_i.to_s(16).rjust(2, '0').upcase
+    end
+
+    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
+      }x
+
+      pattern.match(color)
+    end
+
+    def ensure_hex(color)
+      match_data = is_rgb?(color)
+      if match_data
+        "#{to_hex(match_data[1])}#{to_hex(match_data[2])}#{to_hex(match_data[3])}"
+      else
+        color
+      end
+    end
+  end
+end

data/lib/premailer/premailer.rb

@@ -156,7 +156,9 @@ class Premailer
   # @option options [String] :base_url Used to calculate absolute URLs for local files.
   # @option options [Array(String)] :css Manually specify CSS stylesheets.
   # @option options [Boolean] :css_to_attributes Copy related CSS attributes into HTML attributes (e.g. background-color to bgcolor)
+  # @option options [Boolean] :preserve_style_attribute Preserve original style attribute
   # @option options [String] :css_string Pass CSS as a string
+  # @option options [Boolean] :rgb_to_hex_attributes Convert RBG to Hex colors, default false
   # @option options [Boolean] :remove_ids Remove ID attributes whenever possible and convert IDs used as anchors to hashed to avoid collisions in webmail programs.  Default is false.
   # @option options [Boolean] :remove_classes Remove class attributes. Default is false.
   # @option options [Boolean] :remove_comments Remove html comments. Default is false.
@@ -180,6 +182,7 @@ class Premailer
                 :line_length => 65,
                 :link_query_string => nil,
                 :base_url => nil,
+                :rgb_to_hex_attributes => true,
                 :remove_classes => false,
                 :remove_ids => false,
                 :remove_comments => false,
@@ -187,6 +190,7 @@ class Premailer
                 :reset_contenteditable => true,
                 :css => [],
                 :css_to_attributes => true,
+                :preserve_style_attribute => false,
                 :with_html_string => false,
                 :css_string => nil,
                 :preserve_styles => false,

data/lib/premailer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-02-03 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.5
+        version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/premailer/adapter/nokogiri.rb
 - lib/premailer/adapter/nokogiri_fast.rb
 - lib/premailer/adapter/nokogumbo.rb
+- lib/premailer/adapter/rgb_to_hex.rb
 - lib/premailer/executor.rb
 - lib/premailer/html_to_plain_text.rb
 - lib/premailer/premailer.rb
@@ -232,7 +233,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.