premailer 1.5.4 → 1.5.6

data/README.rdoc

@@ -20,7 +20,6 @@ script is my solution.
 
 Download the Premailer gem from GemCutter.
 
-    gem sources -a http://gemcutter.org
     sudo gem install premailer
 
 === Example
@@ -48,19 +47,20 @@ Contributions are most welcome.  Premailer was rotting away in a private SVN rep
 A few areas that are particularly in need of love:
 * Testing suite
   There were unit tests but they were so funky that it was better to just strip them out.
-* Test running Premailer on local files
 * Create a binary file for easing command line use, allowing the output to be piped in *nix systems
-* Ruby 1.9 testing
 * Test with Rails
 * Move un-repeated background images defined in CSS to <tt><td background=""></tt> for Outlook
 * Correctly parse http://www.webstandards.org/files/acid2/test.html
 
 === Credits and code
 
-Premailer is written in Ruby.  
+Thanks to {all the wonderful contributors}[http://github.com/alexdunae/premailer/contributors] for their updates.
+
+Thanks to {Greenhood + Company}[http://www.greenhood.com/] for sponsoring some of the 1.5.6 updates, 
+and to {Campaign Monitor}[http://www.campaignmonitor.com] for supporting the web interface.
 
 The web interface can be found at http://premailer.dialect.ca .
 
 The source code can be found at http://github.com/alexdunae/premailer .
 
-Written by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2008-2009.
+Written by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2008-2010.

data/bin/premailer

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 #
 # = Premailer
-require 'trollop'
+require 'rubygems'
+require File.join(File.dirname(__FILE__), 'trollop')
 require File.join(File.dirname(__FILE__), '../lib/premailer')
 
 opts = Trollop::options do
@@ -23,7 +24,9 @@ EOS
   opt :query_string, "Query string to append to links", :type => String, :short => 'q'
   opt :line_length, "Length of lines when creating plaintext version", :type => :int, :default => 65, :short => 'l'
   opt :remove_classes, "Remove classes from the HTML document?", :default => false
+  opt :css, "Manually specify css stylesheets", :type => String, :multi => true
   opt :verbose, '', :default => false, :short => 'v'
+  opt :io_exceptions, "Abort on I/O errors loading style resources", :default => false, :short => 'e'
 end
 
 inputfile    = ARGV.shift
@@ -38,7 +41,10 @@ premailer_opts = {
   :query_string => opts[:query_string],
   :show_warnings => opts[:show_warnings] ? Premailer::Warnings::SAFE : Premailer::Warnings::NONE,
   :line_length => opts[:line_length],
-  :remove_classes => opts[:remove_classes]
+  :remove_classes => opts[:remove_classes],
+  :css => opts[:css],
+  :verbose => opts[:verbose],
+  :io_exceptions => opts[:io_exceptions],
 }
 
 premailer = Premailer.new(inputfile, premailer_opts)

data/lib/premailer.rb

@@ -1,9 +1,7 @@
-# Premailer by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2008-09
-
 require 'yaml'
 require 'open-uri'
-require 'hpricot'
+require 'cgi'
+require 'nokogiri'
 require 'css_parser'
-
-require File.dirname(__FILE__) + "/premailer/html_to_plain_text"
-require File.dirname(__FILE__) + "/premailer/premailer"
+require 'premailer/html_to_plain_text'
+require 'premailer/premailer'

data/lib/premailer/html_to_plain_text.rb

@@ -1,4 +1,4 @@
-require 'text/reform'
+# coding: utf-8
 require 'htmlentities'
 
 # Support functions for Premailer
@@ -9,9 +9,9 @@ module HtmlToPlainText
   # TODO:
   #  - add support for DL, OL
   def convert_to_text(html, line_length = 65, from_charset = 'UTF-8')
-    r = Text::Reform.new(:trim => true, 
-                         :squeeze => false, 
-                         :break => Text::Reform.break_wrap)
+    #r = Text::Reform.new(:trim => true,
+    #                     :squeeze => false,
+    #                     :break => Text::Reform.break_wrap)
 
     txt = html
     
@@ -20,22 +20,29 @@ module HtmlToPlainText
     txt = he.decode(txt)
 
     # handle headings (H1-H6)
-    txt.gsub!(/[ \t]*<h([0-9]+)[^>]*>(.*)<\/h[0-9]+>/i) do |s|
+    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|
       hlevel = $1.to_i
-      # cleanup text inside of headings
-      htext = $2.gsub(/<\/?[^>]*>/i, '').strip
-      hlength = (htext.length > line_length ? 
-                  line_length : 
-                  htext.length)
+
+      htext = $2      
+      htext.gsub!(/<br[\s]*\/?>/i, "\n") # handle <br>s
+      htext.gsub!(/<\/?[^>]*>/i, '') # strip tags
+
+      # determine maximum line length
+      hlength = 0
+      htext.each_line { |l| llength = l.strip.length; hlength = llength if llength > hlength }
+      hlength = line_length if hlength > line_length
 
       case hlevel
         when 1   # H1, asterisks above and below
-          ('*' * hlength) + "\n" + htext + "\n" + ('*' * hlength) + "\n"
+          htext = ('*' * hlength) + "\n" + htext + "\n" + ('*' * hlength)
         when 2   # H1, dashes above and below
-          ('-' * hlength) + "\n" + htext + "\n" + ('-' * hlength) + "\n"
+          htext = ('-' * hlength) + "\n" + htext + "\n" + ('-' * hlength)
         else     # H3-H6, dashes below
-          htext + "\n" + ('-' * htext.length) + "\n"
+          htext = htext + "\n" + ('-' * hlength)
       end
+      
+      "\n\n" + htext + "\n\n"
     end
 
     # links
@@ -56,7 +63,7 @@ module HtmlToPlainText
     txt.gsub!(/<\/?[^>]*>/, '')
 
     # wrap text
-    txt = r.format(('[' * line_length), txt)
+    #txt = r.format(('[' * line_length), txt)
     
     # remove linefeeds (\r\n and \r -> \n)
     txt.gsub!(/\r\n?/, "\n")

data/lib/premailer/premailer.rb

@@ -33,21 +33,48 @@ class Premailer
   include HtmlToPlainText
   include CssParser
 
-  VERSION = '1.5.4'
+  VERSION = '1.5.6'
 
   CLIENT_SUPPORT_FILE = File.dirname(__FILE__) + '/../../misc/client_support.yaml'
 
   RE_UNMERGABLE_SELECTORS = /(\:(visited|active|hover|focus|after|before|selection|target|first\-(line|letter))|^\@)/i
   
-  # should also exclude :first-letter, etc...
+  # list of CSS attributes that can be rendered as HTML attributes
+  #
+  # TODO: too much repetition
+  # TODO: background=""
+  RELATED_ATTRIBUTES = { 
+    'h1' => {'text-align' => 'align'},
+    'h2' => {'text-align' => 'align'},
+    'h3' => {'text-align' => 'align'},
+    'h4' => {'text-align' => 'align'},
+    'h5' => {'text-align' => 'align'},
+    'h6' => {'text-align' => 'align'},
+    'p' => {'text-align' => 'align'},
+    'div' => {'text-align' => 'align'},
+    'blockquote' => {'text-align' => 'align'},
+    'body' => {'background-color' => 'bgcolor'},
+    'table' => {'background-color' => 'bgcolor'},
+    'tr' => {'text-align' => 'align', 'background-color' => 'bgcolor'},
+    'th' => {'text-align' => 'align', 'background-color' => 'bgcolor', 'vertical-align' => 'valign'},
+    'td' => {'text-align' => 'align', 'background-color' => 'bgcolor', 'vertical-align' => 'valign'},
+    'img' => {'float' => 'align'}
+  }
 
   # URI of the HTML file used
   attr_reader   :html_file
   
-  # processed HTML document (Hpricot)
+  # base URL used to resolve links
+  attr_reader   :base_url
+
+  # base directory used to resolve links for local files
+  attr_reader   :base_dir
+
+  
+  # processed HTML document (Nokogiri)
   attr_reader   :processed_doc
   
-  # source HTML document (Hpricot)
+  # source HTML document (Nokogiri)
   attr_reader   :doc
 
   module Warnings
@@ -62,42 +89,61 @@ class Premailer
 
   # Create a new Premailer object.
   #
-  # +path+ is the path to the HTML file to process. Can be either the URL of a 
-  # remote file or a local path.
+  # +html+ is the HTML data to process. It can be either an IO object, the URL of a 
+  # remote file, a local path or a raw HTML string.  If passing an HTML string you 
+  # must set the +:with_html_string+ option to +true+.
   #
   # ==== Options
   # [+line_length+] Line length used by to_plain_text. Boolean, default is 65.
   # [+warn_level+] What level of CSS compatibility warnings to show (see Warnings).
   # [+link_query_string+] A string to append to every <a href=""> link. Do not include the initial +?+.
   # [+base_url+] Used to calculate absolute URLs for local files.
-  def initialize(path, options = {})
+  # [+css+] Manually specify a CSS stylesheet.
+  # [+css_to_attributes+] Copy related CSS attributes into HTML attributes (e.g. +background-color+ to +bgcolor+)
+  # [+with_html_string+] Whether the +html+ param should be treated as a raw string.
+  def initialize(html, options = {})
     @options = {:warn_level => Warnings::SAFE, 
                 :line_length => 65, 
                 :link_query_string => nil, 
                 :base_url => nil,
-                :remove_classes => false}.merge(options)
-    @html_file = path
-   
-    @is_local_file = true
-    if path =~ /^(http|https|ftp)\:\/\//i
-      @is_local_file = false
-    end
+                :remove_classes => false,
+                :css => [],
+                :css_to_attributes => true,
+                :with_html_string => false,
+                :verbose => false,
+                :io_exceptions => false}.merge(options)
+
+    @html_file = html 
+    @is_local_file = @options[:with_html_string] || Premailer.local_data?(html)
+
+    @css_files = @options[:css]
 
     @css_warnings = []
 
-    @css_parser = CssParser::Parser.new({:absolute_paths => true,
-                                         :import => true,
-                                         :io_exceptions => false
-                                        })
+    @base_url = nil
+    @base_dir = nil
+
+    if @options[:base_url]
+      @base_url = URI.parse(@options.delete[:base_url])
+    elsif not @is_local_file
+      @base_url = URI.parse(@html_file)
+    end
+
+    @css_parser = CssParser::Parser.new({
+      :absolute_paths => true,
+      :import => true,
+      :io_exceptions => @options[:io_exceptions]
+    })
     
-    @doc, @html_charset = load_html(@html_file)
+    @doc = load_html(@html_file)
+        
+    @html_charset = @doc.encoding
     @processed_doc = @doc
-    
-    if @is_local_file and @options[:base_url]
-      @processed_doc = convert_inline_links(@processed_doc, @options[:base_url])
-    elsif not @is_local_file
-      @processed_doc = convert_inline_links(@processed_doc, @html_file)
+    @processed_doc = convert_inline_links(@processed_doc, @base_url) if @base_url
+    if options[:link_query_string]
+      @processed_doc = append_query_string(@processed_doc, options[:link_query_string])
     end
+    load_css_from_options!
     load_css_from_html!
   end
 
@@ -119,7 +165,7 @@ class Premailer
   def to_plain_text
     html_src = ''
     begin
-      html_src = @doc.search("body").innerHTML
+      html_src = @doc.search("body").inner_html
     rescue
       html_src = @doc.to_html
     end
@@ -151,17 +197,17 @@ class Premailer
         unmergable_rules.add_rule_set!(RuleSet.new(selector, declaration))
       else
         
-        doc.search(selector) do |el|
+        doc.css(selector).each do |el|
           if el.elem?
             # Add a style attribute or append to the existing one  
             block = "[SPEC=#{specificity}[#{declaration}]]"
-            el['style'] = (el.attributes['style'] ||= '') + ' ' + block
+            el['style'] = (el.attributes['style'].to_s ||= '') + ' ' + block
           end
         end
       end
     end
 
-    # Read <style> attributes and perform folding
+    # Read STYLE attributes and perform folding
     doc.search("*[@style]").each do |el|
       style = el.attributes['style'].to_s
       
@@ -172,9 +218,30 @@ class Premailer
         declarations << rs
       end
 
-      # Perform style folding and save
+      # Perform style folding
       merged = CssParser.merge(declarations)
+      merged.expand_shorthand!
+      
+      #if @options[:prefer_cellpadding] and (el.name == 'td' or el.name == 'th') and el['cellpadding'].nil?
+      #  if cellpadding = equivalent_cellpadding(merged)
+      #    el['cellpadding'] = cellpadding
+      #    merged['padding-left'] = nil
+      #    merged['padding-right'] = nil
+      #    merged['padding-top'] = nil
+      #    merged['padding-bottom'] = nil
+      #  end
+      #end
+      
+      # Duplicate CSS attributes as HTML attributes
+      if RELATED_ATTRIBUTES.has_key?(el.name)       
+        RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
+          el[html_att] = merged[css_att].gsub(/;$/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+        end
+      end
+      
+      merged.create_dimensions_shorthand!
 
+      # write the inline STYLE attribute
       el['style'] = Premailer.escape_string(merged.declarations_to_s)
     end
 
@@ -189,41 +256,67 @@ class Premailer
 
 
 protected  
-  # Load the HTML file and convert it into an Hpricot document.
+  # Load the HTML file and convert it into an Nokogiri document.
   #
-  # Returns an Hpricot document and a string with the HTML file's character set.
+  # Returns an Nokogiri document.
   def load_html(path) # :nodoc:
-    if @is_local_file
-        Hpricot(File.open(path, "r") {|f| f.read })
+    if @options[:with_html_string]
+      Nokogiri::HTML.parse(path)
+    elsif @options[:inline]
+      Nokogiri::HTML(path)
     else
-      Hpricot(open(path))
+      if @is_local_file
+        if path.is_a?(IO) || path.is_a?(StringIO)
+          Nokogiri::HTML(path.read)
+        else
+          @base_dir = File.dirname(path)
+          Nokogiri::HTML(File.open(path, "r") {|f| f.read })
+        end
+      else
+        Nokogiri::HTML(open(path))
+      end
     end
   end
-  
+
+  def load_css_from_local_file!(path)
+    css_block = ''
+    begin
+      File.open(path, "r") do |file|
+        while line = file.gets
+          css_block << line
+        end
+      end
+      @css_parser.add_block!(css_block, {:base_uri => @base_url, :base_dir => @base_dir})
+    rescue; end
+  end
+
+  def load_css_from_options! # :nodoc:
+    @css_files.each do |css_file|
+      if Premailer.local_data?(css_file)
+        load_css_from_local_file!(css_file)
+      else
+        @css_parser.load_uri!(css_file)
+      end
+    end
+  end
+
   # Load CSS included in <tt>style</tt> and <tt>link</tt> tags from an HTML document.
   def load_css_from_html! # :nodoc:
     if tags = @doc.search("link[@rel='stylesheet'], style")
       tags.each do |tag|
-
         if tag.to_s.strip =~ /^\<link/i and tag.attributes['href'] and media_type_ok?(tag.attributes['media'])
 
           link_uri = Premailer.resolve_link(tag.attributes['href'].to_s, @html_file)
-          if @is_local_file
-            css_block = ''
-            begin
-              File.open(link_uri, "r") do |file|
-                while line = file.gets
-                  css_block << line
-                end
-              end
-              @css_parser.add_block!(css_block, {:base_uri => @html_file})
-            rescue; end
+          if Premailer.local_data?(link_uri)
+            puts "Loading css from local file: " + link_uri if @options[:verbose]
+            load_css_from_local_file!(link_uri)
           else
+            puts "Loading css from uri: " + link_uri if @options[:verbose]
             @css_parser.load_uri!(link_uri)
           end
 
-        elsif tag.to_s.strip =~ /^\<style/i          
-          @css_parser.add_block!(tag.innerHTML, :base_uri => URI.parse(@html_file))
+        elsif tag.to_s.strip =~ /^\<style/i      
+          @css_parser.add_block!(tag.inner_html, :base_uri => @base_url, :base_dir => @base_dir, :only_media_types => [:screen, :handheld])
         end
       end
       tags.remove
@@ -240,9 +333,9 @@ protected
   # Create a <tt>style</tt> element with un-mergable rules (e.g. <tt>:hover</tt>) 
   # and write it into the <tt>body</tt>.
   #
-  # <tt>doc</tt> is an Hpricot document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
+  # <tt>doc</tt> is an Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
   #
-  # Returns an Hpricot document.
+  # Returns an Nokogiri document.
   def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
     styles = ''
     unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
@@ -251,7 +344,26 @@ protected
 
     unless styles.empty?
       style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
-      doc.search("head").append(style_tag)
+      doc.css("head").children.last.after(style_tag)
+    end
+    doc
+  end
+
+  def append_query_string(doc, qs)
+    doc.search('a').each do|el|
+      href = el.attributes['href'].to_s
+      next if href.nil? or href.empty?
+      
+      href = URI.parse(href)
+    
+      if href.query
+        href.query = href.query + '&amp' + qs
+      else
+        href.query = qs
+      end
+    
+      el['href'] = href.to_s
+
     end
     doc
   end
@@ -261,13 +373,13 @@ protected
   # Processes <tt>href</tt> <tt>src</tt> and <tt>background</tt> attributes 
   # as well as CSS <tt>url()</tt> declarations found in inline <tt>style</tt> attributes.
   #
-  # <tt>doc</tt> is an Hpricot document and <tt>base_uri</tt> is either a string or a URI.
+  # <tt>doc</tt> is an Nokogiri document and <tt>base_uri</tt> is either a string or a URI.
   #
-  # Returns an Hpricot document.
+  # Returns an Nokogiri document.
   def convert_inline_links(doc, base_uri) # :nodoc:
     base_uri = URI.parse(base_uri) unless base_uri.kind_of?(URI)
 
-    append_qs = @options[:link_query_string] ||= ''
+    append_qs = @options[:link_query_string] || ''
 
     ['href', 'src', 'background'].each do |attribute|
       tags = doc.search("*[@#{attribute}]")
@@ -297,17 +409,7 @@ protected
 
         # make sure 'merged' is a URI
         merged = URI.parse(merged.to_s) unless merged.kind_of?(URI)
-
-        # only append a querystring to <a> tags
-        if tag.name =~ /^a$/i and not append_qs.empty?
-          if merged.query
-            merged.query = merged.query + '&' + append_qs
-          else
-            merged.query = append_qs
-          end
-        end
         tag[attribute] = merged.to_s
-
       end # end of each tag
     end # end of each attrs
 
@@ -317,13 +419,27 @@ protected
     doc
   end
 
+# here be deprecated methods
+public
+
+  def local_uri?(uri) # :nodoc:
+    warn "[DEPRECATION] `local_uri?` is deprecated.  Please use `Premailer.local_data?` instead."
+    Premailer.local_data?(uri)
+  end
+
+# here be instance methods
+
   def self.escape_string(str) # :nodoc:
     str.gsub(/"/, "'")
   end
   
   def self.resolve_link(path, base_path) # :nodoc:
+    path.strip!
     resolved = nil
-    if base_path.kind_of?(URI)
+    if path =~ /(http[s]?|ftp):\/\//i
+      resolved = path
+      return Premailer.canonicalize(resolved)
+    elsif base_path.kind_of?(URI)
       resolved = base_path.merge(path)
       return Premailer.canonicalize(resolved)    
     elsif base_path.kind_of?(String) and base_path =~ /^(http[s]?|ftp):\/\//i
@@ -336,67 +452,80 @@ protected
     end
   end
 
+  # Test the passed variable to see if we are in local or remote mode.
+  #
+  # IO objects return true, as do strings that look like URLs.
+  def self.local_data?(data)
+    if data.is_a?(IO) || data.is_a?(StringIO)
+      return true
+    elsif data =~ /^(http|https|ftp)\:\/\//i
+      return false
+    else
+      return true
+    end
+  end  
+
   # 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.normalize!
     newpath = u.path
     while newpath.gsub!(%r{([^/]+)/\.\./?}) { |match|
-      $1 == '..' ? match : ''
-    } do end
-    newpath = newpath.gsub(%r{/\./}, '/').sub(%r{/\.\z}, '/')
-    u.path = newpath
-    u.to_s
-  end
+        $1 == '..' ? match : ''
+      } do end
+      newpath = newpath.gsub(%r{/\./}, '/').sub(%r{/\.\z}, '/')
+      u.path = newpath
+      u.to_s
+    end
 
-  # Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
-  def check_client_support # :nodoc:
-    @client_support = @client_support ||= YAML::load(File.open(CLIENT_SUPPORT_FILE))
+    # Check <tt>CLIENT_SUPPORT_FILE</tt> for any CSS warnings
+    def check_client_support # :nodoc:
+      @client_support = @client_support ||= YAML::load(File.open(CLIENT_SUPPORT_FILE))
 
-    warnings = []
-    properties = []
+      warnings = []
+      properties = []
     
-    # Get a list off CSS properties
-    @processed_doc.search("*[@style]").each do |el|
-      style_url = el.attributes['style'].gsub(/([\w\-]+)[\s]*\:/i) do |s|
-        properties.push($1)
+      # Get a list off CSS properties
+      @processed_doc.search("*[@style]").each do |el|
+        style_url = el.attributes['style'].to_s.gsub(/([\w\-]+)[\s]*\:/i) do |s|
+          properties.push($1)
+        end
       end
-    end
 
-    properties.uniq!
+      properties.uniq!
 
-    property_support = @client_support['css_properties']
-    properties.each do |prop|
-      if property_support.include?(prop) and 
-         property_support[prop].include?('support') and 
-         property_support[prop]['support'] >= @options[:warn_level]
-        warnings.push({:message => "#{prop} CSS property", 
-                       :level => WARN_LABEL[property_support[prop]['support']], 
-                       :clients => property_support[prop]['unsupported_in'].join(', ')})
+      property_support = @client_support['css_properties']
+      properties.each do |prop|
+        if property_support.include?(prop) and
+            property_support[prop].include?('support') and
+            property_support[prop]['support'] >= @options[:warn_level]
+          warnings.push({:message => "#{prop} CSS property",
+              :level => WARN_LABEL[property_support[prop]['support']],
+              :clients => property_support[prop]['unsupported_in'].join(', ')})
+        end
       end
-    end
 
-    @client_support['attributes'].each do |attribute, data|
-      next unless data['support'] >= @options[:warn_level]
-      if @doc.search("*[@#{attribute}]").length > 0
-        warnings.push({:message => "#{attribute} HTML attribute", 
-                       :level => WARN_LABEL[property_support[prop]['support']], 
-                       :clients => property_support[prop]['unsupported_in'].join(', ')})
+      @client_support['attributes'].each do |attribute, data|
+        next unless data['support'] >= @options[:warn_level]
+        if @doc.search("*[@#{attribute}]").length > 0
+          warnings.push({:message => "#{attribute} HTML attribute",
+              :level => WARN_LABEL[property_support[prop]['support']],
+              :clients => property_support[prop]['unsupported_in'].join(', ')})
+        end
       end
-    end
 
-    @client_support['elements'].each do |element, data|
-      next unless data['support'] >= @options[:warn_level]
-      if @doc.search("element").length > 0
-        warnings.push({:message => "#{element} HTML element", 
-                       :level => WARN_LABEL[property_support[prop]['support']], 
-                       :clients => property_support[prop]['unsupported_in'].join(', ')})
+      @client_support['elements'].each do |element, data|
+        next unless data['support'] >= @options[:warn_level]
+        if @doc.search("element").length > 0
+          warnings.push({:message => "#{element} HTML element",
+              :level => WARN_LABEL[property_support[prop]['support']],
+              :clients => property_support[prop]['unsupported_in'].join(', ')})
+        end
       end
-    end
 
-    return warnings
+      return warnings
+    end
   end
-end
 
 
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: premailer
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
+  hash: 15
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - Alex Dunae
@@ -9,69 +15,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -08:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
-    version: 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: css_parser
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: text-reform
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
-    version: 
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: htmlentities
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Improve the rendering of HTML emails by making CSS inline, converting links and warning about unsupported code.
 email: code@dunae.ca
 executables: 
 - premailer
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - init.rb
-- rakefile.rb
+- bin/premailer
+- bin/trollop.rb
 - lib/premailer.rb
 - lib/premailer/html_to_plain_text.rb
 - lib/premailer/premailer.rb
-- CHANGELOG.rdoc
-- LICENSE.rdoc
-- README.rdoc
 - misc/client_support.yaml
-- bin/premailer
-- bin/trollop.rb
+- README.rdoc
 has_rdoc: true
 homepage: http://premailer.dialect.ca/
 licenses: []
@@ -86,21 +97,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Preflight for HTML e-mail.

data/CHANGELOG.rdoc

@@ -1,57 +0,0 @@
-= Premailer CHANGELOG
-
-== Version 1.5.4
-* new bin/premailer script
-* added missing htmlentities depenency to gemspec (thanks to http://github.com/usefulthink )
-* fixed handling of unspecified <link> media types
-
-== Version 1.5.3
- * improved plaintext conversion
-
-== Version 1.5.2
- * released to GitHub
- * fixed handling of mailto links
- * various minor updates
-
-== Version 1.5.1
- * bugfix (http://code.google.com/p/premailer/issues/detail?id=1 and http://code.google.com/p/premailer/issues/detail?id=2) thanks to Russell Norris 
- * bugfix (http://code.google.com/p/premailer/issues/detail?id=4) thanks to Dave Holmes 
-
-== Version 1.5.0
- * preview release of Ruby gem
-
-== Version 1.4
- * incremental parsing improvements
- * respect <tt>@media</tt> rule (http://www.w3.org/TR/CSS21/media.html#at-media-rule)
- * better quote escaping
-
-== Version 1.3
- * separate CSS parser into its own library
- * handle <tt>background: red url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);</tt>
- * preserve <tt>:hover</tt> etc... in head styles
-
-== Version 1.2
- * respect <tt>LINK</tt> media types
- * better style folding
- * incremental parsing improvements
-
-== Version 1.1
- * proper calculation of selector specificity per CSS 2.1 spec
- * support for <tt>@import</tt>
- * preliminary support for shorthand CSS properties (<tt>margin</tt>, <tt>padding</tt>)
- * preliminary separation of CSS parser
-
-== Version 1.0
- * ported web interface to eRuby
- * incremental parsing improvements
-
-== Version 0.9
- * initial proof-of-concept
- * PHP web version
-
-== TODO: Future
- * complete shorthand properties support (<tt>border-width</tt>, <tt>font</tt>, <tt>background</tt>)
- * UTF-8 and other charsets (test page: http://kianga.kcore.de/2004/09/21/utf8_test)
- * make warnings for <tt>border</tt> match <tt>border-left</tt>, etc...
- * Integrate CSS validator
- * Remove unused classes and IDs

data/LICENSE.rdoc

@@ -1,42 +0,0 @@
-= Premailer License
-
-Copyright (c) 2007-09 Alex Dunae
-
-Premailer is copyrighted free software by Alex Dunae (http://dunae.ca/).
-You can redistribute it and/or modify it under the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to the internet or an equivalent medium, or by 
-	  allowing the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may modify and include the part of the software into any other
-     software (possibly commercial) as long as clear acknowledgement and 
-     a link back to the original software (http://code.dunae.ca/premailer.web/)
-     is provided.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.

data/rakefile.rb

@@ -1,42 +0,0 @@
-require 'rake'
-require 'fileutils'
-require 'lib/premailer'
-
-desc 'Default: parse a URL.'
-task :default => [:inline]
-
-desc 'Parse a URL and write out the output.'
-task :inline do
-  url = ENV['url']
-  output = ENV['output']
-  
-  if !url or url.empty? or !output or output.empty?
-    puts 'Usage: rake inline url=http://example.com/ output=output.html'
-    exit
-  end
-
-  premailer = Premailer.new(url, :warn_level => Premailer::Warnings::SAFE)
-  fout = File.open(output, "w")
-  fout.puts premailer.to_inline_css
-  fout.close
-
-  puts "Succesfully parsed '#{url}' into '#{output}'"
-  puts premailer.warnings.length.to_s + ' CSS warnings were found'
-end
-
-task :text do
-  url = ENV['url']
-  output = ENV['output']
-  
-  if !url or url.empty? or !output or output.empty?
-    puts 'Usage: rake text url=http://example.com/ output=output.txt'
-    exit
-  end
-
-  premailer = Premailer.new(url, :warn_level => Premailer::Warnings::SAFE)
-  fout = File.open(output, "w")
-  fout.puts premailer.to_plain_text
-  fout.close
-  
-  puts "Succesfully parsed '#{url}' into '#{output}'"
-end