remailer 0.4.6 → 0.4.8

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.8

data/lib/remailer/connection.rb

@@ -131,6 +131,7 @@ class Remailer::Connection < EventMachine::Connection
     @options = options
     @hostname = @options[:hostname] || Socket.gethostname
     @timeout = @options[:timeout] || DEFAULT_TIMEOUT
+    @protocol = :smtp
 
     @messages = [ ]
   

data/lib/remailer/connection/smtp_interpreter.rb

@@ -41,10 +41,8 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
       message_parts = message.split(/\s+/)
       delegate.remote = message_parts.first
       
-      if (message_parts.include?('ESMTP'))
+      if (message.match(/\bESMTP\b/))
         delegate.protocol = :esmtp
-      else
-        delegate.protocol = :smtp
       end
 
       unless (continues)
@@ -317,4 +315,12 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
   def label
     'SMTP'
   end
+
+  def will_interpret?(proc, args)
+    # Can only interpret blocks if the last part of the message has been
+    # received. The continue flag is argument index 1. This will only apply
+    # to interpret blocks that do not receive arguments.
+  
+    (proc.arity == 0) ? !args[1] : true
+  end
 end

data/lib/remailer/connection/socks5_interpreter.rb

@@ -90,9 +90,9 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
   
   state :connect_through_proxy do
     enter do
-      delegate.debug_notification(:proxy, "Sending proxy connection request to #{@destination_address.unpack('CCCC').join('.')}:#{delegate.options[:port]}")
-    
       if (@destination_address)
+        delegate.debug_notification(:proxy, "Sending proxy connection request to #{@destination_address.unpack('CCCC').join('.')}:#{delegate.options[:port]}")
+
         delegate.send_data(
           [
             SOCKS5_VERSION,

data/lib/remailer/interpreter.rb

@@ -223,7 +223,7 @@ class Remailer::Interpreter
     object = args[0]
     config = self.class.states[@state]
     interpreters = (config and config[:interpret])
-    
+
     if (interpreters)
       match_result = nil
       
@@ -235,12 +235,12 @@ class Remailer::Interpreter
           response === object
         end
       end
-      
+    
       if (matched)
         case (matched)
         when Regexp
           match_result = match_result.to_a
-          
+        
           if (match_result.length > 1)
             match_string = match_result.shift
             args[0, 1] = match_result
@@ -252,8 +252,11 @@ class Remailer::Interpreter
         else
           args.shift
         end
-        
-        instance_exec(*args, &proc)
+      
+        # 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.
+        will_interpret?(proc, args) and instance_exec(*args, &proc)
 
         return true
       end
@@ -276,6 +279,13 @@ class Remailer::Interpreter
     end
   end
   
+  # This method is used by interpret to determine if the supplied block should
+  # be executed or not. The default behavior is to always execute but this
+  # can be modified in sub-classes.
+  def will_interpret?(proc, args)
+    true
+  end
+  
   # Returns true if an error has been generated, false otherwise. The error
   # content can be retrived by calling error.
   def error?

data/lib/remailer/interpreter/state_proxy.rb

@@ -12,40 +12,23 @@ class Remailer::Interpreter::StateProxy
   end
   
   def enter(&block)
-    @options[:enter] ||= [ ]
-    @options[:enter] << block
+    (@options[:enter] ||= [ ]) << block
   end
   
   def interpret(response, &block)
-    @options[:interpret] ||= [ ]
-    
-    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 ]
+    (@options[:interpret] ||= [ ]) << [ response, block ]
   end
   
   def default(&block)
-    @options[:default] ||= [ ]
-    @options[:default] << block
+    (@options[:default] ||= [ ]) << block
   end
 
   def leave(&block)
-    @options[:leave] ||= [ ]
-    @options[:leave] << block
+    (@options[:leave] ||= [ ]) << block
   end
   
   def terminate(&block)
-    @options[:terminate] ||= [ ]
-    @options[:terminate] << block
+    (@options[:terminate] ||= [ ]) << block
   end
 
 protected

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.4.6"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Tadman"]
-  s.date = %q{2011-05-13}
+  s.authors = [%q{Scott Tadman}]
+  s.date = %q{2011-05-15}
   s.description = %q{EventMachine SMTP Mail User Agent}
   s.email = %q{scott@twg.ca}
   s.extra_rdoc_files = [
@@ -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 = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.2}
   s.summary = %q{Reactor-Ready SMTP Mailer}
   s.test_files = [
     "test/config.example.rb",

data/test/helper.rb

@@ -8,11 +8,10 @@ require 'timeout'
 require 'thwait'
 require 'rubygems'
 
-if (Gem.available?('eventmachine'))
-  gem 'eventmachine'
+begin
   require 'eventmachine'
-else
-  raise "EventMachine gem is not installed."
+rescue => e
+  raise "EventMachine gem could not be loaded: #{e.class}: #{e}"
 end
 
 require 'remailer'

data/test/unit/remailer_connection_smtp_interpreter_test.rb

@@ -1,12 +1,13 @@
 require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
 
 class SmtpDelegate
-  attr_accessor :options, :active_message
+  attr_accessor :options, :protocol, :active_message
   attr_accessor :tls_support
   
   def initialize(options = { })
     @sent = [ ]
     @options = options
+    @protocol = :smtp
   end
   
   def hostname
@@ -251,6 +252,28 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     assert_equal :terminated, interpreter.state
     assert_equal true, delegate.closed?
   end
+  
+  def test_multi_line_hello_response
+    delegate = SmtpDelegate.new(:use_tls => true)
+    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+
+    assert_equal :initialized, interpreter.state
+    assert_equal :smtp, delegate.protocol
+
+    interpreter.process("220-mail.example.com Hello ESMTP Example Server\r\n")
+    assert_equal :initialized, interpreter.state
+    assert_equal :esmtp, delegate.protocol
+
+    interpreter.process("220-This is a long notice that is posted here\r\n")
+    assert_equal :initialized, interpreter.state
+
+    interpreter.process("220-as some servers like to have a little chat\r\n")
+    assert_equal :initialized, interpreter.state
+
+    interpreter.process("220 with you before getting down to business.\r\n")
+
+    assert_equal :ehlo, interpreter.state
+  end
 
   def test_tls_connection_with_support
     delegate = SmtpDelegate.new(:use_tls => true)
@@ -298,7 +321,33 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     assert_equal :ready, interpreter.state
   end
 
-  def test_basic_plaintext_auth_accepted
+  def test_basic_smtp_plaintext_auth_accepted
+    delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
+    interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
+    
+    assert delegate.requires_authentication?
+
+    assert_equal :initialized, interpreter.state
+
+    interpreter.process("220 mail.example.com SMTP Server 1.0\r\n")
+    assert_equal 'HELO localhost.local', delegate.read
+
+    assert_equal :helo, interpreter.state, interpreter.error
+    
+    interpreter.process("250-mail.example.com Hello\r\n")
+    interpreter.process("250 HELP\r\n")
+    
+    assert_equal false, delegate.started_tls?
+
+    assert_equal :auth, interpreter.state
+    assert_equal "AUTH PLAIN AHRlc3RlckBleGFtcGxlLmNvbQB0ZXN0ZXI=", delegate.read
+    
+    interpreter.process("235 Accepted\r\n")
+    
+    assert_equal :ready, interpreter.state
+  end
+
+  def test_basic_esmtp_plaintext_auth_accepted
     delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
     interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
 
@@ -318,7 +367,7 @@ class RemailerConnectionSmtpInterpreterTest < Test::Unit::TestCase
     assert_equal :ready, interpreter.state
   end
 
-  def test_basic_plaintext_auth_rejected
+  def test_basic_esmtp_plaintext_auth_rejected
     delegate = SmtpDelegate.new(:username => 'tester@example.com', :password => 'tester')
     interpreter = Remailer::Connection::SmtpInterpreter.new(:delegate => delegate)
 

metadata

@@ -2,7 +2,7 @@
 name: remailer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors: 
 - Scott Tadman
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -04:00
-default_executable: 
+date: 2011-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -52,7 +51,6 @@ 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: []
 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Reactor-Ready SMTP Mailer