maildiode 0.2 → 0.2.1

data/lib/engine.rb

@@ -197,7 +197,7 @@ module MailDiode
       end
       filterable_data = apply_filters(@envelope.sender, recipient)
       if !@mail_handler.valid_recipient?(filterable_data.recipient)
-        raise_smtp_error(SMTPError::UNKNOWN_RECIPIENT + filterable_data.recipient)
+        raise_smtp_error(SMTPError::UNKNOWN_RECIPIENT + ": " + recipient)
       end
       @envelope.add_recipient(recipient)
       return RESULT_OK
@@ -265,7 +265,7 @@ module MailDiode
       full_text = received + NEWLINE + text.join(NEWLINE)
 
       filterable_data = apply_filters(sender, recipient)
-      id = @mail_handler.process_message(filterable_data.recipient, full_text)
+      id = @mail_handler.process_message(recipient, filterable_data.recipient, full_text)
       return id
     end
     

data/lib/maildiode-plugins/blacklist.rb

@@ -30,7 +30,7 @@ module MailDiode
 			@blacklisted_recipients.each do | pattern |
 				re = Regexp.new(pattern, Regexp::IGNORECASE)
 				if(recipient.match(re))
-					raise MailDiode::SMTPError.new(MailDiode::SMTPError::UNKNOWN_RECIPIENT)
+					raise MailDiode::SMTPError.new(MailDiode::SMTPError::UNKNOWN_RECIPIENT + ": " + recipient)
 				end
 			end
 		end

data/lib/maildir.rb

@@ -50,12 +50,12 @@ module MailDiode
 			return get_maildir(recipient)
 		end
 		
-		def process_message(recipient, full_text)
+		def process_message(original_recipient, recipient, full_text)
 			message = DeliverableMessage.new(full_text)
 			raw_dir = get_maildir(recipient)
 			folder = ''
 			dir = "#{raw_dir.chomp('/')}#{folder}/"
-			MailDiode::log_info "Delivering to #{dir} for #{recipient}"
+			MailDiode::log_info "Delivering to #{dir} for #{original_recipient}"
 			if !File.exist?(dir)
 				MailDiode::log_error "ERROR: Missing maildir folder: #{dir}"
 				raise FolderMissingError.new(File.basename(dir))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maildiode
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kevin Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 -05:00
+date: 2009-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency