remailer 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/remailer/connection.rb

@@ -325,9 +325,23 @@ class Remailer::Connection < EventMachine::Connection
       debug_notification(:timeout, "Response timed out")
       send_callback(:on_error)
     elsif (!@connected)
-      connect_notification(false, "Timed out before a connection could be established")
-      debug_notification(:timeout, "Timed out before a connection could be established")
-      error_notification(:timeout, "Timed out before a connection could be established")
+      remote_options = @options
+      
+      case (@interpreter)
+      when Remailer::Connection::Socks5Interpreter
+        remote_options = @options[:proxy]
+      end
+      
+      message = "Timed out before a connection could be established to #{remote_options[:host]}:#{remote_options[:port]}"
+      
+      if (@interpreter)
+        message << " using #{@interpreter.label}"
+      end
+      
+      connect_notification(false, message)
+      debug_notification(:timeout, message)
+      error_notification(:timeout, message)
+
       send_callback(:on_error)
     else
       send_callback(:on_disconnect)

data/lib/remailer/connection/socks5_interpreter.rb

@@ -108,18 +108,18 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
     end
     
     parse do |s|
-      return unless (s.length >= 10)
-    
-      version, reply, reserved, address_type, address, port = s.slice!(0,10).unpack('CCCCNn')
+      if (s.length >= 10)
+        version, reply, reserved, address_type, address, port = s.slice!(0,10).unpack('CCCCNn')
       
-      [
-        reply,
-        {
-          :address => address,
-          :port => port,
-          :address_type => address_type
-        }
-      ]
+        [
+          reply,
+          {
+            :address => address,
+            :port => port,
+            :address_type => address_type
+          }
+        ]
+      end
     end
   
     interpret(0) do

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2011-03-02}
+  s.date = %q{2011-03-03}
   s.description = %q{EventMachine SMTP Mail User Agent}
   s.email = %q{scott@twg.ca}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: remailer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Scott Tadman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency