rhizmail 0.1.4 → 0.1.5

data/lib/rhizmail.rb

@@ -48,7 +48,7 @@ require 'net/smtp'
 require 'text/format'
 
 module RhizMail
-	Version = '0.1.4'
+	Version = '0.1.5'
 	
 	# Sets RhizMail to run using mocks for use in testing. Calling
 	# <tt>RhizMail.mock = true</tt> sets the Mailer to use MockMailer instead.
@@ -62,7 +62,7 @@ module RhizMail
 
 	# Returns a boolean value describing whether <tt>address</tt> is a plausible 
 	# email address format.
-	def self.valid_address?(address); (address =~ /\w@\w*\./) != nil; end
+	def self.valid_address?(address); (address =~ /\w@\S*\./) != nil; end
 
 	# InvalidStateError is raised by SimpleTemplateMessage if you try to send it
 	# out without doing all the necessary template substitutions.

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

metadata

@@ -1,70 +1,72 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.11
 specification_version: 1
 name: rhizmail
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2005-12-28
+  version: 0.1.5
+date: 2006-02-12 00:00:00 -05:00
 summary: RhizMail is a test-friendly library for sending out customized emails.
 require_paths: 
-  - lib
+- lib
 email: sera@fhwang.net
 homepage: http://rhizmail.rubyforge.org/
 rubyforge_project: 
-description: "RhizMail is a test-friendly library for sending out customized emails. This is
-  the library we use day-to-day at http://rhizome.org, where we send out more than
-  100 customized emails a day"
+description: RhizMail is a test-friendly library for sending out customized emails. This is the library we use day-to-day at http://rhizome.org, where we send out more than 100 customized emails a day
 autorequire: rhizmail
 default_executable: 
 bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Francis Hwang
+- Francis Hwang
 files: 
-  - lib/rhizmail.rb
-  - lib/rhizmail.rb~
+- lib/rhizmail.rb
+- lib/rhizmail.rb~
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: contxtlservice
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: mockfs
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: text-format
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: contxtlservice
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mockfs
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: text-format
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: