premailer 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83efaa991c6dd9a621f5ccb28f8eebca448b008e
-  data.tar.gz: 8df7234ad7f2ca324168091ecdf67cfa880eda0d
+  metadata.gz: 7316d27a2fa70efed484e7c64733a351491f1cea
+  data.tar.gz: 6dd11b25df48ce0e73149ffdc25e6702de94ec21
 SHA512:
-  metadata.gz: bedf9d58e364351088bf42da2e0b04f18392b9ea1960a07f1e4b6818a76a79058ce981671d41ac7ac2e92952017ca3cd203721a5ca61369a67307987ff9dfe9f
-  data.tar.gz: 463e6b60e3ded167d9e1af0f9f5072933c151941f8e6ff8c0e2c932f4a56eebb306d50fcb4990888209de51718e84518c72c9bdc3fb04e29d8331afd3d8be2ae
+  metadata.gz: 9d5aed590607bd5cdbe7b629424c2b18832e5ee36c5688627216ea660c493edfb92a6f5d2f77e5d78b2b5cb502d2fb7f592adf3e0d624d58ced7b57ac7f6acdb
+  data.tar.gz: 107fb306346e6e35b146b7e327b0e2cc8cca1ded78f75687ed5281e090f08d50e7a9625335fbaffe066496e0c72f121b3389779751933900b7aec356d8b86791

data/.travis.yml

@@ -6,10 +6,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - ree
 gemfile:
   - Gemfile
   - gemfiles/.ruby187.gemfile
+before_install:
+  - gem install bundler
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
@@ -23,5 +26,9 @@ matrix:
       gemfile: gemfiles/.ruby187.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/.ruby187.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/.ruby187.gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/.ruby187.gemfile
     - rvm: ree
       gemfile: Gemfile

data/Gemfile

@@ -12,3 +12,5 @@ gemspec
 gem "ripper", :group => :development, :platforms => :mri_18
 
 gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development
+
+gem 'test-unit', :group => [:development, :test], :platforms => [:mri_20, :mri_22]

data/README.md

@@ -54,7 +54,7 @@ end
 
 ## Ruby Compatibility
 
-Premailer is tested on Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3, and Ruby 2.0.0 . It also works on REE. JRuby support is close; contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](http://travis-ci.org/#!/premailer/premailer).
+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](http://travis-ci.org/#!/premailer/premailer).
 
 ## Premailer-specific CSS
 

data/lib/premailer/adapter/nokogiri.rb

@@ -21,10 +21,10 @@ class Premailer
         # Iterate through the rules and merge them into the HTML
         @css_parser.each_selector(:all) do |selector, declaration, specificity, media_types|
           # Save un-mergable rules separately
-          selector.gsub!(/:link([\s]*)+/i) {|m| $1 }
+          selector.gsub!(/:link([\s]*)+/i) { |m| $1 }
 
           # Convert element names to lower case
-          selector.gsub!(/([\s]|^)([\w]+)/) {|m| $1.to_s + $2.to_s.downcase }
+          selector.gsub!(/([\s]|^)([\w]+)/) { |m| $1.to_s + $2.to_s.downcase }
 
           if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
             @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
@@ -33,7 +33,7 @@ class Premailer
               if selector =~ Premailer::RE_RESET_SELECTORS
                 # this is in place to preserve the MailChimp CSS reset: http://github.com/mailchimp/Email-Blueprints/
                 # however, this doesn't mean for testing pur
-                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration))  unless !@options[:preserve_reset]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration)) unless !@options[:preserve_reset]
               end
 
               # Change single ID CSS selectors into xpath so that we can match more
@@ -47,7 +47,7 @@ class Premailer
                   el['style'] = (el.attributes['style'].to_s ||= '') + ' ' + block
                 end
               end
-            rescue  ::Nokogiri::SyntaxError, RuntimeError, ArgumentError
+            rescue ::Nokogiri::SyntaxError, RuntimeError, ArgumentError
               $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
               next
             end
@@ -76,7 +76,7 @@ class Premailer
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)
             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?
+              el[html_att] = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip if el[html_att].nil? and not merged[css_att].empty?
             end
           end
 
@@ -84,7 +84,9 @@ class Premailer
           merged.create_shorthand!
 
           # write the inline STYLE attribute
-          el['style'] = Premailer.escape_string(merged.declarations_to_s).split(';').map(&:strip).sort.join('; ')
+          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('; ')
         end
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules)
@@ -144,7 +146,7 @@ class Premailer
 
         unless styles.empty?
           style_tag = "<style type=\"text/css\">\n#{styles}</style>"
-          if body = doc.search('body')
+          unless (body = doc.search('body')).empty?
             if doc.at_css('body').children && !doc.at_css('body').children.empty?
               doc.at_css('body').children.before(::Nokogiri::XML.fragment(style_tag))
             else
@@ -167,7 +169,8 @@ class Premailer
         html_src = ''
         begin
           html_src = @doc.at("body").inner_html
-        rescue; end
+        rescue;
+        end
 
         html_src = @doc.to_html unless html_src and not html_src.empty?
         convert_to_text(html_src, @options[:line_length], @html_encoding)
@@ -213,13 +216,13 @@ class Premailer
           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-8BIG should be the default, but not the only option.
+        # 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!
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding]) {|c| c.recover }
+          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding]) { |c| c.recover }
         else
           default_encoding = RUBY_PLATFORM == 'java' ? nil : 'BINARY'
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding] || default_encoding) {|c| c.recover }
+          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding] || default_encoding) { |c| c.recover }
         end
 
         # Fix for removing any CDATA tags from both style and script tags inserted per

data/lib/premailer/html_to_plain_text.rb

@@ -10,6 +10,11 @@ module HtmlToPlainText
   def convert_to_text(html, line_length = 65, from_charset = 'UTF-8')
     txt = html
 
+    # strip text ignored html. Useful for removing
+    # headers and footers that aren't needed in the
+    # text version
+    txt.gsub!(/<!-- start text\/html -->.*?<!-- end text\/html -->/m, '')
+
     # replace images with their alt attributes
     # for img tags with "" for attribute quotes
     # with or without closing tag

data/lib/premailer/premailer.rb

@@ -74,12 +74,13 @@ class Premailer
     'blockquote' => {'text-align' => 'align'},
     'body' => {'background-color' => 'bgcolor'},
     'table' => {
+      '-premailer-align' => 'align',
       'background-color' => 'bgcolor',
       'background-image' => 'background',
       '-premailer-width' => 'width',
       '-premailer-height' => 'height',
       '-premailer-cellpadding' => 'cellpadding',
-      '-premailer-cellspacing' => 'cellspacing',
+      '-premailer-cellspacing' => 'cellspacing'
     },
     'tr' => {
       'text-align' => 'align',
@@ -100,7 +101,11 @@ class Premailer
       '-premailer-width' => 'width',
       '-premailer-height' => 'height'
     },
-    'img' => {'float' => 'align'}
+    'img' => {
+      'float' => 'align',
+      '-premailer-width' => 'width',
+      '-premailer-height' => 'height'
+    }
   }
 
   # URI of the HTML file used
@@ -193,6 +198,7 @@ class Premailer
                 :output_encoding => nil,
                 :replace_html_entities => false,
                 :escape_url_attributes => true,
+                :unescaped_ampersand => false,
                 :adapter => Adapter.use,
                 }.merge(options)
 
@@ -289,7 +295,7 @@ protected
 
           if tag.attributes['href'].to_s.include? @base_url.to_s and @html_file.kind_of?(String)
             if @options[:with_html_string]
-              link_uri = tag.attributes['href'].to_s.sub(@base_url.to_s, '').sub(/\A\/*/, '')
+              link_uri = tag.attributes['href'].to_s.sub(@base_url.to_s, '')
             else
               link_uri = File.join(File.dirname(@html_file), tag.attributes['href'].to_s.sub!(@base_url.to_s, ''))
               # if the file does not exist locally, try to grab the remote reference
@@ -371,7 +377,8 @@ public
         end
 
         if href.query and not href.query.empty?
-          href.query = href.query + '&' + qs
+          amp = @options[:unescaped_ampersand] ? '&' : '&'
+          href.query = href.query + amp + qs
         else
           href.query = qs
         end

data/lib/premailer/version.rb

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

data/test/helper.rb

@@ -11,9 +11,9 @@ class Premailer::TestCase < Test::Unit::TestCase
   BASE_PATH =  File.expand_path(File.dirname(__FILE__)) + '/files'
 
   def setup
-    stub_request(:any, /premailer\.dev\/*/).to_return do |request| 
+    stub_request(:any, /premailer\.dev\/*/).to_return do |request|
       file_path = BASE_PATH + URI.parse(request.uri).path
-      if File.exists?(file_path) 
+      if File.exists?(file_path)
         { :status => 200, :body => File.open(file_path) }
       else
         { :status => 404, :body => "#{file_path} not found" }
@@ -22,17 +22,17 @@ class Premailer::TestCase < Test::Unit::TestCase
 
     stub_request(:get, /my\.example\.com\:8080\/*/).to_return(:status => 200, :body => "", :headers => {})
   end
