pony 0.2 → 0.3

data/Rakefile

@@ -29,7 +29,7 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-version = "0.2"
+version = "0.3"
 name = "pony"
 
 spec = Gem::Specification.new do |s|

data/lib/pony.rb

@@ -15,7 +15,7 @@ module Pony
 			transport build_tmail(options)
 		else
 			if via_options.include?(via.to_s)
-				send("transport_via_#{via}", build_tmail(options))
+				send("transport_via_#{via}", build_tmail(options), options)
 			else
 				raise(ArgumentError, ":via must be either smtp or sendmail")
 			end
@@ -47,19 +47,26 @@ module Pony
 		%w(sendmail smtp)
 	end
 
-	def self.transport_via_sendmail(tmail)
-		IO.popen('-') do |pipe|
+	def self.transport_via_sendmail(tmail, options={})
+		IO.popen('-', 'w+') do |pipe|
 			if pipe
 				pipe.write(tmail.to_s)
 			else
-				exec(sendmail_binary, tmail.to)
+				exec(sendmail_binary, *tmail.to)
 			end
 		end
 	end
 
-	def self.transport_via_smtp(tmail)
-		Net::SMTP.start('localhost') do |smtp|
-			smtp.sendmail(tmail.to_s, tmail.from, tmail.to)
+	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.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.to
+		smtp.finish
 	end
 end

data/spec/pony_spec.rb

@@ -60,19 +60,49 @@ describe Pony do
 
 		it "transports mail via /usr/sbin/sendmail binary" do
 			pipe = mock('sendmail pipe')
-			IO.should_receive(:popen).with('-').and_yield(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
 
-		it "transports mail via Net::SMTP connecting to localhost" do
-			smtp = mock('net::smtp object')
-			Net::SMTP.should_receive(:start).with('localhost').and_yield(smtp)
-			smtp.should_receive(:sendmail).with('message', 'from', 'to')
-			Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+		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 "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'))
+			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'), o)
+			end
+
+			it "starts the job" do
+				@smtp.should_receive(:start)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			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'))
+			end
+
+			it "finishes the job" do
+				@smtp.should_receive(:finish)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			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)
@@ -83,10 +113,10 @@ describe Pony 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
-	
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pony
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency