pony 0.9.1 → 1.0

data/README.rdoc

@@ -5,8 +5,8 @@
 Ruby no longer has to be jealous of PHP's mail() function, which can send an email in a single command.
 
   Pony.mail(:to => 'you@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Hello there.')
-  Pony.mail(:to => 'you@example.com', :body => '<h1>Hello there!</h1>', :content_type => 'text/html')
-  Pony.mail(:to => 'you@example.com', :cc => 'him@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Howdy')
+  Pony.mail(:to => 'you@example.com', :html_body => '<h1>Hello there!</h1>', :body => "In case you can't read html, Hello there.")
+  Pony.mail(:to => 'you@example.com', :cc => 'him@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Howsit!')
 
 Any option key may be omitted except for :to. For a complete list of options, see List Of Options section below.
 
@@ -15,7 +15,7 @@ Any option key may be omitted except for :to. For a complete list of options, se
 
 Pony uses /usr/sbin/sendmail to send mail if it is available, otherwise it uses SMTP to localhost.
 
-This can be over-ridden if you specify a via option
+This can be over-ridden if you specify a via option:
 
   Pony.mail(:to => 'you@example.com', :via => :smtp) # sends via SMTP
   
@@ -23,29 +23,34 @@ This can be over-ridden if you specify a via option
 
 You can also specify options for SMTP:
 
-  Pony.mail(:to => 'you@example.com', :via => :smtp, :smtp => {
-    :host   => 'smtp.yourserver.com',
-    :port   => '25',
-    :user   => 'user',
-    :password   => 'password',
-    :auth   => :plain, # :plain, :login, :cram_md5, no auth by default
-    :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
+  Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+    :address        => 'smtp.yourserver.com',
+    :port           => '25',
+    :user_name      => 'user',
+    :password       => 'password',
+    :authentication => :plain, # :plain, :login, :cram_md5, no auth by default
+    :domain         => "localhost.localdomain" # the HELO domain provided by the client to the server
   }
 
-== TLS/SSL
+Gmail example (with TLS/SSL)
 
-With smtp transport it also possible to use TLS/SSL:
-
-  Pony.mail(:to => 'you@example.com', :via => :smtp, :smtp => {
-    :host   => 'smtp.gmail.com',
-    :port   => '587',
-    :tls    => true,
-    :user   => 'user',
-    :password   => 'password',
-    :auth   => :plain, # :plain, :login, :cram_md5, no auth by default
-    :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
+  Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+    :address              => 'smtp.gmail.com',
+    :port                 => '587',
+    :enable_starttls_auto => true,
+    :user_name            => 'user',
+    :password             => 'password',
+    :authentication       => :plain, # :plain, :login, :cram_md5, no auth by default
+    :domain               => "localhost.localdomain" # the HELO domain provided by the client to the server
   })
 
+And options for Sendmail:
+
+  Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+    :location  => '/path/to/sendmail' # this defaults to 'which sendmail' or '/usr/sbin/sendmail' if 'which' fails
+    :arguments => '-t' # -t and -i are the defaults
+  }
+
 == Attachments
 
 You can attach a file or two with the :attachments option:
@@ -62,32 +67,34 @@ Pony allows you to specify custom mail headers
     :headers => { "List-ID" => "...", "X-My-Custom-Header" => "what a cool custom header" }
   )
 
-
 == List Of Options
 
-Options passed pretty much directly to Tmail
- content_type
+Options passed pretty much directly to Mail
  to
  cc
  bcc
  from
+ body # the plain text body
+ html_body # for sending html-formatted email
  subject
- charset
+ charset # In case you need to send in utf-8 or similar
  attachments # see Attachments section above
  headers # see Custom headers section above
  message_id
 
 Other options
  via # :smtp or :sendmail, see Transport section above
- smtp # specify smtp info, see Transport section above
- tls # use tls, see TLS/SSL section above
+ via_options # specify transport options, see Transport section above
+
+== Help
+
+If you need help using Pony, or it looks like you've found a bug, we have a google group setup at: ponyrb@googlegroups.com.
 
 == External Dependencies
 
-tmail ~> 1.0
-mime-types >= 1.16
+mail > 2.0
 
