remailer 0.4.21 → 0.5.0

data/test/unit/{remailer_connection_smtp_interpreter_test.rb → remailer_smtp_client_interpreter_test.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
 
-class SmtpDelegate
+class SMTPDelegate
   attr_accessor :options, :protocol, :active_message
   attr_accessor :tls_support
   
@@ -62,7 +62,7 @@ class SmtpDelegate
   end
 end
 
-class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
+class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   def test_split_reply
     assert_mapping(
       '250 OK' => [ 250, 'OK' ],
@@ -70,12 +70,12 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
       'OK' => nil,
       '100-Example' => [ 100, 'Example', :continued ]
     ) do |reply|
-      Remailer::Connection::SmtpInterpreter.split_reply(reply)
+      Remailer::SMTP::Client::Interpreter.split_reply(reply)
     end
   end
 
   def test_parser
-    interpreter = Remailer::Connection::SmtpInterpreter.new
+    interpreter = Remailer::SMTP::Client::Interpreter.new
     
     assert_mapping(
       "250 OK\r\n" => [ 250, 'OK' ],
@@ -91,7 +91,7 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   def test_encode_data
     sample_data = "Line 1\r\nLine 2\r\n.\r\nLine 3\r\n.Line 4\r\n"
     
-    assert_equal "Line 1\r\nLine 2\r\n..\r\nLine 3\r\n..Line 4\r\n", Remailer::Connection::SmtpInterpreter.encode_data(sample_data)
+    assert_equal "Line 1\r\nLine 2\r\n..\r\nLine 3\r\n..Line 4\r\n", Remailer::SMTP::Client::Interpreter.encode_data(sample_data)
   end
   
   def test_base64
@@ -100,7 +100,7 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
       "\x7F" => "\x7F",
       nil => ''
     ) do |example|
-      Remailer::Connection::SmtpInterpreter.base64(example).unpack('m')[0]
+      Remailer::SMTP::Client::Interpreter.base64(example).unpack('m')[0]
     end
   end
   
@@ -108,18 +108,18 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     assert_mapping(
       %w[ tester tester ] => 'AHRlc3RlcgB0ZXN0ZXI='
     ) do |username, password|
-      Remailer::Connection::SmtpInterpreter.encode_authentication(username, password)
+      Remailer::SMTP::Client::Interpreter.encode_authentication(username, password)
     end
   end
 
   def test_defaults
-    interpreter = Remailer::Connection::SmtpInterpreter.new
+    interpreter = Remailer::SMTP::Client::Interpreter.new
     
     assert_equal :initialized, interpreter.state
   end
   
   def test_delegate_default_state
-    delegate = SmtpDelegate.new
+    delegate = SMTPDelegate.new
 
     assert_equal false, delegate.closed?
     assert_equal nil, delegate.read
@@ -127,20 +127,20 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_delegate_options
-    delegate = SmtpDelegate.new(:use_tls => true)
+    delegate = SMTPDelegate.new(:use_tls => true)
 
     assert_equal true, delegate.use_tls?
     assert_equal false, delegate.requires_authentication?
 
-    delegate = SmtpDelegate.new(:username => 'test@example.com', :password => 'tester')
+    delegate = SMTPDelegate.new(:username => 'test@example.com', :password => 'tester')
 
     assert_equal false, delegate.use_tls?
     assert_equal true, delegate.requires_authentication?
   end
 
   def test_standard_smtp_connection
-    delegate = SmtpDelegate.new
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -162,8 +162,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_standard_smtp_connection_send_email
-    delegate = SmtpDelegate.new
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -217,8 +217,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
   
   def test_standard_esmtp_connection
-    delegate = SmtpDelegate.new
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -254,8 +254,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
   
   def test_multi_line_hello_response
-    delegate = SmtpDelegate.new(:use_tls => true)
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:use_tls => true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     assert_equal :initialized, interpreter.state
     assert_equal :smtp, delegate.protocol
@@ -276,8 +276,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_tls_connection_with_support
-    delegate = SmtpDelegate.new(:use_tls => true)
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:use_tls => true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
     
     assert_equal true, delegate.use_tls?
     assert_equal :initialized, interpreter.state
@@ -303,12 +303,12 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     interpreter.process("220 TLS go ahead\r\n")
     assert_equal true, delegate.started_tls?
     
-    assert_equal :ready, interpreter.state
+    assert_equal :ehlo, interpreter.state
   end
 
   def test_tls_connection_without_support
-    delegate = SmtpDelegate.new(:use_tls => true)
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:use_tls => true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -322,8 +322,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_smtp_plaintext_auth_accepted
-    delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
     
     assert delegate.requires_authentication?
 
@@ -348,8 +348,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_esmtp_plaintext_auth_accepted
-    delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -368,8 +368,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_esmtp_plaintext_auth_rejected
-    delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     interpreter.process("220 mx.google.com ESMTP\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -385,7 +385,7 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     interpreter.process("535-5.7.1 Username and Password not accepted. Learn more at\r\n")
     interpreter.process("535 5.7.1 http://mail.google.com/support/bin/answer.py?answer=14257\r\n")
     
-    assert_equal '5.7.1 Username and Password not accepted. Learn more at  http://mail.google.com/support/bin/answer.py?answer=14257', interpreter.error
+    assert_equal '5.7.1 Username and Password not accepted. Learn more at http://mail.google.com/support/bin/answer.py?answer=14257', interpreter.error
 
     assert_equal :quit, interpreter.state
     
@@ -396,8 +396,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   end
 
   def test_unexpected_response
-    delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
 
     interpreter.process("530 Go away\r\n")
     

data/test/unit/{remailer_connection_test.rb → remailer_smtp_client_test.rb}

@@ -1,12 +1,12 @@
 require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
 
-class RemailerConnectionTest < Test::Unit::TestCase
+class RemailerSMTPClientTest < Test::Unit::TestCase
   def test_connect
     engine do
       debug = { }
       connected_host = nil
 
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR, 
         :connect => lambda { |success, host| connected_host = host }
@@ -43,7 +43,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
       on_error = false
       on_connect = false
 
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         'example.com',
         :debug => STDERR,
         :error => lambda { |code, message|
@@ -70,7 +70,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
     engine do
       error_received = nil
 
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         'invalid-example-domain--x.com',
         :debug => STDERR,
         :error => lambda { |code, message|
@@ -91,9 +91,9 @@ class RemailerConnectionTest < Test::Unit::TestCase
     engine do
       debug = { }
 
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.public_smtp_server[:host],
-        :port => TestConfig.public_smtp_server[:port] || Remailer::Connection::SMTP_PORT,
+        :port => TestConfig.public_smtp_server[:port] || Remailer::SMTP::Client::SMTP_PORT,
         :debug => STDERR,
         :username => TestConfig.public_smtp_server[:username],
         :password => TestConfig.public_smtp_server[:password]
@@ -127,7 +127,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
     engine do
       debug = { }
 
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR,
         :proxy => {
@@ -162,7 +162,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
 
   def test_connect_and_send_after_start
     engine do
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR
       )
@@ -195,7 +195,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
 
   def test_connect_and_send_dotted_message
     engine do
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR
       )
@@ -220,7 +220,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
 
   def test_connect_and_send_multiple
     engine do
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR
       )
@@ -248,7 +248,7 @@ class RemailerConnectionTest < Test::Unit::TestCase
 
   def test_connect_and_long_send
     engine do
-      connection = Remailer::Connection.open(
+      connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
         :debug => STDERR
       )

data/test/unit/remailer_smtp_server_test.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+
+class RemailerSMTPServerTest < Test::Unit::TestCase
+  def test_bind
+    engine do
+      server_port = 8025
+      
+      server = Remailer::SMTP::Server.bind(nil, server_port)
+      
+      assert server
+    end
+  end
+
+  def test_connect
+    engine do
+      server_port = 8025
+
+      remote_ip = nil
+    
+      server = Remailer::SMTP::Server.bind(
+        nil,
+        server_port,
+        :on_connect => lambda { |_remote_ip| remote_ip = _remote_ip }
+      )
+    
+      assert server
+      
+      connected_host = nil
+
+      client = Remailer::SMTP::Client.open(
+        'localhost',
+        :port => server_port,
+        :debug => STDERR, 
+        :connect => lambda { |success, host| connected_host = host }
+      )
+      
+      assert_eventually(30) do
+        connected_host
+      end
+      
+      assert_equal '127.0.0.1', connected_host
+      assert_equal '127.0.0.1', remote_ip
+    end
+  end
+
+  def test_transaction
+    engine do
+      server_port = 8025
+
+      transaction = nil
+    
+      server = Remailer::SMTP::Server.bind(
+        nil,
+        server_port,
+        :on_transaction => lambda { |_transaction| transaction = _transaction }
+      )
+    
+      assert server
+      
+      connected_host = nil
+
+      client = Remailer::SMTP::Client.open(
+        'localhost',
+        :port => server_port,
+        :debug => STDERR
+      )
+      
+      sender = 'sender@example.com'.freeze
+      recipient = 'recipient@example.net'.freeze
+      data = "Subject: Re: Test Message\r\n\r\nTest message.\r\n\r\n.test\r\n.\r\n".freeze
+      
+      client.send_email(sender, recipient, data)
+      
+      assert_eventually(30) do
+        transaction
+      end
+      
+      assert_equal sender, transaction.sender
+      assert_equal [ recipient ], transaction.recipients
+      assert_equal data, transaction.data
+    end
+  end
+end

data/test/unit/{remailer_connection_socks5_interpreter_test.rb → remailer_socks5_client_interpreter_test.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
 
-class Socks5Delegate
+class SOCKS5Delegate
   attr_reader :options
   
   def initialize(options = nil)
@@ -11,7 +11,13 @@ class Socks5Delegate
   def resolve_hostname(hostname)
     record = Socket.gethostbyname(hostname)
     
-    record and record.last
+    resolved = (record and record.last)
+    
+    if (block_given?)
+      yield(resolved)
+    end
+    
+    resolved
   end
   
   def hostname
@@ -46,41 +52,42 @@ class Socks5Delegate
   end
 end
 
-class RemailerConnectionSocks5InterpreterTest < Test::Unit::TestCase
+class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
   def test_defaults
-    delegate = Socks5Delegate.new(
+    delegate = SOCKS5Delegate.new(
       :proxy => {
         :host => 'example.net'
       }
     )
-    interpreter = Remailer::Connection::Socks5Interpreter.new(:delegate => delegate)
+
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
     
-    assert_equal :connect_to_proxy, interpreter.state
+    assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
   end
   
   def test_simple_connection
-    delegate = Socks5Delegate.new(
+    delegate = SOCKS5Delegate.new(
       :host => '1.2.3.4',
       :port => 4321,
       :proxy => {
         :host => 'example.net'
       }
     )
-    interpreter = Remailer::Connection::Socks5Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
     
-    assert_equal :connect_to_proxy, interpreter.state
+    assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
     
     sent = delegate.read
     
     assert_equal 2, sent.length
     
-    assert_equal [ Remailer::Connection::Socks5Interpreter::SOCKS5_VERSION, 0 ], sent.unpack('CC')
+    assert_equal [ Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION, 0 ], sent.unpack('CC')
     
     reply = [
-      Remailer::Connection::Socks5Interpreter::SOCKS5_VERSION,
-      Remailer::Connection::Socks5Interpreter::SOCKS5_METHOD[:no_auth]
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_METHOD[:no_auth]
     ].pack('CC')
     
     interpreter.process(reply)
@@ -91,22 +98,23 @@ class RemailerConnectionSocks5InterpreterTest < Test::Unit::TestCase
     
     sent = delegate.read
 
+    assert sent, "No data received"
     assert_equal 10, sent.length
     
     assert_equal [
-      Remailer::Connection::Socks5Interpreter::SOCKS5_VERSION,
-      Remailer::Connection::Socks5Interpreter::SOCKS5_COMMAND[:connect],
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_COMMAND[:connect],
       0,
-      Remailer::Connection::Socks5Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
       [ 1, 2, 3, 4 ].pack('CCCC'),
       4321
     ], sent.unpack('CCCCA4n')
 
     interpreter.process([
-      Remailer::Connection::Socks5Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
       0, # No error
       0,
-      Remailer::Connection::Socks5Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
       [ 1, 2, 3, 4 ].pack('CCCC'),
       4321
     ].pack('CCCCA4n'))