rhizmail 0.1.3 → 0.1.4

data/lib/rhizmail.rb

@@ -48,7 +48,7 @@ require 'net/smtp'
 require 'text/format'
 
 module RhizMail
-	Version = '0.1.3'
+	Version = '0.1.4'
 	
 	# Sets RhizMail to run using mocks for use in testing. Calling
 	# <tt>RhizMail.mock = true</tt> sets the Mailer to use MockMailer instead.
@@ -120,24 +120,19 @@ module RhizMail
 		end
 	
 		# Sends an email message. +email+ needs to respond to +verify_sendable+;
-		# Mailer##send_email will call +verify_sendable+ before sending the email.
-		def send_email(email)
+		# Mailer##send_message will call +verify_sendable+ before sending the email.
+		def send_message(email)
 			email.verify_sendable
 			msg = []
 			email.headers.each { |header| msg << "#{header}\n" }
 			msg << "\n"
 			msg << email.body
-			begin
-				@@smtpClass.start(
-					@@smtpServer, @@smtpLogin, @@smtpPassword, @@smtpAuthType
-				) { |smtp|
-					smtp.sendmail(msg, email.from_address, [ email.to_address ])
-				}
-				@@messagesSent << email
-			rescue Net::ProtoFatalError, TimeoutError, Errno::ECONNREFUSED,
-					Errno::ECONNRESET
-				# whatever
+			@@smtpClass.start(
+				@@smtpServer, @@smtpLogin, @@smtpPassword, @@smtpAuthType
+			) do |smtp|
+				smtp.sendmail( msg, email.from_address, [ email.to_address ] )
 			end
+			@@messagesSent << email
 		end
 	
 		# Returns an array of what messages have been sent.
@@ -183,7 +178,7 @@ module RhizMail
 		end
 	
 		# Sends the email.
-		def deliver; Mailer.get_mailer.send_email( self ); end
+		def deliver; Mailer.get_mailer.send_message( self ); end
 		
 		def from_header # :nodoc:
 			fromHeader = "From: "
@@ -260,7 +255,7 @@ module RhizMail
 		
 		# Pretends to send an email, recording it in +messages_sent+ to allow
 		# inspection later.
-		def send_email(email)
+		def send_message(email)
 			email.verify_sendable
 			@messages_sent << email
 		end

data/lib/rhizmail.rb~

@@ -30,6 +30,10 @@
 # RhizMail comes with a SimpleTemplateMessage class, suited for times when you 
 # want email templating that is simpler than Amrita or ERB.
 #
+# == Contributors
+#
+# Brian Takita added SMTP authentication for 0.1.3.
+#
 # == Dependencies
 #
 # RhizMail depends on three external libraries:
@@ -44,7 +48,17 @@ require 'net/smtp'
 require 'text/format'
 
 module RhizMail
-	Version = '0.1.2'
+	Version = '0.1.3'
+	
+	# Sets RhizMail to run using mocks for use in testing. Calling
+	# <tt>RhizMail.mock = true</tt> sets the Mailer to use MockMailer instead.
+	def self.mock=( maybe_mock )
+		if maybe_mock and Mailer.get_mailer.is_a?( Mailer )
+			Mailer.set_mailer MockMailer.new
+		elsif !maybe_mock and Mailer.get_mailer.is_a?( MockMailer )
+			ContextualService::Context.instance.set_resource( Mailer, nil )
+		end
+	end
 
 	# Returns a boolean value describing whether <tt>address</tt> is a plausible 
 	# email address format.
@@ -61,7 +75,42 @@ module RhizMail
 	class Mailer < ContextualService::Service
 		@@smtpServer = 'localhost'
 		@@smtpClass = Net::SMTP
+		@@smtpLogin = nil
+		@@smtpPassword = nil
+		@@smtpAuthType = nil
 		@@messagesSent = []
+		
+		def self.smtp_server
+			@@smtpServer
+		end
+		
+		def self.smtp_server=(smtpServer)
+			@@smtpServer = smtpServer
+		end
+		
+		def self.smtp_login
+			@@smtpLogin
+		end
+		
+		def self.smtp_login=(smtpLogin)
+			@@smtpLogin = smtpLogin
+		end
+		
+		def self.smtp_password
+			@@smtpPassword
+		end
+		
+		def self.smtp_password=(smtpPassword)
+			@@smtpPassword = smtpPassword
+		end
+		
+		def self.smtp_auth_type
+			@@smtpAuthType
+		end
+		
+		def self.smtp_auth_type=(smtpAuthType)
+			@@smtpAuthType = smtpAuthType
+		end
 	
 		# Flushes record of messages sent.
 		def self.flush; @@messagesSent = []; end
@@ -79,7 +128,9 @@ module RhizMail
 			msg << "\n"
 			msg << email.body
 			begin
-				@@smtpClass.start( @@smtpServer ) { |smtp|
+				@@smtpClass.start(
+					@@smtpServer, @@smtpLogin, @@smtpPassword, @@smtpAuthType
+				) { |smtp|
 					smtp.sendmail(msg, email.from_address, [ email.to_address ])
 				}
 				@@messagesSent << email
@@ -137,7 +188,7 @@ module RhizMail
 		def from_header # :nodoc:
 			fromHeader = "From: "
 			if @from_name
-				fromHeader += "#{@from_name} <#{@from_address}>"
+				fromHeader += "\"#{@from_name}\" <#{@from_address}>"
 			else
 				fromHeader += "#{@from_address}"
 			end
@@ -164,9 +215,9 @@ module RhizMail
 		def to_header # :nodoc:
 			toHeader = "To: "
 			if @to_name
-				toHeader += " #{@to_name} <#{@to_address}>"
+				toHeader += "\"#{@to_name}\" <#{@to_address}>"
 			else
-				toHeader += " #{@to_address}"
+				toHeader += "#{@to_address}"
 			end
 			toHeader
 		end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: rhizmail
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2005-10-26
+  version: 0.1.4
+date: 2005-12-28
 summary: RhizMail is a test-friendly library for sending out customized emails.
 require_paths: 
   - lib