remailer 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/remailer/connection.rb

@@ -221,6 +221,31 @@ class Remailer::Connection < EventMachine::Connection
       after_ready
     end
   end
+
+  # Tests the validity of an email address through the connection at the
+  # earliest opportunity. A callback block can be supplied that will be
+  # executed when the address has been tested, an unexpected result occurred,
+  # or the request timed out.
+  def test_email(from, to, &block)
+    if (block_given?)
+      self.class.warn_about_arguments(block, 1..2)
+    end
+    
+    message = {
+      :from => from,
+      :to => to,
+      :test => true,
+      :callback => block
+    }
+    
+    @messages << message
+    
+    # If the connection is ready to send...
+    if (@interpreter and @interpreter.state == :ready)
+      # ...send the message right away.
+      after_ready
+    end
+  end
   
   # Reassigns the timeout which is specified in seconds. Values equal to
   # or less than zero are ignored and a default is used instead.

data/lib/remailer/connection/smtp_interpreter.rb

@@ -37,16 +37,23 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
   end
   
   state :initialized do
-    interpret(220) do |message|
+    interpret(220) do |message, continues|
       message_parts = message.split(/\s+/)
       delegate.remote = message_parts.first
       
       if (message_parts.include?('ESMTP'))
         delegate.protocol = :esmtp
-        enter_state(:ehlo)
       else
         delegate.protocol = :smtp
-        enter_state(:helo)
+      end
+
+      unless (continues)
+        case (delegate.protocol)
+        when :esmtp
+          enter_state(:ehlo)
+        else
+          enter_state(:helo)
+        end
       end
     end
     
@@ -66,7 +73,11 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     end
 
     interpret(250) do
-      enter_state(:established)
+      if (delegate.requires_authentication?)
+        enter_state(:auth)
+      else
+        enter_state(:established)
+      end
     end
   end
   
@@ -181,6 +192,22 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     interpret(250) do
       enter_state(:rcpt_to)
     end
+    
+    interpret(503) do |message, continues|
+      if (message.match(/5\.5\.1/))
+        enter_state(:re_helo)
+      end
+    end
+  end
+  
+  state :re_helo do
+    enter do
+      delegate.send_line("HELO #{delegate.hostname}")
+    end
+    
+    interpret(250) do
+      enter_state(:mail_from)
+    end
   end
   
   state :rcpt_to do
@@ -194,7 +221,11 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     end
     
     interpret(250) do
-      enter_state(:data)
+      if (delegate.active_message[:test])
+        enter_state(:reset)
+      else
+        enter_state(:data)
+      end
     end
   end
   

data/lib/remailer/connection/socks5_interpreter.rb

@@ -44,13 +44,15 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
     enter do
       proxy_options = delegate.options[:proxy]
 
-      delegate.debug_notification(:proxy, "Initiating proxy connection through #{proxy_options[:host]}")
-
       socks_methods = [ ]
       
       if (proxy_options[:username])
         socks_methods << SOCKS5_METHOD[:username_password]
       end
+      
+      proxy_options[:port] ||= Remailer::Connection::SOCKS5_PORT
+
+      delegate.debug_notification(:proxy, "Initiating proxy connection through #{proxy_options[:host]}:#{proxy_options[:port]}")
 
       delegate.send_data(
         [
@@ -88,7 +90,7 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
   
   state :connect_through_proxy do
     enter do
-      delegate.debug_notification(:proxy, "Sending proxy connection request to #{delegate.options[:host]}:#{delegate.options[:port]}")
+      delegate.debug_notification(:proxy, "Sending proxy connection request to #{@destination_address.unpack('CCCC').join('.')}:#{delegate.options[:port]}")
     
       if (@destination_address)
         delegate.send_data(
@@ -170,6 +172,7 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
       message = "Proxy server returned error code #{@reply}: #{SOCKS5_REPLY[@reply]}"
       delegate.debug_notification(:error, message)
       delegate.connect_notification(false, message)
+      delegate.error_notification("SOCKS5_#{@reply}", message)
       delegate.close_connection
     end
     

data/lib/remailer/interpreter/state_proxy.rb

@@ -18,7 +18,19 @@ class Remailer::Interpreter::StateProxy
   
   def interpret(response, &block)
     @options[:interpret] ||= [ ]
-    @options[:interpret] << [ response, block ]
+    
+    handler =
+      case (block.arity)
+      when 0
+        # Specifying a block with no arguments will mean that it waits until
+        # all pieces are collected before transitioning to a new state, 
+        # waiting until the continue flag is false.
+        Proc.new { |m,c| instance_exec(&block) unless (c) }
+      else
+        block
+      end
+    
+    @options[:interpret] << [ response, handler ]
   end
   
   def default(&block)

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2011-03-27}
+  s.date = %q{2011-05-13}
   s.description = %q{EventMachine SMTP Mail User Agent}
   s.email = %q{scott@twg.ca}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/twg/remailer}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.6.0}
   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.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Scott Tadman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -06:00
+date: 2011-05-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Reactor-Ready SMTP Mailer