remailer 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/lib/remailer/connection.rb

@@ -98,7 +98,7 @@ class Remailer::Connection < EventMachine::Connection
   end
 
   # Handles callbacks driven by exceptions before an instance could be created.
-  def self.report_exception(e)
+  def self.report_exception(e, options)
     case (options[:connect])
     when Proc
       options[:connect].call(false, e.to_s)
@@ -159,6 +159,7 @@ class Remailer::Connection < EventMachine::Connection
     reset_timeout!
 
     if (using_proxy?)
+      @connecting_to_proxy = true
       use_socks5_interpreter!
     else
       use_smtp_interpreter!
@@ -266,28 +267,41 @@ class Remailer::Connection < EventMachine::Connection
     @timeout = DEFAULT_TIMEOUT if (@timeout <= 0)
   end
   
+  def proxy_connection_initiated
+    @connecting_to_proxy = false
+  end
+  
   # This implements the EventMachine::Connection#completed method by
   # flagging the connection as estasblished.
   def connection_completed
-    @timeout_at = nil
+    reset_timeout!
   end
   
   # This implements the EventMachine::Connection#unbind method to capture
   # a connection closed event.
   def unbind
     return if (@unbound)
-    
-    @connected = false
-    @unbound = true
-    @interpreter = nil
 
+    @unbound = true
+    
     if (@active_message)
+      debug_notification(:disconnect, "Disconnected by remote before transaction could be completed.")
+
       if (callback = @active_message[:callback])
         callback.call(nil)
+
         @active_message = nil
       end
+    elsif (@closed)
+      debug_notification(:disconnect, "Disconnected from remote.")
+    else
+      debug_notification(:disconnect, "Disconnected by remote while connection was idle.")
     end
-    
+
+    @connected = false
+    @timeout_at = nil
+    @interpreter = nil
+
     send_callback(:on_disconnect)
   end
   
@@ -391,15 +405,15 @@ class Remailer::Connection < EventMachine::Connection
       send_callback(:on_error)
     elsif (!@connected)
       remote_options = @options
+      interpreter = @interpreter
       
-      case (@interpreter)
-      when Remailer::Connection::Socks5Interpreter
+      if (@connecting_to_proxy)
         remote_options = @options[:proxy]
       end
       
       message = "Timed out before a connection could be established to #{remote_options[:host]}:#{remote_options[:port]}"
       
-      if (interpreter = @interpreter)
+      if (interpreter)
         message << " using #{interpreter.label}"
       end
       
@@ -522,7 +536,10 @@ class Remailer::Connection < EventMachine::Connection
     @connected = code
 
     send_notification(:connect, code, message || self.remote)
-    send_callback(:on_connect) if (code)
+    
+    if (code)
+      send_callback(:on_connect)
+    end
   end
 
   def error_notification(code, message)

data/lib/remailer/connection/socks5_interpreter.rb

@@ -35,12 +35,6 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
   # == State Mapping ========================================================
 
   state :initialized do
-    enter do
-      enter_state(:connect_to_proxy)
-    end
-  end
-  
-  state :connect_to_proxy do
     enter do
       proxy_options = delegate.options[:proxy]
 
@@ -91,6 +85,8 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
   
   state :connect_through_proxy do
     enter do
+      delegate.proxy_connection_initiated
+      
       if (@destination_address)
         delegate.debug_notification(:proxy, "Sending proxy connection request to #{@destination_address.unpack('CCCC').join('.')}:#{delegate.options[:port]}")
 

data/remailer.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Scott Tadman}]
+  s.authors = ["Scott Tadman"]
   s.date = %q{2011-07-05}
   s.description = %q{EventMachine SMTP Mail User Agent}
   s.email = %q{scott@twg.ca}
@@ -37,8 +37,8 @@ Gem::Specification.new do |s|
     "test/unit/remailer_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/remailer}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Reactor-Ready SMTP Mailer}
   s.test_files = [
     "test/config.example.rb",

metadata

@@ -2,7 +2,7 @@
 name: remailer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors: 
 - Scott Tadman
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-07-05 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -51,6 +52,7 @@ files:
 - test/unit/remailer_interpreter_state_proxy_test.rb
 - test/unit/remailer_interpreter_test.rb
 - test/unit/remailer_test.rb
+has_rdoc: true
 homepage: http://github.com/twg/remailer
 licenses: []
 
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Reactor-Ready SMTP Mailer