mailfactory 0.5.0 → 0.5.1

data/lib/mailfactory.rb

@@ -126,6 +126,17 @@ class MailFactory
 	end
 	
 	
+	def replyto=(newreplyto)
+		remove_header("Reply-To")
+		add_header("Reply-To", newreplyto)
+	end
+	
+	
+	def replyto()
+		return(get_header("Reply-To")[0])
+	end
+	
+	
 	# sets the plain text body of the message
 	def text=(newtext)
 		@text = newtext
@@ -220,8 +231,14 @@ class MailFactory
 	def add_attachment(filename, type=nil)
 		attachment = Array.new()
 		attachment[0] = Pathname.new(filename).basename
-		attachment[1] = MIME::Types.type_for(filename).to_s
-		File.open(filename, File::RDONLY) { |fp|
+		if(type == nil)
+			attachment[1] = MIME::Types.type_for(filename).to_s
+		else
+			attachment[1] = type
+		end	
+		
+		# Open in rb mode to handle Windows, which mangles binary files opened in a text mode
+		File.open(filename, "rb") { |fp|
 			attachment[2] = Base64.b64encode(fp.read())
 		}
 		@attachments << attachment
@@ -230,13 +247,24 @@ class MailFactory
 	
 	# adds an attachment to the mail as emailfilename.  Type may be given as a mime type.  If it
 	# is left off and the MIME::Types module is available it will be determined automagically.
-	def add_attachment_as(filename, emailfilename, type=nil)
+	# file may be given as an IO stream (which will be read until the end) or as a filename.
+	def add_attachment_as(file, emailfilename, type=nil)
 		attachment = Array.new()
 		attachment[0] = emailfilename
-		attachment[1] = MIME::Types.type_for(filename).to_s
-		File.open(filename, File::RDONLY) { |fp|
-			attachment[2] = Base64.b64encode(fp.read())
-		}
+		if(!file.respond_to?(:stat) and type == nil)
+			attachment[1] = MIME::Types.type_for(file.to_s()).to_s
+		else
+			attachemnt[1] = type
+		end
+		
+		if(file.respond_to?(:stat))		
+			# Open in rb mode to handle Windows, which mangles binary files opened in a text mode
+			File.open(file.to_s(), "rb") { |fp|
+				attachment[2] = Base64.b64encode(fp.read())
+			}
+		else
+			attachment[2] = Base64.b64encode(file.read())			
+		end
 		@attachments << attachment
 	end
 	

data/tests/test_mailfactory.rb

@@ -1,8 +1,47 @@
 #!/usr/local/bin/ruby
 
-require 'test/unit'
+require 'test/unit/ui/console/testrunner'
 require '../lib/mailfactory.rb'
 
+
+def get_options()
+	options = Hash.new()
+	
+	opts = OptionParser.new() { |opts|
+		opts.on_tail("-h", "--help", "Print this message") {
+			print(opts)
+			exit()
+		}
+
+		opts.on("-s", "--smtpserver SERVER", "SMTP server to use for remote tests") { |server|
+			options['smtpserver'] = server
+		}
+		
+		opts.on("-f", "--from ADDRESS", "address to send the mail from") { |address|
+			options['from'] = address
+		}
+		
+		opts.on("-t", "--to ADDRESS", "address to send the mail to") { |address|
+			options['to'] = address
+		}
+		
+		opts.on("-u", "--username USERNAME", "username for smtp auth (required)") { |username|
+			options['username'] = username
+		}
+		
+		opts.on("-p", "--password PASSWORD", "password for smtp auth (required)") { |password|
+			options['password'] = password
+		}
+				
+	}
+	
+	opts.parse(ARGV)
+	
+	return(options)
+end
+
+
+
 class TC_MailFactory < Test::Unit::TestCase
 
 	def setup()
@@ -30,6 +69,7 @@ class TC_MailFactory < Test::Unit::TestCase
 		}
 		assert_equal(1, count, "Count of To: headers expected to be 1, but was #{count}")
 	end
+	
 
 	def test_set_from
 		assert_nothing_raised("exception raised while setting from=") {
@@ -52,6 +92,7 @@ class TC_MailFactory < Test::Unit::TestCase
 		assert_equal(1, count, "Count of From: headers expected to be 1, but was #{count}")
 	end
 
+
 	def test_set_subject
 		assert_nothing_raised("exception raised while setting subject=") {
 			@mail.subject = "Test Subject"
@@ -73,6 +114,7 @@ class TC_MailFactory < Test::Unit::TestCase
 		assert_equal(1, count, "Count of Subject: headers expected to be 1, but was #{count}")		
 	end
 
+
 	def test_set_header
 		assert_nothing_raised("exception raised while setting arbitrary header") {
 			@mail.set_header("arbitrary", "some value")
@@ -80,6 +122,7 @@ class TC_MailFactory < Test::Unit::TestCase
 		
 		assert_equal("some value", @mail.get_header("arbitrary")[0], "arbitrary header does not equal \"some value\"")
 	end
+
 	
 	def test_boundary_generator
 		1.upto(50) {
@@ -87,10 +130,32 @@ class TC_MailFactory < Test::Unit::TestCase
 		}
 	end
 	
+
 	def test_email
 		@mail.to="test@test.com"
 		@mail.from="test@othertest.com"
 		@mail.subject="This is a test"
 		@mail.text = "This is a test message with\na few\n\nlines."
+		
+		@mail.attach('testfile.txt')
+		@mail.attach('testsheet.xls')
+		
+		if($options['smtpserver'] != nil and $options['to'] != nil and $options['from'] != nil)
+			assert_nothing_raised() {
+				require('net/smtp')
+				Net::SMTP.start($options['smtpserver'], 25, 'mail.from.domain', $options['username'], $options['password'], :cram_md5) { |smtp|
+	              smtp.send_message(@mail.to_s(), $options['from'], $options['to'])
+	      	}
+			}
+		end
+	end
+	
+	
+	def test_attach
 	end
+	
 end
+
+
+$options = get_options()
+Test::Unit::UI::Console::TestRunner.run(TC_MailFactory)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: mailfactory
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2005-05-21
+  version: 0.5.1
+date: 2005-06-16
 summary: MailFactory is a pure-ruby MIME mail generator
 require_paths: 
   - lib
@@ -29,7 +29,6 @@ authors:
   - David Powers
 files: 
   - lib/mailfactory.rb
-  - lib/test.rb
 test_files: 
   - tests/test_mailfactory.rb
 rdoc_options: []

data/lib/test.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/ruby
-
-require 'net/smtp'
-require 'rubygems'
-require 'mailfactory'
-
-
-mail = MailFactory.new()
-mail.to = "test@test.com"
-mail.from = "sender@sender.com"
-mail.subject = "Here are some files for you!"
-mail.text = "This is what people with plain text mail readers will see"
-mail.html = "A little something <b>special</b> for people with HTML readers"
-mail.attach("/etc/fstab")
-mail.attach("/some/other/file")
-
-Net::SMTP.start('smtp1.testmailer.com', 25, 'mail.from.domain', fromaddress, password, :cram_md5) { |smtp|
-	mail.to = toaddress
-	smtp.send_message(mail.to_s(), fromaddress, toaddress)
-}
-