-  
+
   def default_test; end
- 
-protected 
+
+  protected
   def local_setup(f = 'base.html', opts = {})
     base_file = BASE_PATH + '/' + f
     premailer = Premailer.new(base_file, opts)
     premailer.to_inline_css
     @doc = premailer.processed_doc
   end
-  
+
   def remote_setup(f = 'base.html', opts = {})
     @premailer = Premailer.new(BASE_URI + "#{f}", opts)
     @premailer.to_inline_css

data/test/test_html_to_plain_text.rb

@@ -69,11 +69,23 @@ END_HTML
     assert_plaintext "* item 1\n* item 2", "<li class='123'>item 1</li> <li>item 2</li>\n"
     assert_plaintext "* item 1\n* item 2\n* item 3", "<li>item 1</li> \t\n <li>item 2</li> <li> item 3</li>\n"
   end
-  
+
   def test_stripping_html
     assert_plaintext 'test text', "<p class=\"123'45 , att\" att=tester>test <span class='te\"st'>text</span>\n"
   end
 
+  def test_stripping_ignored_blocks
+    html = <<END_HTML
+    <p>test</p>
+    <!-- start text/html -->
+      <img src="logo.png" alt="logo">
+    <!-- end text/html -->
+    <p>text</p>
+END_HTML
+    premailer = Premailer.new(html, :with_html_string => true)
+    assert_match /test\n\ntext/, premailer.to_plain_text
+  end
+
   def test_paragraphs_and_breaks
     assert_plaintext "Test text\n\nTest text", "<p>Test text</p><p>Test text</p>"
     assert_plaintext "Test text\n\nTest text", "\n<p>Test text</p>\n\n\n\t<p>Test text</p>\n"
@@ -81,7 +93,7 @@ END_HTML
     assert_plaintext "Test text\nTest text", "\n<p>Test text<br> \tTest text<br></p>\n"
     assert_plaintext "Test text\n\nTest text", "Test text<br><BR />Test text"
   end
-  
+
   def test_headings
     assert_plaintext "****\nTest\n****", "<h1>Test</h1>"
     assert_plaintext "****\nTest\n****", "\t<h1>\nTest</h1> "
@@ -90,7 +102,7 @@ END_HTML
     assert_plaintext "----\nTest\n----", "<h2>Test</h2>"
     assert_plaintext "Test\n----", "<h3> <span class='a'>Test </span></h3>"
   end
-  
+
   def test_wrapping_lines
     raw = ''
     100.times { raw += 'test ' }
@@ -103,7 +115,7 @@ END_HTML
   end
 
   def test_img_alt_tags
-    # ensure html imag tags that aren't self-closed are parsed, 
+    # ensure html imag tags that aren't self-closed are parsed,
     # along with accepting both '' and "" as attribute quotes
 
     # <img alt="" />
@@ -119,7 +131,7 @@ END_HTML
   def test_links
     # basic
     assert_plaintext 'Link ( http://example.com/ )', '<a href="http://example.com/">Link</a>'
-    
+
     # nested html
     assert_plaintext 'Link ( http://example.com/ )', '<a href="http://example.com/"><span class="a">Link</span></a>'
 
@@ -131,13 +143,13 @@ END_HTML
 
     # complex link
     assert_plaintext 'Link ( http://example.com:80/~user?aaa=bb&c=d,e,f#foo )', '<a href="http://example.com:80/~user?aaa=bb&amp;c=d,e,f#foo">Link</a>'
-    
+
     # attributes
     assert_plaintext 'Link ( http://example.com/ )', '<a title=\'title\' href="http://example.com/">Link</a>'
-    
+
     # spacing
     assert_plaintext 'Link ( http://example.com/ )', '<a href="   http://example.com/ "> Link </a>'
-    
+
     # multiple
     assert_plaintext 'Link A ( http://example.com/a/ ) Link B ( http://example.com/b/ )', '<a href="http://example.com/a/">Link A</a> <a href="http://example.com/b/">Link B</a>'
 
@@ -145,24 +157,24 @@ END_HTML
     assert_plaintext 'Link ( %%LINK%% )', '<a href="%%LINK%%">Link</a>'
     assert_plaintext 'Link ( [LINK] )', '<a href="[LINK]">Link</a>'
     assert_plaintext 'Link ( {LINK} )', '<a href="{LINK}">Link</a>'
-    
+
     # unsubscribe
     assert_plaintext 'Link ( [[!unsubscribe]] )', '<a href="[[!unsubscribe]]">Link</a>'
 
     # empty link gets dropped, and shouldn't run forever
     assert_plaintext(("This is some more text\n\n" * 14 + "This is some more text"), "<a href=\"test\"></a>#{"\n<p>This is some more text</p>" * 15}")
   end
-  
+
   # see https://github.com/alexdunae/premailer/issues/72
   def test_multiple_links_per_line
-    assert_plaintext 'This is link1 ( http://www.google.com ) and link2 ( http://www.google.com ) is next.', 
+    assert_plaintext 'This is link1 ( http://www.google.com ) and link2 ( http://www.google.com ) is next.',
                      '<p>This is <a href="http://www.google.com" >link1</a> and <a href="http://www.google.com" >link2 </a> is next.</p>',
                      nil, 10000
   end
 
   # see https://github.com/alexdunae/premailer/issues/72
   def test_links_within_headings
-    assert_plaintext "****************************\nTest ( http://example.com/ )\n****************************", 
+    assert_plaintext "****************************\nTest ( http://example.com/ )\n****************************",
                      "<h1><a href='http://example.com/'>Test</a></h1>"
   end
 

data/test/test_links.rb

@@ -12,36 +12,36 @@ class TestLinks < Premailer::TestCase
   def test_appending_link_query_string
     qs = 'utm_source=1234&tracking=good&amp;doublescape'
     opts = {:base_url => 'http://example.com/',  :link_query_string => qs, :with_html_string => true, :adapter => :hpricot}
-    
+
     appendable = [
-      '/', 
-      opts[:base_url], 
-      'https://example.com/tester',
-      'images/',
-      "#{opts[:base_url]}test.html?cn=tf&amp;c=20&amp;ord=random",
-      '?query=string'
+        '/',
+        opts[:base_url],
+        'https://example.com/tester',
+        'images/',
+        "#{opts[:base_url]}test.html?cn=tf&amp;c=20&amp;ord=random",
+        '?query=string'
     ]
-      
+
     not_appendable = [
-      '%DONOTCONVERT%',
-      '{DONOTCONVERT}',
-      '[DONOTCONVERT]',
-      '<DONOTCONVERT>',
-      '{@msg-txturl}',
-      '[[!unsubscribe]]',
-      '#relative', 
-      'tel:5555551212',
-      'http://example.net/',
-      'mailto:premailer@example.com',
-      'ftp://example.com',
-      'gopher://gopher.floodgap.com/1/fun/twitpher'
+        '%DONOTCONVERT%',
+        '{DONOTCONVERT}',
+        '[DONOTCONVERT]',
+        '<DONOTCONVERT>',
+        '{@msg-txturl}',
+        '[[!unsubscribe]]',
+        '#relative',
+        'tel:5555551212',
+        'http://example.net/',
+        'mailto:premailer@example.com',
+        'ftp://example.com',
+        'gopher://gopher.floodgap.com/1/fun/twitpher'
     ]
-    
+
     html = appendable.collect {|url| "<a href='#{url}'>Link</a>" }
 
     premailer = Premailer.new(html.to_s, opts)
     premailer.to_inline_css
-    
+
     premailer.processed_doc.search('a').each do |el|
       href = el.attributes['href'].to_s
       next if href.nil? or href.empty?
@@ -53,7 +53,7 @@ class TestLinks < Premailer::TestCase
 
     premailer = Premailer.new(html.to_s, opts)
     premailer.to_inline_css
-    
+
     premailer.processed_doc.search('a').each do |el|
       href = el['href']
       next if href.nil? or href.empty?
@@ -66,35 +66,45 @@ class TestLinks < Premailer::TestCase
 
     premailer = Premailer.new("<a href='/test/?'>Link</a> <a href='/test/'>Link</a>", :link_query_string => qs, :with_html_string => true)
     premailer.to_inline_css
-    
+
     premailer.processed_doc.search('a').each do |a|
       assert_equal '/test/?utm_source=1234', a['href'].to_s
     end
 
     premailer = Premailer.new("<a href='/test/?123&456'>Link</a>", :link_query_string => qs, :with_html_string => true)
     premailer.to_inline_css
-    
+
     assert_equal '/test/?123&456&amp;utm_source=1234', premailer.processed_doc.at('a')['href']
   end
 
+  def test_unescape_ampersand
+    qs = 'utm_source=1234'
+
+    premailer = Premailer.new("<a href='/test/?q=query'>Link</a>", :link_query_string => qs, :with_html_string => true, :unescaped_ampersand => true)
+    premailer.to_inline_css
+
+    premailer.processed_doc.search('a').each do |a|
+      assert_equal '/test/?q=query&utm_source=1234', a['href'].to_s
+    end
+  end
 
   def test_preserving_links
     html = "<a href='http://example.com/index.php?pram1=one&pram2=two'>Link</a>"
     premailer = Premailer.new(html.to_s, :link_query_string => '', :with_html_string => true)
     premailer.to_inline_css
-    
+
     assert_equal 'http://example.com/index.php?pram1=one&pram2=two', premailer.processed_doc.at('a')['href']
 
     html = "<a href='http://example.com/index.php?pram1=one&pram2=two'>Link</a>"
     premailer = Premailer.new(html.to_s, :link_query_string => 'qs', :with_html_string => true)
     premailer.to_inline_css
-    
+
     assert_equal 'http://example.com/index.php?pram1=one&pram2=two&amp;qs', premailer.processed_doc.at('a')['href']
 
   end
 
   def test_resolving_urls_from_string
-    ['test.html', '/test.html', './test.html', 
+    ['test.html', '/test.html', './test.html',
      'test/../test.html', 'test/../test/../test.html'].each do |q|
       assert_equal 'http://example.com/test.html', Premailer.resolve_link(q, 'http://example.com/'), q
     end
@@ -104,18 +114,18 @@ class TestLinks < Premailer::TestCase
 
   def test_resolving_urls_from_uri
     base_uri = URI.parse('http://example.com/')
-    ['test.html', '/test.html', './test.html', 
+    ['test.html', '/test.html', './test.html',
      'test/../test.html', 'test/../test/../test.html'].each do |q|
       assert_equal 'http://example.com/test.html', Premailer.resolve_link(q, base_uri), q
     end
 
     base_uri = URI.parse('https://example.net:80/~basedir/')
     assert_equal 'https://example.net:80/~basedir/test.html?var=1#anchor', Premailer.resolve_link('test/../test/../test.html?var=1#anchor', base_uri)
-    
+
     # base URI with a query string
     base_uri = URI.parse('http://example.com/dir/index.cfm?newsletterID=16')
     assert_equal 'http://example.com/dir/index.cfm?link=15', Premailer.resolve_link('?link=15', base_uri)
-    
+
     # URI preceded by a space
     base_uri = URI.parse('http://example.com/')
     assert_equal 'http://example.com/path', Premailer.resolve_link(' path', base_uri)
@@ -143,25 +153,25 @@ class TestLinks < Premailer::TestCase
     doc = premailer.doc
 
     # unchanged links
-    ['#l02', '#l03', '#l05', '#l06', '#l07', '#l08', 
+    ['#l02', '#l03', '#l05', '#l06', '#l07', '#l08',
      '#l09', '#l10', '#l11', '#l12', '#l13'].each do |link_id|
       assert_equal doc.at(link_id).attributes['href'], pdoc.at(link_id).attributes['href'], link_id
     end
-    
+
     assert_equal 'https://my.example.com:8080/', pdoc.at('#l01').attributes['href'].to_s
     assert_equal 'https://my.example.com:8080/images/', pdoc.at('#l04').attributes['href'].to_s
   end
 
   def test_convertable_inline_links
     convertable = [
-      'my/path/to',
-      'other/path',
-      '/'
+        'my/path/to',
+        'other/path',
+        '/'
     ]
 
     html = convertable.collect {|url| "<a href='#{url}'>Link</a>" }
     premailer = Premailer.new(html.to_s, :base_url => "http://example.com", :with_html_string => true)
-    
+
     premailer.processed_doc.search('a').each do |el|
       href = el.attributes['href'].to_s
       assert(href =~ /http:\/\/example.com/, "link #{href} is not absolute")
@@ -170,25 +180,25 @@ class TestLinks < Premailer::TestCase
 
   def test_non_convertable_inline_links
     not_convertable = [
-      '%DONOTCONVERT%',
-      '{DONOTCONVERT}',
-      '[DONOTCONVERT]',
-      '<DONOTCONVERT>',
-      '{@msg-txturl}',
-      '[[!unsubscribe]]',
-      '#relative', 
-      'tel:5555551212',
-      'mailto:premailer@example.com',
-      'ftp://example.com',
-      'gopher://gopher.floodgap.com/1/fun/twitpher',
-      'cid:13443452066.10392logo.jpeg@inline_attachment'
+        '%DONOTCONVERT%',
+        '{DONOTCONVERT}',
+        '[DONOTCONVERT]',
+        '<DONOTCONVERT>',
+        '{@msg-txturl}',
+        '[[!unsubscribe]]',
+        '#relative',
+        'tel:5555551212',
+        'mailto:premailer@example.com',
+        'ftp://example.com',
+        'gopher://gopher.floodgap.com/1/fun/twitpher',
+        'cid:13443452066.10392logo.jpeg@inline_attachment'
     ]
-    
+
     html = not_convertable.collect {|url| "<a href='#{url}'>Link</a>" }
 
     premailer = Premailer.new(html.to_s, :base_url => "example.com", :with_html_string => true)
     premailer.to_inline_css
-    
+
     premailer.processed_doc.search('a').each do |el|
       href = el.attributes['href'].to_s
       assert not_convertable.include?(href), "link #{href} should not be converted: see #{not_convertable.inspect}"

data/test/test_misc.rb

@@ -28,10 +28,10 @@ class TestMisc < Premailer::TestCase
 		</html>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
-		premailer.to_inline_css
+    premailer = Premailer.new(html, :with_html_string => true)
+    premailer.to_inline_css
 
-	  assert_match /color\: red/i,  premailer.processed_doc.at('p')['style']
+    assert_match /color\: red/i,  premailer.processed_doc.at('p')['style']
   end
 
   def test_commented_out_styles_in_the_body
@@ -44,10 +44,10 @@ END_HTML
 		</html>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
-		premailer.to_inline_css
+    premailer = Premailer.new(html, :with_html_string => true)
+    premailer.to_inline_css
 
-	  assert_match /color\: red/i,  premailer.processed_doc.at('p')['style']
+    assert_match /color\: red/i,  premailer.processed_doc.at('p')['style']
   end
 
   def test_not_applying_styles_to_the_head
@@ -64,14 +64,14 @@ END_HTML
 END_HTML
 
     [:nokogiri, :hpricot].each do |adapter|
-  		premailer = Premailer.new(html, :with_html_string => true, :adapter => adapter)
-  		premailer.to_inline_css
+      premailer = Premailer.new(html, :with_html_string => true, :adapter => adapter)
+      premailer.to_inline_css
 
-  	  h = premailer.processed_doc.at('head')
-  	  assert_nil h['style']
+      h = premailer.processed_doc.at('head')
+      assert_nil h['style']
 
-  	  t = premailer.processed_doc.at('title')
-  	  assert_nil t['style']
+      t = premailer.processed_doc.at('title')
+      assert_nil t['style']
     end
   end
 
@@ -88,8 +88,8 @@ END_HTML
 		</html>
     END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
-		premailer.to_inline_css
+    premailer = Premailer.new(html, :with_html_string => true)
+    premailer.to_inline_css
     premailer.processed_doc.search('p').each do |el|
       assert_match /red/i, el['style']
     end
@@ -108,22 +108,22 @@ END_HTML
 		</html>
 END_HTML
     [:nokogiri, :hpricot].each do |adapter|
-  		premailer = Premailer.new(html, :with_html_string => true, :preserve_styles => true,  :adapter => adapter)
-  		premailer.to_inline_css
-  	  assert_equal 1, premailer.processed_doc.search('head link').length
-  	  assert_equal 1, premailer.processed_doc.search('head style').length
+      premailer = Premailer.new(html, :with_html_string => true, :preserve_styles => true,  :adapter => adapter)
+      premailer.to_inline_css
+      assert_equal 1, premailer.processed_doc.search('head link').length
+      assert_equal 1, premailer.processed_doc.search('head style').length
 
-  		premailer = Premailer.new(html, :with_html_string => true, :preserve_styles => false, :adapter => adapter)
-  		premailer.to_inline_css
-  	  assert_nil premailer.processed_doc.at('body link')
+      premailer = Premailer.new(html, :with_html_string => true, :preserve_styles => false, :adapter => adapter)
+      premailer.to_inline_css
+      assert_nil premailer.processed_doc.at('body link')
 
       # should be preserved as unmergeable
 
-  	  assert_match /color: red/i, premailer.processed_doc.at('body style').inner_html
+      assert_match /color: red/i, premailer.processed_doc.at('body style').inner_html
 
-  	  assert_match /a:hover/i, premailer.processed_doc.at('style').inner_html
+      assert_match /a:hover/i, premailer.processed_doc.at('style').inner_html
 
-  	end
+    end
   end
 
   def test_unmergable_rules
@@ -133,13 +133,13 @@ END_HTML
 		</body> </html>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true, :verbose => true)
-		premailer.to_inline_css
+    premailer = Premailer.new(html, :with_html_string => true, :verbose => true)
+    premailer.to_inline_css
 
     # blue should be inlined
-	  assert_no_match /a\:hover[\s]*\{[\s]*color\:[\s]*blue[\s]*;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
+    assert_no_match /a\:hover[\s]*\{[\s]*color\:[\s]*blue[\s]*;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
     # red should remain in <style> block
-	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
+    assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
   end
 
   def test_unmergable_media_queries
@@ -188,11 +188,11 @@ END_HTML
 		</html>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
+    premailer = Premailer.new(html, :with_html_string => true)
     assert_nothing_raised do
-		  premailer.to_inline_css
-	  end
-	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('style').inner_html
+      premailer.to_inline_css
+    end
+    assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('style').inner_html
   end
 
   # in response to https://github.com/alexdunae/premailer/issues#issue/7
@@ -206,11 +206,11 @@ END_HTML
 		</html>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
+    premailer = Premailer.new(html, :with_html_string => true)
     assert_nothing_raised do
-		  premailer.to_inline_css
-	  end
-	  assert_match /color: red/, premailer.processed_doc.at('a').attributes['style'].to_s
+      premailer.to_inline_css
+    end
+    assert_match /color: red/, premailer.processed_doc.at('a').attributes['style'].to_s
   end
 
   # in response to https://github.com/alexdunae/premailer/issues#issue/7
@@ -234,10 +234,10 @@ END_HTML
 		</tr>
 END_HTML
 
-		premailer = Premailer.new(html, :with_html_string => true)
-		premailer.to_inline_css
-	  assert_match /font-size: xx-large/, premailer.processed_doc.search('.style3').first.attributes['style'].to_s
-	  assert_match /background: #000080/, premailer.processed_doc.search('.style5').first.attributes['style'].to_s
+    premailer = Premailer.new(html, :with_html_string => true)
+    premailer.to_inline_css
+    assert_match /font-size: xx-large/, premailer.processed_doc.search('.style3').first.attributes['style'].to_s
+    assert_match /background: #000080/, premailer.processed_doc.search('.style5').first.attributes['style'].to_s
   end
 
   # in response to https://github.com/alexdunae/premailer/issues/56
@@ -254,7 +254,7 @@ END_HTML
 END_HTML
 
     premailer = Premailer.new(html, :with_html_string => true, :adapter => :nokogiri)
-  	premailer.to_inline_css
+    premailer.to_inline_css
     assert_equal 'color: green !important', premailer.processed_doc.search('p').first.attributes['style'].to_s
   end
 
@@ -274,7 +274,7 @@ END_HTML
 END_HTML
 
     premailer = Premailer.new(html, :with_html_string => true)
-  	premailer.to_inline_css
+    premailer.to_inline_css
 
     assert_match /margin: 0 auto/, premailer.processed_doc.search('#page').first.attributes['style'].to_s
     assert_match /border-style: solid none solid solid;/, premailer.processed_doc.search('p').first.attributes['style'].to_s

data/test/test_premailer.rb

@@ -6,13 +6,13 @@ class TestPremailer < Premailer::TestCase
   def test_special_characters_nokogiri
     html = 	'<p>cédille c&eacute; & garçon gar&#231;on à &agrave; &nbsp; &amp; &copy;</p>'
     premailer = Premailer.new(html, :with_html_string => true, :adapter => :nokogiri)
-  	premailer.to_inline_css
+    premailer.to_inline_css
     assert_equal 'c&eacute;dille c&eacute; &amp; gar&ccedil;on gar&ccedil;on &agrave; &agrave; &nbsp; &amp; &copy;', premailer.processed_doc.at('p').inner_html
   end
 
   def test_special_characters_nokogiri_remote
     remote_setup('chars.html', :adapter => :nokogiri)
-  	@premailer.to_inline_css
+    @premailer.to_inline_css
     assert_equal 'c&eacute;dille c&eacute; &amp; gar&ccedil;on gar&ccedil;on &agrave; &agrave; &nbsp; &amp; &copy;', @premailer.processed_doc.at('p').inner_html
   end
 
@@ -29,7 +29,7 @@ class TestPremailer < Premailer::TestCase
   def test_special_characters_hpricot
     html = 	'<p>cédille c&eacute; & garçon gar&#231;on à &agrave; &nbsp; &amp;</p>'
     premailer = Premailer.new(html, :with_html_string => true, :adapter => :hpricot)
-  	premailer.to_inline_css
+    premailer.to_inline_css
     assert_equal 'c&eacute;dille c&eacute; &amp; gar&ccedil;on gar&ccedil;on &agrave; &agrave; &nbsp; &amp;', premailer.processed_doc.at('p').inner_html
   end
 
@@ -73,10 +73,10 @@ END_HTML
     qs = 'testing=123'
 
     [:nokogiri, :hpricot].each do |adapter|
-		  premailer = Premailer.new(html, :with_html_string => true, :link_query_string => qs, :adapter => adapter)
-		  premailer.to_inline_css
-	    assert_no_match /testing=123/, premailer.processed_doc.search('a').first.attributes['href'].to_s
-	  end
+      premailer = Premailer.new(html, :with_html_string => true, :link_query_string => qs, :adapter => adapter)
+      premailer.to_inline_css
+      assert_no_match /testing=123/, premailer.processed_doc.search('a').first.attributes['href'].to_s
+    end
   end
 
   def test_escaping_strings
@@ -176,7 +176,7 @@ END_HTML
 END_HTML
 
     [:nokogiri, :hpricot].each do |adapter|
-    	pm = Premailer.new(html, :with_html_string => true, :adapter => adapter, :escape_url_attributes => false)
+      pm = Premailer.new(html, :with_html_string => true, :adapter => adapter, :escape_url_attributes => false)
       pm.to_inline_css
       doc = pm.processed_doc
       assert_equal doc.at('#google')['href'], 'http://google.com'
@@ -194,14 +194,14 @@ END_HTML
 END_HTML
 
     [:nokogiri, :hpricot].each do |adapter|
-  		pm = Premailer.new(html, :with_html_string => true, :remove_ids => true, :adapter => adapter)
+      pm = Premailer.new(html, :with_html_string => true, :remove_ids => true, :adapter => adapter)
       pm.to_inline_css
       doc = pm.processed_doc
-  	  assert_nil doc.at('#remove')
-  	  assert_nil doc.at('#keep')
-  	  hashed_id = doc.at('a')['href'][1..-1]
-  	  assert_not_nil doc.at("\##{hashed_id}")
-  	end
+      assert_nil doc.at('#remove')
+      assert_nil doc.at('#keep')
+      hashed_id = doc.at('a')['href'][1..-1]
+      assert_not_nil doc.at("\##{hashed_id}")
+    end
   end
 
   def test_reset_contenteditable
@@ -213,12 +213,12 @@ END_HTML
     </body> </html>
     ___
     [:nokogiri, :hpricot].each do |adapter|
-  		pm = Premailer.new(html, :with_html_string => true, :reset_contenteditable => true, :adapter => adapter)
+      pm = Premailer.new(html, :with_html_string => true, :reset_contenteditable => true, :adapter => adapter)
       pm.to_inline_css
       doc = pm.processed_doc
-  	  assert_nil doc.at('#editable')['contenteditable'],
-        "#{adapter}: contenteditable attribute not removed"
-  	end
+      assert_nil doc.at('#editable')['contenteditable'],
+                 "#{adapter}: contenteditable attribute not removed"
+    end
   end
 
   def test_carriage_returns_as_entities
@@ -256,12 +256,12 @@ END_HTML
 END_HTML
 
     [:nokogiri, :hpricot].each do |adapter|
-  		pm = Premailer.new(html, :with_html_string => true, :adapter => adapter)
+      pm = Premailer.new(html, :with_html_string => true, :adapter => adapter)
       pm.to_inline_css
       doc = pm.processed_doc
-  	  assert_equal '500', doc.at('table')['width']
-  	  assert_equal '20', doc.at('td')['height']
-  	end
+      assert_equal '500', doc.at('table')['width']
+      assert_equal '20', doc.at('td')['height']
+    end
   end
 
   def test_include_link_tags_option
@@ -334,4 +334,14 @@ END_HTML
     end
   end
 
+  def test_empty_html_nokogiri
+    html = ""
+    css = "a:hover {color:red;}"
+
+    assert_nothing_raised do
+      pm = Premailer.new(html, :with_html_string => true, :css_string => css, :adapter => :nokogiri)
+      pm.to_inline_css
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Preflight for HTML e-mail.