premailer 1.6.1 → 1.6.2

data/bin/premailer

@@ -2,8 +2,7 @@
 
 require 'optparse'
 require 'rubygems'
-require 'premailer'
-require 'fcntl'
+require File.expand_path(File.join(__FILE__) + '/../../lib/premailer.rb')
 
 # defaults
 options = {
@@ -17,8 +16,8 @@ options = {
 mode = :html
 
 opts = OptionParser.new do |opts|
-  opts.banner = "Improve the rendering of HTML emails by making CSS inline, converting links and warning about unsupported code."
-  opts.define_head "Usage: premailer <uri|path> [options]"
+  opts.banner = "Improve the rendering of HTML emails by making CSS inline among other things. Takes a path to a local file, a URL or a pipe as input.\n\n"
+  opts.define_head "Usage: premailer <optional uri|optional path> [options]"
   opts.separator ""
   opts.separator "Examples:"
   opts.separator "  premailer http://example.com/ > out.html"
@@ -28,15 +27,15 @@ opts = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on("--mode [MODE]", [:html, :txt], "Output type: either html or txt") do |v|
+  opts.on("--mode MODE", [:html, :txt], "Output: html or txt") do |v|
     mode = v
   end
 
-  opts.on("-b", "--base-url", String, "Manually set the base URL, useful for local files") do |v|
+  opts.on("-b", "--base-url", String, "Base URL, useful for local files") do |v|
     options[:base_url] = v
   end
 
-  opts.on("-q", "--query-string STRING", String, "Query string to append to links (do not include the ?)") do |v|
+  opts.on("-q", "--query-string STRING", String, "Query string to append to links") do |v|
     options[:link_query_string] = v
   end
 
@@ -44,11 +43,11 @@ opts = OptionParser.new do |opts|
     options[:css] = v
   end
 
-  opts.on("-r", "--remove-classes", "Remove classes from the HTML document?") do |v|
+  opts.on("-r", "--remove-classes", "Remove HTML classes") do |v|
     options[:remove_classes] = v
   end
 
-  opts.on("-l", "--line-length N", Integer, "Length of lines when creating plaintext version (default: #{options[:line_length].to_s})") do |v|
+  opts.on("-l", "--line-length N", Integer, "Line length for plaintext (default: #{options[:line_length].to_s})") do |v|
     options[:line_length] = v
   end
 
@@ -75,26 +74,26 @@ opts.parse!
 $stderr.puts "Processing in #{mode} mode with options #{options.inspect}" if options[:verbose]
 
 premailer = nil
+input = nil
 
-# check for input from STDIN
-if STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
-  io = STDIN.to_io
-  premailer = Premailer.new(io, options)
+if $stdin.tty?
+  input = ARGV.shift
 else
-  uri = ARGV.shift
-
-  if uri.to_s.strip.empty?
-    puts opts
-    exit 1
-  end
+  input = $stdin
+  options[:with_html_string] = true
+end
 
-  premailer = Premailer.new(uri, options)
+if input
+  premailer = Premailer.new(input, options)
+else
+  puts opts
+  exit 1
 end
 
 if mode == :txt
-  p premailer.to_plain_text
+  print premailer.to_plain_text
 else
-  p premailer.to_inline_css
+  print premailer.to_inline_css
 end
 
 exit

data/lib/premailer.rb

@@ -3,5 +3,5 @@ require 'open-uri'
 require 'cgi'
 require 'hpricot'
 require 'css_parser'
-require 'premailer/html_to_plain_text'
-require 'premailer/premailer'
+require File.expand_path(File.dirname(__FILE__) + '/premailer/html_to_plain_text')
+require File.expand_path(File.dirname(__FILE__) + '/premailer/premailer')

data/lib/premailer/premailer.rb

@@ -33,7 +33,7 @@ class Premailer
   include HtmlToPlainText
   include CssParser
 
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 
   CLIENT_SUPPORT_FILE = File.dirname(__FILE__) + '/../../misc/client_support.yaml'
 
@@ -287,7 +287,8 @@ protected
     else
       thing = open(input)
     end
-    
+
+    # TODO: deal with Hpricot seg faults on empty input
     thing ? Hpricot(thing) : nil  
   end
 
@@ -369,7 +370,7 @@ protected
   def append_query_string(doc, qs)
     return doc if qs.nil?
 
-    qs.to_s.strip!
+    qs.to_s.gsub!(/^[\?]*/, '').strip!
     return doc if qs.empty?
     
     begin
@@ -382,8 +383,8 @@ protected
     
     doc.search('a').each do|el|
       href = el.attributes['href'].to_s.strip
-      next if href.nil? or href.empty?      
-      next if href[0] == '#' # don't bother with anchors
+      next if href.nil? or href.empty?    
+      next if href[0,1] == '#' # don't bother with anchors
 
       begin
         href = URI.parse(href)
@@ -397,11 +398,11 @@ protected
           puts "Skipping append_query_string for: #{href.to_s} because scheme is no good" if @options[:verbose]
           next
         end
-        
-        if href.query
+
+        if href.query and not href.query.empty?
           href.query = href.query + '&' + qs
         else
-          href.query = '?' + qs
+          href.query = qs
         end
     
         el['href'] = href.to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Alex Dunae
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency