mailfactory 0.5.2 → 1.0.2

data/lib/mailfactory.rb

@@ -56,6 +56,8 @@ class MailFactory
 		@attachments = Array.new()
 		@attachmentboundary = generate_boundary()
 		@bodyboundary = generate_boundary()
+		@html = nil
+		@text = nil
 	end
 	
 	
@@ -82,50 +84,6 @@ class MailFactory
 	end
 	
 	
-	def to=(newto)
-		remove_header("To")
-		add_header("To", newto)
-	end
-	
-	
-	def to()
-		return(get_header("To")[0])
-	end
-	
-	
-	def from=(newfrom)
-		remove_header("From")
-		add_header("From", newfrom)
-	end
-	
-	
-	def from()
-		return(get_header("From")[0])
-	end
-	
-	
-	def subject=(newsubject)
-		remove_header("Subject")
-		add_header("Subject", newsubject)
-	end
-	
-	
-	def subject()
-		return(get_header("Subject")[0])
-	end
-	
-	
-	def cc=(newcc)
-		remove_header("CC")
-		add_header("CC", newcc)
-	end
-	
-	
-	def cc()
-		return(get_header("CC")[0])
-	end
-	
-	
 	def replyto=(newreplyto)
 		remove_header("Reply-To")
 		add_header("Reply-To", newreplyto)
@@ -156,6 +114,35 @@ class MailFactory
 	end
 	
 	
+	# implement method missing to provide helper methods for setting and getting headers.
+	# Headers with '-' characters may be set/gotten as 'x_mailer' or 'XMailer' (splitting
+	# will occur between capital letters or on '_' chracters)
+	def method_missing(methId, *args)
+		name = methId.id2name()
+		
+		# mangle the name if we have to
+		if(name =~ /_/)
+			name = name.gsub(/_/, '-')
+		elsif(name =~ /[A-Z]/)
+			name = name.gsub(/([a-zA-Z])([A-Z])/, '\1-\2')
+		end
+		
+		# determine if it sets or gets, and do the right thing
+		if(name =~ /=$/)
+			if(args.length != 1)
+				super(methId, args)
+			end
+			set_header(name[/^(.*)=$/, 1], args[0])			
+		else
+			if(args.length != 0)
+				super(methId, args)
+			end
+			headers = get_header(name)
+			return(get_header(name))
+		end
+	end
+
+	
 	# returns the value (or values) of the named header in an array
 	def get_header(header)
 		headers = Array.new()
@@ -182,10 +169,14 @@ class MailFactory
 	
 	# returns a formatted email
 	def to_s()
+		# all emails get a unique message-id
+		remove_header("Message-ID")
+		add_header("Message-ID", "<#{Time.now.to_f()}.#{Process.euid()}.#{String.new.object_id()}>")
+
 		if(get_header("Date").length == 0)
 			add_header("Date", Time.now.strftime("%a, %d %B %Y %H:%M:%S %Z"))
 		end
-		
+
 		# Add a mime header if we don't already have one and we have multiple parts
 		if(multipart?())
 			if(get_header("MIME-Version").length == 0)
@@ -257,13 +248,15 @@ class MailFactory
 			attachment[1] = type
 		end
 		
-		if(!file.respond_to?(:stat))		
+		if(file.kind_of?(String) or file.kind_of?(Pathname))		
 			# 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())
 			}
+		elsif(file.respond_to?(:read))
+			attachment[2] = Base64.b64encode(file.read())
 		else
-			attachment[2] = Base64.b64encode(file.read())			
+			raise(Exception, "file is not a supported type")
 		end
 		@attachments << attachment
 	end

data/tests/test_mailfactory.rb

@@ -1,7 +1,7 @@
 #!/usr/local/bin/ruby
 
 require 'test/unit/ui/console/testrunner'
-require '../lib/mailfactory.rb'
+require File.dirname(__FILE__) + '/../lib/mailfactory.rb'
 
 
 def get_options()
@@ -54,7 +54,7 @@ class TC_MailFactory < Test::Unit::TestCase
 			@mail.to = "test@test.com"
 		}
 		
-		assert_equal(@mail.to, "test@test.com", "to does not equal what it was set to")
+		assert_equal(@mail.to, ["test@test.com"], "to does not equal what it was set to")
 		
 		assert_nothing_raised("exception raised while setting to=") {
 			@mail.to = "test@test2.com"
@@ -76,7 +76,7 @@ class TC_MailFactory < Test::Unit::TestCase
 			@mail.from = "test@test.com"
 		}
 		
-		assert_equal(@mail.from, "test@test.com", "from does not equal what it was set to")
+		assert_equal(@mail.from, ["test@test.com"], "from does not equal what it was set to")
 
 		assert_nothing_raised("exception raised while setting from=") {
 			@mail.from = "test@test2.com"
@@ -98,7 +98,7 @@ class TC_MailFactory < Test::Unit::TestCase
 			@mail.subject = "Test Subject"
 		}
 		
-		assert_equal(@mail.subject, "Test Subject", "subject does not equal what it was set to")
+		assert_equal(@mail.subject, ["Test Subject"], "subject does not equal what it was set to")
 
 		assert_nothing_raised("exception raised while setting subject=") {
 			@mail.subject = "A Different Subject"
@@ -121,6 +121,21 @@ class TC_MailFactory < Test::Unit::TestCase
 		}
 		
 		assert_equal("some value", @mail.get_header("arbitrary")[0], "arbitrary header does not equal \"some value\"")
+
+		assert_nothing_raised("exception raised while setting arbitrary header with _") {
+			@mail.arbitrary_header = "some _ value"
+		}
+
+		assert_equal(["some _ value"], @mail.get_header("arbitrary-header"), "arbitrary header does not equal \"some _ value\"")
+		assert_equal(["some _ value"], @mail.arbitrary_header, "arbitrary header does not equal \"some _ value\"")
+
+
+		assert_nothing_raised("exception raised while setting arbitraryHeader") {
+			@mail.arbitraryHeader = "someValue"
+		}
+
+		assert_equal(["someValue"], @mail.get_header("arbitrary-header"), "arbitrary header does not equal \"someValue\"")
+		assert_equal(["someValue"], @mail.arbitraryHeader, "arbitrary header does not equal \"someValue\"")
 	end
 
 	
@@ -137,8 +152,8 @@ class TC_MailFactory < Test::Unit::TestCase
 		@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')
+		@mail.attach(File.dirname(__FILE__) + '/testfile.txt')
+		@mail.attach(File.dirname(__FILE__) + '/testsheet.xls')
 		
 		if($options['smtpserver'] != nil and $options['to'] != nil and $options['from'] != nil)
 			assert_nothing_raised() {
@@ -157,8 +172,8 @@ class TC_MailFactory < Test::Unit::TestCase
 		@mail.subject="This is a test"
 		@mail.text = "This is a test message with\na few\n\nlines."
 
-		@mail.add_attachment_as('testfile.txt', 'newname.txt')
-		@mail.add_attachment_as(File.open('testsheet.xls', 'rb'), 'newname.xls', 'application/vnd.ms-excel')
+		@mail.add_attachment_as(File.dirname(__FILE__) + '/testfile.txt', 'newname.txt')
+		@mail.add_attachment_as(File.open(File.dirname(__FILE__) + '/testsheet.xls', 'rb'), 'newname.xls', 'application/vnd.ms-excel')
 
 		if($options['smtpserver'] != nil and $options['to'] != nil and $options['from'] != nil)
 			assert_nothing_raised() {

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: mailfactory
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2005-06-16
+  version: 1.0.2
+date: 2005-09-16 00:00:00 -04:00
 summary: MailFactory is a pure-ruby MIME mail generator
 require_paths: 
   - lib
@@ -25,12 +25,14 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - David Powers
 files: 
-  - lib/mailfactory.rb
+  - "./lib/mailfactory.rb"
 test_files: 
-  - tests/test_mailfactory.rb
+  - "./tests/test_mailfactory.rb"
 rdoc_options: []
 extra_rdoc_files: []
 executables: []