-Note: these requirements are specified in the gemspec as well.  Also, you may need smtp_tls if you want to send via tls and are using ruby < 1.8.7
+Note: these requirements are specified in the gemspec as well.  Also, you may need smtp_tls if you want to send via tls/ssl and are using ruby < 1.8.7
 
 == Meta
 
@@ -95,9 +102,18 @@ Maintained by Ben Prew
 
 Written by Adam Wiggins
 
-Patches contributed by: Mathieu Martin, Arun Thampi, Thomas Hurst,
-Stephen Celis, Othmane Benkirane, Neil Mock, Hiroshi Saito, Jesse
-Cooke, Nickolas Means, and Rick Olson
+Patches contributed by:
+Arun Thampi,
+Hiroshi Saito,
+Jesse Cooke,
+Mathieu Martin,
+Neil Mock,
+Nickolas Means,
+Othmane Benkirane,
+Rick Olson
+Stephen Celis,
+Thomas Hurst,
+Kalin Harvey
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
@@ -107,13 +123,16 @@ mailing list: ponyrb@googlegroups.com
 
 == Releases
 
+1.0
+* Convert to using Mail as the mail-generation backend, instead of TMail
+
 0.9.1
 * provide the ability to set custom mail headers with something like:
 	Pony.mail(:headers => {"List-ID" => "..."})
 * provide the ability to set the Message-Id from Pony.mail
 
 0.9
-* merge in kalins fixes to use tmail.destinations instead of trying to parse tmail.to, tmail.cc and tmail.bcc.  New specs to test functionality
+* merge in kalin's fixes to use tmail.destinations instead of trying to parse tmail.to, tmail.cc and tmail.bcc.  New specs to test functionality
 
 0.8
 * Fix bug that was allowing nil :bcc and :cc options to be passed to smtp

data/lib/pony.rb

@@ -1,65 +1,199 @@
 require 'rubygems'
-require 'net/smtp'
-require 'mime/types'
-begin
-	require 'smtp_tls'
-rescue LoadError
-end
+require 'mail'
 require 'base64'
-begin
-	require 'tmail'
-rescue LoadError
-	require 'actionmailer'
-end
+
+# = Pony, the express way to send email in Ruby
+# 
+# == Overview
+# 
+# Ruby no longer has to be jealous of PHP's mail() function, which can send an email in a single command.
+# 
+#   Pony.mail(:to => 'you@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Hello there.')
+#   Pony.mail(:to => 'you@example.com', :html_body => '<h1>Hello there!</h1>', :body => "In case you can't read html, Hello there.")
+#   Pony.mail(:to => 'you@example.com', :cc => 'him@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Howsit!')
+# 
+# Any option key may be omitted except for :to. For a complete list of options, see List Of Options section below.
+# 
+# 
+# == Transport
+# 
+# Pony uses /usr/sbin/sendmail to send mail if it is available, otherwise it uses SMTP to localhost.
+# 
+# This can be over-ridden if you specify a via option:
+# 
+#   Pony.mail(:to => 'you@example.com', :via => :smtp) # sends via SMTP
+#   
+#   Pony.mail(:to => 'you@example.com', :via => :sendmail) # sends via sendmail
+# 
+# You can also specify options for SMTP:
+# 
+#   Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+#     :address        => 'smtp.yourserver.com',
+#     :port           => '25',
+#     :user_name      => 'user',
+#     :password       => 'password',
+#     :authentication => :plain, # :plain, :login, :cram_md5, no auth by default
+#     :domain         => "localhost.localdomain" # the HELO domain provided by the client to the server
+#   }
+# 
+# Gmail example (with TLS/SSL)
+# 
+#   Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+#     :address              => 'smtp.gmail.com',
+#     :port                 => '587',
+#     :enable_starttls_auto => true,
+#     :user_name            => 'user',
+#     :password             => 'password',
+#     :authentication       => :plain, # :plain, :login, :cram_md5, no auth by default
+#     :domain               => "localhost.localdomain" # the HELO domain provided by the client to the server
+#   })
+# 
+# And options for Sendmail:
+# 
+#   Pony.mail(:to => 'you@example.com', :via => :smtp, :via_options => {
+#     :location  => '/path/to/sendmail' # this defaults to 'which sendmail' or '/usr/sbin/sendmail' if 'which' fails
+#     :arguments => '-t' # -t and -i are the defaults
+#   }
+# 
+# == Attachments
+# 
+# You can attach a file or two with the :attachments option:
+# 
+#   Pony.mail(..., :attachments => {"foo.zip" => File.read("path/to/foo.zip"), "hello.txt" => "hello!"})
+# 
+# Note: An attachment's mime-type is set based on the filename (as dictated by the ruby gem mime-types).  So 'foo.pdf' has a mime-type of 'application/pdf'
+# 
+# == Custom Headers
+# 
+# Pony allows you to specify custom mail headers
+#   Pony.mail(
+#     :to => 'me@example.com', 
+#     :headers => { "List-ID" => "...", "X-My-Custom-Header" => "what a cool custom header" }
+#   )
+# 
+# == List Of Options
+# 
+# Options passed pretty much directly to Mail
+#  to
+#  cc
+#  bcc
+#  from
+#  body # the plain text body
+#  html_body # for sending html-formatted email
+#  subject
+#  charset # In case you need to send in utf-8 or similar
+#  attachments # see Attachments section above
+#  headers # see Custom headers section above
+#  message_id
+# 
+# Other options
+#  via # :smtp or :sendmail, see Transport section above
+#  via_options # specify transport options, see Transport section above
+
+
 
 module Pony
+
+# Send an email
+#   Pony.mail(:to => 'you@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Hello there.')
+#   Pony.mail(:to => 'you@example.com', :html_body => '<h1>Hello there!</h1>', :body => "In case you can't read html, Hello there.")
+#   Pony.mail(:to => 'you@example.com', :cc => 'him@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Howsit!')
 	def self.mail(options)
 		raise(ArgumentError, ":to is required") unless options[:to]
 
-		via = options.delete(:via)
-		if via.nil?
-			transport build_tmail(options)
-		else
-			if via_options.include?(via.to_s)
-				send("transport_via_#{via}", build_tmail(options), options)
-			else
-				raise(ArgumentError, ":via must be either smtp or sendmail")
+		options[:via] = default_delivery_method unless options.has_key?(:via)
+		raise(ArgumentError, ":via must be either smtp or sendmail") unless via_possibilities.include?(options[:via])
+
+		options = cross_reference_depricated_fields(options)
+
+		if options.has_key?(:via) && options[:via] == :sendmail
+			options[:via_options] ||= {}
+			options[:via_options][:location] ||= sendmail_binary
+		end
+
+		deliver build_mail(options)
+	end
+
+	private
+
+	def self.cross_reference_depricated_fields(options)
+		if options.has_key?(:smtp)
+			warn depricated_message(:smtp, :via_options)
+			options[:via_options] = options.delete(:smtp)
+		end
+
+		# cross-reference pony options to be compatible with keys mail expects
+		{ :host => :address, :user => :user_name, :auth => :authentication, :tls => :enable_starttls_auto }.each do |key, val|
+			if options[:via_options] && options[:via_options].has_key?(key)
+				warn depricated_message(key, val)
+				options[:via_options][val] = options[:via_options].delete(key)
 			end
 		end
+
+		if options[:content_type] && options[:content_type] =~ /html/ && !options[:html_body]
+			warn depricated_message(:content_type, :html_body)
+			options[:html_body] = options[:body]
+		end
+
+		return options
 	end
 
-	def self.build_tmail(options)
-		mail = TMail::Mail.new
-		mail.to = options[:to]
-		mail.cc = options[:cc]
-		mail.bcc = options[:bcc]
-		mail.from = options[:from] || 'pony@unknown'
-		mail.subject = options[:subject]
-		mail.message_id = options[:message_id]
-		if options[:attachments]
-			# If message has attachment, then body must be sent as a message part
-			# or it will not be interpreted correctly by client.
-			body = TMail::Mail.new
-			body.body = options[:body] || ""
-			body.content_type = options[:content_type] || "text/plain"
-			mail.parts.push body
-			(options[:attachments] || []).each do |name, body|
-				attachment = TMail::Mail.new
-				attachment.transfer_encoding = "base64"
-				attachment.body = Base64.encode64(body)
-				content_type = MIME::Types.type_for(name).to_s
-				attachment.content_type = content_type unless content_type == ""
-				attachment.set_content_disposition "attachment", "filename" => name
-				mail.parts.push attachment
+	def self.deliver(mail)
+		mail.deliver!
+	end
+
+	def self.default_delivery_method
+		File.executable?(sendmail_binary) ? :sendmail : :smtp
+	end
+
+	def self.build_mail(options)
+		mail = Mail.new do
+			to options[:to]
+			from options[:from] || 'pony@unknown'
+			cc options[:cc]
+			bcc options[:bcc]
+			subject options[:subject]
+			date options[:date] || Time.now
+			message_id options[:message_id]
+
+			if options[:html_body]
+				html_part do
+					content_type 'text/html; charset=UTF-8'
+					body options[:html_body]
+				end
+			end
+
+			# If we're using attachments, the body needs to be a separate part. If not,
+                        # we can just set the body directly.
+			if options[:body] && (options[:html_body] || options[:attachments])
+				text_part do
+					body options[:body]
+				end
+			elsif options[:body]
+				body options[:body]
+			end
+
+			delivery_method options[:via], (options.has_key?(:via_options) ? options[:via_options] : {})
+                end
+
+		(options[:attachments] || []).each do |name, body|
+			# mime-types wants to send these as "quoted-printable"
+			if name =~ /\.xlsx$/
+				mail.attachments[name] = {
+					:content => Base64.encode64(body),
+					:transfer_encoding => :base64
+				}
+			else
+				mail.attachments[name] = body
 			end
-		else
-			mail.content_type = options[:content_type] || "text/plain"
-			mail.body = options[:body] || ""
 		end
+
 		(options[:headers] ||= {}).each do |key, value|
 			mail[key] = value
 		end
-		mail.charset = options[:charset] # charset must be set after setting content_type
+
+		mail.charset = options[:charset] if options[:charset] # charset must be set after setting content_type
+
 		mail
 	end
 
@@ -68,42 +202,13 @@ module Pony
 		sendmail.empty? ? '/usr/sbin/sendmail' : sendmail
 	end
 
-	def self.transport(tmail)
-		if File.executable? sendmail_binary
-			transport_via_sendmail(tmail)
-		else
-			transport_via_smtp(tmail)
-		end
-	end
-
-	def self.via_options
-		%w(sendmail smtp)
-	end
-
-	def self.transport_via_sendmail(tmail, options={})
-		IO.popen('-', 'w+') do |pipe|
-			if pipe
-				pipe.write(tmail.to_s)
-			else
-				exec(sendmail_binary, "-t")
-			end
-		end
+	def self.via_possibilities
+		%w(sendmail smtp).map{ |x| x.to_sym }
 	end
 
-	def self.transport_via_smtp(tmail, options={:smtp => {}})
-		default_options = {:smtp => { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }}
-		o = default_options[:smtp].merge(options[:smtp])
-		smtp = Net::SMTP.new(o[:host], o[:port])
-		if o[:tls]
-			raise "You may need: gem install smtp_tls" unless smtp.respond_to?(:enable_starttls)
-			smtp.enable_starttls
-		end
-		if o.include?(:auth)
-			smtp.start(o[:domain], o[:user], o[:password], o[:auth])
-		else
-			smtp.start(o[:domain])
-		end
-		smtp.send_message tmail.to_s, tmail.from, tmail.destinations
-		smtp.finish
+	def self.depricated_message(method, alternative)
+		warning_message = "warning: '#{method}' is deprecated"
+		warning_message += "; use '#{alternative}' instead." if alternative
+		return warning_message
 	end
 end

data/pony.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = %q{pony}
-	s.version = "0.9.1"
+	s.version = "1.0"
 
 	s.description = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 	s.summary = s.description
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
 	s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
 	s.require_paths = ["lib"]
 	s.rubygems_version = %q{1.3.1}
-	s.add_dependency( 'tmail', '~> 1.0' )
-	s.add_dependency('mime-types', '>= 1.16')
+        s.add_dependency( 'mail', '>2.0')
 	s.platform = Gem::Platform::RUBY
 end

data/spec/pony_spec.rb

@@ -1,220 +1,192 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/base'
 
 describe Pony do
+
+	before(:each) do
+		Pony.stub!(:deliver)
+	end
+
 	it "sends mail" do
-		Pony.should_receive(:transport) do |tmail|
-			tmail.to.should == [ 'joe@example.com' ]
-			tmail.from.should == [ 'sender@example.com' ]
-			tmail.subject.should == 'hi'
-			tmail.body.should == 'Hello, Joe.'
+		Pony.should_receive(:deliver) do |mail|
+			mail.to.should == [ 'joe@example.com' ]
+			mail.from.should == [ 'sender@example.com' ]
+			mail.subject.should == 'hi'
+			mail.body.should == 'Hello, Joe.'
 		end
 		Pony.mail(:to => 'joe@example.com', :from => 'sender@example.com', :subject => 'hi', :body => 'Hello, Joe.')
 	end
 
 	it "requires :to param" do
-		Pony.stub!(:transport)
 		lambda { Pony.mail({}) }.should raise_error(ArgumentError)
 	end
 
 	it "doesn't require any other param" do
-		Pony.stub!(:transport)
 		lambda { Pony.mail(:to => 'joe@example.com') }.should_not raise_error
 	end
 
+	it "should handle depricated options gracefully" do
+		Pony.should_receive(:build_mail).with(hash_including(:via_options => {:address => 'test'}))
+		Pony.mail(:to => 'foo@bar', :smtp => { :host => 'test' })
+	end
+
+	it "should handle depricated content-type gracefully" do
+		Pony.should_receive(:build_mail).with(hash_including(:html_body => "this is <h1>HTML</h1>"))
+		Pony.mail(:to => 'foo@bar', :content_type => 'text/html', :body => 'this is <h1>HTML</h1>')
+	end
 	####################
 
-	describe "builds a TMail object with field:" do
+	describe "builds a Mail object with field:" do
 		it "to" do
-			Pony.build_tmail(:to => 'joe@example.com').to.should == [ 'joe@example.com' ]
+			Pony.build_mail(:to => 'joe@example.com').to.should == [ 'joe@example.com' ]
 		end
 		
 		it "to with multiple recipients" do
-			Pony.build_tmail(:to => 'joe@example.com, friedrich@example.com').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
+			Pony.build_mail(:to => 'joe@example.com, friedrich@example.com').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 		
 		it "to with multiple recipients and names" do
-			Pony.build_tmail(:to => 'joe@example.com, "Friedrich Hayek" <friedrich@example.com>').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
+			Pony.build_mail(:to => 'joe@example.com, "Friedrich Hayek" <friedrich@example.com>').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 		
 		it "to with multiple recipients and names in an array" do
-			Pony.build_tmail(:to => ['joe@example.com', '"Friedrich Hayek" <friedrich@example.com>']).to.should == [ 'joe@example.com', 'friedrich@example.com' ]
+			Pony.build_mail(:to => ['joe@example.com', '"Friedrich Hayek" <friedrich@example.com>']).to.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 
 		it "cc" do
-			Pony.build_tmail(:cc => 'joe@example.com').cc.should == [ 'joe@example.com' ]
+			Pony.build_mail(:cc => 'joe@example.com').cc.should == [ 'joe@example.com' ]
 		end
 		
 		it "cc with multiple recipients" do
-			Pony.build_tmail(:cc => 'joe@example.com, friedrich@example.com').cc.should == [ 'joe@example.com', 'friedrich@example.com' ]
+			Pony.build_mail(:cc => 'joe@example.com, friedrich@example.com').cc.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 
 		it "from" do
-			Pony.build_tmail(:from => 'joe@example.com').from.should == [ 'joe@example.com' ]
+			Pony.build_mail(:from => 'joe@example.com').from.should == [ 'joe@example.com' ]
 		end
 
 		it "bcc" do
-			Pony.build_tmail(:bcc => 'joe@example.com').bcc.should == [ 'joe@example.com' ]
+			Pony.build_mail(:bcc => 'joe@example.com').bcc.should == [ 'joe@example.com' ]
 		end
 
 		it "bcc with multiple recipients" do
-			Pony.build_tmail(:bcc => 'joe@example.com, friedrich@example.com').bcc.should == [ 'joe@example.com', 'friedrich@example.com' ]
+			Pony.build_mail(:bcc => 'joe@example.com, friedrich@example.com').bcc.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 
 		it "charset" do
-			Pony.build_tmail(:charset => 'UTF-8').charset.should == 'UTF-8'
+			mail = Pony.build_mail(:charset => 'UTF-8')
+			mail.charset.should == 'UTF-8'
 		end
 
 		it "default charset" do
-			Pony.build_tmail(:body => 'body').charset.should == nil
-			Pony.build_tmail(:body => 'body', :content_type => 'text/html').charset.should == nil
+			Pony.build_mail(:body => 'body').charset.should == 'UTF-8'
+			Pony.build_mail(:body => 'body', :content_type => 'text/html').charset.should == 'UTF-8'
 		end
 
 		it "from (default)" do
-			Pony.build_tmail({}).from.should == [ 'pony@unknown' ]
+			Pony.build_mail({}).from.should == [ 'pony@unknown' ]
 		end
 
 		it "subject" do
-			Pony.build_tmail(:subject => 'hello').subject.should == 'hello'
+			Pony.build_mail(:subject => 'hello').subject.should == 'hello'
 		end
 
 		it "body" do
-			Pony.build_tmail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
+			Pony.build_mail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
 		end
 
-		it "content_type" do
-			Pony.build_tmail(:content_type => 'text/html').content_type.should == 'text/html'
+		it "html_body" do
+			Pony.build_mail(:html_body => 'What do you know, Joe?').parts.first.body.should == 'What do you know, Joe?'
+			Pony.build_mail(:html_body => 'What do you know, Joe?').parts.first.content_type.should == 'text/html; charset=UTF-8'
+		end
+
+		it "date" do
+			now = Time.now
+			Pony.build_mail(:date => now).date.should == DateTime.parse(now.to_s)
+		end
+
+		it "content_type of html should set html_body" do
+			Pony.should_receive(:build_mail).with(hash_including(:html_body => '<h1>test</h1>'))
+			Pony.mail(:to => 'foo@bar', :content_type => 'text/html', :body => '<h1>test</h1>')
 		end
 
 		it "message_id" do
-			Pony.build_tmail(:message_id => '<abc@def.com>').message_id.should == '<abc@def.com>'
+			Pony.build_mail(:message_id => '<abc@def.com>').message_id.should == 'abc@def.com'
 		end
 
 		it "custom headers" do
-			Pony.build_tmail(:headers => {"List-ID" => "<abc@def.com>"})['List-ID'].to_s.should == '<abc@def.com>'
+			Pony.build_mail(:headers => {"List-ID" => "<abc@def.com>"})['List-ID'].to_s.should == '<abc@def.com>'
 		end
 
-		it "attachments" do
-			tmail = Pony.build_tmail(:attachments => {"foo.txt" => "content of foo.txt"})
-			tmail.should have(2).parts
-			tmail.parts.first.to_s.should == "Content-Type: text/plain\n\n"
-			tmail.parts.last.to_s.should == <<-PART
-Content-Type: text/plain
-Content-Transfer-Encoding: Base64
-Content-Disposition: attachment; filename=foo.txt
+		it "utf-8 encoded subject line" do
+			mail = Pony.build_mail(:to => 'btp@foo', :subject => 'Café', :body => 'body body body')
+			mail['subject'].encoded.should =~ /^Subject: =\?UTF-8/;
+		end
 
-Y29udGVudCBvZiBmb28udHh0
-			 PART
+		it "attachments" do
+			mail = Pony.build_mail(:attachments => {"foo.txt" => "content of foo.txt"}, :body => 'test')
+			mail.parts.length.should == 2
+			mail.parts.first.to_s.should =~ /Content-Type: text\/plain/
 		end
 
 		it "suggests mime-type" do
-			tmail = Pony.build_tmail(:attachments => {"foo.pdf" => "content of foo.pdf"})
-			tmail.should have(2).parts
-			tmail.parts.first.to_s.should == "Content-Type: text/plain\n\n"
-			tmail.parts.last.to_s.should == <<-PART
-Content-Type: application/pdf
-Content-Transfer-Encoding: Base64
-Content-Disposition: attachment; filename=foo.pdf
+			mail = Pony.build_mail(:attachments => {"foo.pdf" => "content of foo.pdf"})
+			mail.parts.length.should == 1
+			mail.parts.first.to_s.should =~ /Content-Type: application\/pdf/
+			mail.parts.first.to_s.should =~ /filename=foo.pdf/
+			mail.parts.first.content_transfer_encoding.to_s.should == 'base64'
+		end
 
-Y29udGVudCBvZiBmb28ucGRm
-			 PART
+		it "encodes xlsx files as base64" do
+			mail = Pony.build_mail(:attachments => {"foo.xlsx" => "content of foo.xlsx"})
+			mail.parts.length.should == 1
+			mail.parts.first.to_s.should =~ /Content-Type: application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/
+			mail.parts.first.to_s.should =~ /filename=foo.xlsx/
+			mail.parts.first.content_transfer_encoding.to_s.should == 'base64'
 		end
-	end
 
-	describe "transport" do
-		it "transports via the sendmail binary if it exists" do
-			File.stub!(:executable?).and_return(true)
-			Pony.should_receive(:transport_via_sendmail).with(:tmail)
-			Pony.transport(:tmail)
+		it "passes cc and bcc as the list of recipients" do
+			mail = Pony.build_mail(:to => ['to'], :cc => ['cc'], :from => ['from'], :bcc => ['bcc'])
+			mail.destinations.should ==  ['to', 'cc', 'bcc']
 		end
+	end
 
+	describe "transport" do
 		it "transports via smtp if no sendmail binary" do
 			Pony.stub!(:sendmail_binary).and_return('/does/not/exist')
-			Pony.should_receive(:transport_via_smtp).with(:tmail)
-			Pony.transport(:tmail)
+			Pony.should_receive(:build_mail).with(hash_including(:via => :smtp))
+			Pony.mail(:to => 'foo@bar')
 		end
 
-		it "transports mail via /usr/sbin/sendmail binary" do
-			pipe = mock('sendmail pipe')
-			IO.should_receive(:popen).with('-',"w+").and_yield(pipe)
-			pipe.should_receive(:write).with('message')
-			Pony.transport_via_sendmail(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message'))
+		it "defaults to sendmail if no via is specified and sendmail exists" do
+			File.stub!(:executable?).and_return(true)
+			Pony.should_receive(:build_mail).with(hash_including(:via => :sendmail))
+			Pony.mail(:to => 'foo@bar')
 		end
 
 		describe "SMTP transport" do
-			before do
-				@smtp = mock('net::smtp object')
-				@smtp.stub!(:start)
-				@smtp.stub!(:send_message)
-				@smtp.stub!(:finish)
-				Net::SMTP.stub!(:new).and_return(@smtp)
-			end
-
-			it "passes cc and bcc as the list of recipients" do
-				@smtp.should_receive(:send_message).with("message", ['from'], ['to', 'cc', 'bcc'])
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :cc => ['cc'], :from => ['from'], :to_s => 'message', :bcc => ['bcc'], :destinations => ['to', 'cc', 'bcc']))
-				@smtp.should_receive(:send_message).with("message", 'from', ['to', 'cc'])
-				Pony.transport_via_smtp(mock('tmail', :to => 'to', :cc => 'cc', :from => 'from', :to_s => 'message', :bcc => nil, :destinations => ['to', 'cc']))
-			end
-
-			it "only pass cc as the list of recipients" do
-				@smtp.should_receive(:send_message).with("message", ['from'], ['to', 'cc' ])
-					Pony.transport_via_smtp(mock('tmail', :to => ['to'], :cc => ['cc'], :from => ['from'], :to_s => 'message', :bcc => nil, :destinations => ['to', 'cc']))
-			end
-
-			it "only pass bcc as the list of recipients" do
-				@smtp.should_receive(:send_message).with("message", ['from'], ['to', 'bcc' ])
-					Pony.transport_via_smtp(mock('tmail', :to => ['to'], :cc => nil, :from => ['from'], :to_s => 'message', :bcc => ['bcc'], :destinations => ['to', 'bcc']))
-			end
-
-			it "passes cc and bcc as the list of recipients when there are a few of them" do
-				@smtp.should_receive(:send_message).with("message", ['from'], ['to', 'to2', 'cc', 'bcc', 'bcc2', 'bcc3'])
-					Pony.transport_via_smtp(mock('tmail', :to => ['to', 'to2'], :cc => ['cc'], :from => ['from'], :to_s => 'message', :bcc => ['bcc', 'bcc2', 'bcc3'], :destinations => ['to', 'to2', 'cc', 'bcc', 'bcc2', 'bcc3']))
-			end
 
 			it "defaults to localhost as the SMTP server" do
-				Net::SMTP.should_receive(:new).with('localhost', '25').and_return(@smtp)
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']))
-			end
-
-			it "uses SMTP authorization when auth key is provided" do
-				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain'}}
-				@smtp.should_receive(:start).with('localhost.localdomain', 'user', 'password', 'plain')
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']), o)
+				mail = Pony.build_mail(:to => "foo@bar", :enable_starttls_auto => true, :via => :smtp)
+				mail.delivery_method.settings[:address].should == 'localhost'
 			end
 
 			it "enable starttls when tls option is true" do
-				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain', :tls => true}}
-				@smtp.should_receive(:enable_starttls)
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']), o)
+				mail = Pony.build_mail(:to => "foo@bar", :enable_starttls_auto => true, :via => :smtp)
+				mail.delivery_method.settings[:enable_starttls_auto].should == true
 			end
-
-			it "starts the job" do
-				@smtp.should_receive(:start)
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']))
-			end
-
-			it "sends a tmail message" do
-				@smtp.should_receive(:send_message)
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']))
-			end
-
-			it "finishes the job" do
-				@smtp.should_receive(:finish)
-				Pony.transport_via_smtp(mock('tmail', :to => ['to'], :from => ['from'], :to_s => 'message', :cc => nil, :bcc => nil, :destinations => ['to']))
-			end
-
 		end
 	end
 
 	describe ":via option should over-ride the default transport mechanism" do
 		it "should send via sendmail if :via => sendmail" do
-			Pony.should_receive(:transport_via_sendmail)
-			Pony.mail(:to => 'joe@example.com', :via => :sendmail)
+			mail = Pony.build_mail(:to => 'joe@example.com', :via => :sendmail)
+			mail.delivery_method.kind_of?(Mail::Sendmail).should == true
 		end
 
 		it "should send via smtp if :via => smtp" do
-			Pony.should_receive(:transport_via_smtp)
-			Pony.mail(:to => 'joe@example.com', :via => :smtp)
+			mail = Pony.build_mail(:to => 'joe@example.com', :via => :smtp)
+			mail.delivery_method.kind_of?(Mail::SMTP).should == true
 		end
 
 		it "should raise an error if via is neither smtp nor sendmail" do
@@ -222,6 +194,13 @@ Y29udGVudCBvZiBmb28ucGRm
 		end
 	end
 
+	describe "via_possibilities" do
+		it "should contain smtp and sendmail" do
+			Pony.via_possibilities.should == [:sendmail, :smtp]
+		end
+	end
+
+
 	describe "sendmail binary location" do
 		it "should default to /usr/sbin/sendmail if not in path" do
 			Pony.stub!(:'`').and_return('')

metadata

@@ -3,10 +3,9 @@ name: pony
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 9
   - 1
-  version: 0.9.1
+  - 0
+  version: "1.0"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -15,35 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: tmail
+  name: mail
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 2
         - 0
-        version: "1.0"
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  type: :runtime
-  version_requirements: *id002
 description: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 email: ben.prew@gmail.com
 executables: []
@@ -57,8 +43,8 @@ files:
 - Rakefile
 - pony.gemspec
 - lib/pony.rb
-- spec/base.rb
 - spec/pony_spec.rb
+- spec/base.rb
 has_rdoc: true
 homepage: http://github.com/benprew/pony
 licenses: []