premailer 1.7.8 → 1.7.9

data/README.md

@@ -20,15 +20,20 @@ I'm looking for input on a version 2.0 update to Premailer.  PLease visit the [P
 
 ## Installation
 
-Download the Premailer gem from RubyGems.
+Install the Premailer gem from RubyGems.
 
 ```bash
 gem install premailer
 ```
 
+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)
 
 # Write the HTML output
@@ -61,6 +66,7 @@ Premailer looks for a few CSS attributes that make working with tables a bit eas
 | -premailer-height | Available on `table`, `tr`, `th` and `td` elements |
 | -premailer-cellpadding | Available on `table` elements |
 | -premailer-cellspacing | Available on `table` elements |
+| data-premailer="ignore" | Available on `style` elements. Premailer will ignore these elements entirely. |
 
 Each of these CSS declarations will be copied to appropriate element's attribute.
 

data/lib/premailer/adapter/nokogiri.rb

@@ -30,6 +30,12 @@ class Premailer
             @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration)) unless @options[:preserve_styles]
           else
             begin
+              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]
+              end
+
               # Change single ID CSS selectors into xpath so that we can match more
               # than one element.  Added to work around dodgy generated code.
               selector.gsub!(/\A\#([\w_\-]+)\Z/, '*[@id=\1]')
@@ -131,7 +137,7 @@ class Premailer
         end
 
         unless styles.empty?
-          style_tag = "<style type=\"text/css\">\n#{styles}></style>"
+          style_tag = "<style type=\"text/css\">\n#{styles}</style>"
           if head = doc.search('head')
             doc.at_css('head').add_child(::Nokogiri::XML.fragment(style_tag))
           elsif body = doc.search('body')

data/lib/premailer/executor.rb

@@ -77,10 +77,10 @@ $stderr.puts "Processing in #{mode} mode with options #{options.inspect}" if opt
 premailer = nil
 input = nil
 
-if $stdin.tty? or STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
+if $stdin.tty?
   input = ARGV.shift
 else
-  input = $stdin
+  input = $stdin.read
   options[:with_html_string] = true
 end
 

data/lib/premailer/html_to_plain_text.rb

@@ -10,10 +10,6 @@ module HtmlToPlainText
   def convert_to_text(html, line_length = 65, from_charset = 'UTF-8')
     txt = html
 
-    # decode HTML entities
-    he = HTMLEntities.new
-    txt = he.decode(txt)
-
     # replace images with their alt attributes
     # for img tags with "" for attribute quotes
     # with or without closing tag
@@ -46,7 +42,6 @@ module HtmlToPlainText
       end
     end
 
-
     # handle headings (H1-H6)
     txt.gsub!(/(<\/h[1-6]>)/i, "\n\\1") # move closing tags to new lines
     txt.gsub!(/[\s]*<h([1-6]+)[^>]*>[\s]*(.*)[\s]*<\/h[1-6]+>/i) do |s|
@@ -88,6 +83,10 @@ module HtmlToPlainText
     # strip remaining tags
     txt.gsub!(/<\/?[^>]*>/, '')
 
+    # decode HTML entities
+    he = HTMLEntities.new
+    txt = he.decode(txt)
+
     txt = word_wrap(txt, line_length)
 
     # remove linefeeds (\r\n and \r -> \n)

data/lib/premailer/version.rb

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

data/rakefile.rb

@@ -1,5 +1,3 @@
-$:.unshift File.expand_path('../lib', __FILE__)
-
 require 'rake'
 require 'rake/testtask'
 require "bundler/gem_tasks"

data/test/test_links.rb

@@ -121,6 +121,18 @@ class TestLinks < Premailer::TestCase
     assert_equal 'http://example.com/path', Premailer.resolve_link(' path', base_uri)
   end
 
+  def test_resolving_urls_from_html_string
+    # The inner URI is on its own line to ensure that the impl doesn't match
+    # URIs based on start of line.
+    base_uri = "<html><head></head><body>\nhttp://example.com/\n</body>"
+    ['test.html', '/test.html', './test.html',
+     'test/../test.html', 'test/../test/../test.html'].each do |q|
+      assert_nothing_raised do
+        Premailer.resolve_link(q, base_uri)
+      end
+    end
+  end
+
   def test_resolving_urls_in_doc
     # force Nokogiri since this consistenly segfaults with Hpricot
     base_file = File.dirname(__FILE__) + '/files/base.html'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser