remailer 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/remailer/connection.rb

@@ -31,6 +31,7 @@ class Remailer::Connection < EventMachine::Connection
   attr_accessor :pipelining, :tls_support
   attr_accessor :timeout
   attr_accessor :options
+  attr_reader :error, :error_message
 
   # == Extensions ===========================================================
 
@@ -46,6 +47,8 @@ class Remailer::Connection < EventMachine::Connection
   # * debug => Where to send debugging output (IO or Proc)
   # * connect => Where to send a connection notification (IO or Proc)
   # * error => Where to send errors (IO or Proc)
+  # * on_connect => Called upon successful connection (Proc)
+  # * on_error => Called upon connection error (Proc)
   # A block can be supplied in which case it will stand in as the :connect
   # option. The block will recieve a first argument that is the status of
   # the connection, and an optional second that is a diagnostic message.
@@ -269,10 +272,11 @@ class Remailer::Connection < EventMachine::Connection
 
     error_notification(:timeout, "Connection timed out")
     debug_notification(:timeout, "Connection timed out")
-    send_callback(:timeout, "Connection timed out before send could complete")
+    message_callback(:timeout, "Connection timed out before send could complete")
 
     unless (@connected)
       connect_notification(false, "Connection timed out")
+      send_callback(:on_error)
     end
 
     close_connection
@@ -290,6 +294,10 @@ class Remailer::Connection < EventMachine::Connection
     !!@closed
   end
   
+  def error?
+    !!@error
+  end
+
   def start_tls
     debug_notification(:tls, "Started")
     super
@@ -332,7 +340,7 @@ class Remailer::Connection < EventMachine::Connection
   end
 
   def after_message_sent(reply_code, reply_message)
-    send_callback(reply_code, reply_message)
+    message_callback(reply_code, reply_message)
 
     @active_message = nil
   end
@@ -356,9 +364,13 @@ class Remailer::Connection < EventMachine::Connection
   
   def connect_notification(code, message = nil)
     send_notification(:connect, code, message || self.remote)
+    send_callback(:on_success)
   end
 
   def error_notification(code, message)
+    @error = code
+    @error_message = message
+
     send_notification(:error, code, message)
   end
 
@@ -366,7 +378,7 @@ class Remailer::Connection < EventMachine::Connection
     send_notification(:debug, code, message)
   end
 
-  def send_callback(reply_code, reply_message)
+  def message_callback(reply_code, reply_message)
     if (callback = (@active_message and @active_message[:callback]))
       # The callback is screened in advance when assigned to ensure that it
       # has only 1 or 2 arguments. There should be no else here.
@@ -378,4 +390,15 @@ class Remailer::Connection < EventMachine::Connection
       end
     end
   end
+  
+  def send_callback(type)
+    if (callback = @options[type])
+      case (callback.arity)
+      when 1
+        callback.call(self)
+      else
+        callback.call
+      end
+    end
+  end
 end

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2010-12-02}
+  s.date = %q{2010-12-13}
   s.description = %q{EventMachine capable SMTP engine}
   s.email = %q{scott@twg.ca}
   s.extra_rdoc_files = [

data/test/unit/remailer_connection_smtp_interpreter_test.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
 
 class SmtpDelegate
   attr_accessor :options, :active_message
+  attr_accessor :tls_support
   
   def initialize(options = { })
     @sent = [ ]
@@ -32,6 +33,10 @@ class SmtpDelegate
     !!@started_tls
   end
   
+  def tls_support?
+    !!@tls_support
+  end
+  
   def close_connection
     @closed = true
   end
@@ -250,8 +255,12 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
   def test_tls_connection_with_support
     delegate = SmtpDelegate.new(:use_tls => true)
     interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    
+    assert_equal true, delegate.use_tls?
+    assert_equal :initialized, interpreter.state
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
+    assert_equal :ehlo, interpreter.state
     assert_equal 'EHLO localhost.local', delegate.read
     
     interpreter.process("250-mail.example.com Hello\r\n")
@@ -262,6 +271,8 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     interpreter.process("250-STARTTLS\r\n")
     interpreter.process("250 HELP\r\n")
     
+    assert_equal true, delegate.tls_support?
+    
     assert_equal :starttls, interpreter.state
     assert_equal 'STARTTLS', delegate.read
     assert_equal false, delegate.started_tls?

data/test/unit/remailer_connection_test.rb

@@ -40,6 +40,8 @@ class RemailerConnectionTest < Test::Unit::TestCase
   def test_failed_connect_no_service
     engine do
       error_received = nil
+      on_error = false
+      on_connect = false
 
       connection = Remailer::Connection.open(
         'example.com',
@@ -47,6 +49,8 @@ class RemailerConnectionTest < Test::Unit::TestCase
         :error => lambda { |code, message|
           error_received = [ code, message ]
         },
+        :on_connect => lambda { on_connect = true },
+        :on_error => lambda { on_error = true },
         :timeout => 1
       )
 
@@ -55,6 +59,10 @@ class RemailerConnectionTest < Test::Unit::TestCase
       end
 
       assert_equal :timeout, error_received[0]
+      assert_equal :timeout, connection.error
+
+      assert_equal false, on_connect
+      assert_equal true, on_error
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Scott Tadman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -05:00
+date: 2010-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: []