pony 0.9 → 0.9.1

data/README.rdoc

@@ -54,6 +54,15 @@ You can attach a file or two with the :attachments option:
 
 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 Tmail
@@ -65,6 +74,8 @@ Options passed pretty much directly to Tmail
  subject
  charset
  attachments # see Attachments section above
+ headers # see Custom headers section above
+ message_id
 
 Other options
  via # :smtp or :sendmail, see Transport section above
@@ -84,8 +95,9 @@ 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, and Nickolas Means
+Patches contributed by: Mathieu Martin, Arun Thampi, Thomas Hurst,
+Stephen Celis, Othmane Benkirane, Neil Mock, Hiroshi Saito, Jesse
+Cooke, Nickolas Means, and Rick Olson
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
@@ -95,6 +107,11 @@ mailing list: ponyrb@googlegroups.com
 
 == Releases
 
+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
 

data/lib/pony.rb

@@ -35,6 +35,7 @@ module Pony
 		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.
@@ -55,6 +56,9 @@ module Pony
 			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
 	end

data/pony.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = %q{pony}
-	s.version = "0.9"
+	s.version = "0.9.1"
 
 	s.description = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 	s.summary = s.description

data/spec/pony_spec.rb

@@ -56,7 +56,7 @@ describe Pony do
 			Pony.build_tmail(:bcc => 'joe@example.com').bcc.should == [ 'joe@example.com' ]
 		end
 
-    it "bcc with multiple recipients" do
+		it "bcc with multiple recipients" do
 			Pony.build_tmail(:bcc => 'joe@example.com, friedrich@example.com').bcc.should == [ 'joe@example.com', 'friedrich@example.com' ]
 		end
 
@@ -85,6 +85,14 @@ describe Pony do
 			Pony.build_tmail(:content_type => 'text/html').content_type.should == 'text/html'
 		end
 
+		it "message_id" do
+			Pony.build_tmail(: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>'
+		end
+
 		it "attachments" do
 			tmail = Pony.build_tmail(:attachments => {"foo.txt" => "content of foo.txt"})
 			tmail.should have(2).parts
@@ -141,27 +149,27 @@ Y29udGVudCBvZiBmb28ucGRm
 				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 "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 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 "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 "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)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pony
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -10,29 +15,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 -08:00
+date: 2010-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 16
         version: "1.16"
-    version: 
+  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: []
@@ -46,9 +57,7 @@ files:
 - Rakefile
 - pony.gemspec
 - lib/pony.rb
-- lib/pony.rb.orig
 - spec/base.rb
-- spec/pony_spec.rb.orig
 - spec/pony_spec.rb
 has_rdoc: true
 homepage: http://github.com/benprew/pony
@@ -64,18 +73,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pony
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"

data/lib/pony.rb.orig

@@ -1,109 +0,0 @@
-require 'rubygems'
-require 'net/smtp'
-require 'mime/types'
-begin
-	require 'smtp_tls'
-rescue LoadError
-end
-require 'base64'
-begin
-	require 'tmail'
-rescue LoadError
-	require 'actionmailer'
-end
-
-module Pony
-	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")
-			end
-		end
-	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]
-		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
-			end
-		else
-			mail.content_type = options[:content_type] || "text/plain"
-			mail.body = options[:body] || ""
-		end
-		mail.charset = options[:charset] # charset must be set after setting content_type
-		mail
-	end
-
-	def self.sendmail_binary
-		sendmail = `which sendmail`.chomp
-		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
-	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
-<<<<<<< HEAD:lib/pony.rb
-		smtp.send_message tmail.to_s, tmail.from, tmail.destinations
-=======
-		smtp.send_message tmail.to_s, tmail.from, [ tmail.to, tmail.cc, tmail.bcc ].select { |i| i && i != '' }
->>>>>>> 1cf0f8805e7196bc7237590437191efc6badec7e:lib/pony.rb
-		smtp.finish
-	end
-end

data/spec/pony_spec.rb.orig

@@ -1,230 +0,0 @@
-require File.dirname(__FILE__) + '/base'
-
-describe Pony do
-	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.'
-		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
-
-	####################
-
-	describe "builds a TMail object with field:" do
-		it "to" do
-			Pony.build_tmail(: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' ]
-		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' ]
-		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' ]
-		end
-
-		it "cc" do
-			Pony.build_tmail(: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' ]
-		end
-
-		it "from" do
-			Pony.build_tmail(: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' ]
-		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' ]
-		end
-
-		it "charset" do
-			Pony.build_tmail(:charset => 'UTF-8').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
-		end
-
-		it "from (default)" do
-			Pony.build_tmail({}).from.should == [ 'pony@unknown' ]
-		end
-
-		it "subject" do
-			Pony.build_tmail(: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?'
-		end
-
-		it "content_type" do
-			Pony.build_tmail(:content_type => 'text/html').content_type.should == 'text/html'
-		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
-
-Y29udGVudCBvZiBmb28udHh0
-			 PART
-		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
-
-Y29udGVudCBvZiBmb28ucGRm
-			 PART
-		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)
-		end
-
-		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)
-		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'))
-		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
-<<<<<<< HEAD:spec/pony_spec.rb
-        @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', 'bcc'])
-				Pony.transport_via_smtp(mock('tmail', :to => 'to', :cc => 'cc', :from => 'from', :to_s => 'message', :bcc => '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))
->>>>>>> 1cf0f8805e7196bc7237590437191efc6badec7e:spec/pony_spec.rb
-      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)
-			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)
-			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)
-		end
-
-		it "should send via smtp if :via => smtp" do
-			Pony.should_receive(:transport_via_smtp)
-			Pony.mail(:to => 'joe@example.com', :via => :smtp)
-		end
-
-		it "should raise an error if via is neither smtp nor sendmail" do
-			lambda { Pony.mail(:to => 'joe@plumber.com', :via => :pigeon) }.should raise_error(ArgumentError)
-		end
-	end
-
-	describe "sendmail binary location" do
-		it "should default to /usr/sbin/sendmail if not in path" do
-			Pony.stub!(:'`').and_return('')
-			Pony.sendmail_binary.should == '/usr/sbin/sendmail'
-		end
-	end
-
-end