remailer 0.3.6 → 0.3.8

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "remailer"
     gem.summary = %Q{Reactor-Ready SMTP Mailer}
-    gem.description = %Q{EventMachine capable SMTP engine}
+    gem.description = %Q{EventMachine SMTP Mail User Agent}
     gem.email = "scott@twg.ca"
     gem.homepage = "http://github.com/twg/remailer"
     gem.authors = [ "Scott Tadman" ]

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.8

data/lib/remailer/connection.rb

@@ -295,13 +295,18 @@ class Remailer::Connection < EventMachine::Connection
 
     @timeout_at = nil
 
-    error_notification(:timeout, "Connection timed out")
-    debug_notification(:timeout, "Connection timed out")
-    message_callback(:timeout, "Connection timed out before send could complete")
-
-    unless (@connected)
-      connect_notification(false, "Connection timed out")
+    if (@connected and @active_message)
+      message_callback(:timeout, "Response timed out before send could complete")
+      error_notification(:timeout, "Response timed out")
+      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")
       send_callback(:on_error)
+    else
+      send_callback(:on_disconnect)
     end
 
     close_connection
@@ -341,6 +346,7 @@ class Remailer::Connection < EventMachine::Connection
     debug_notification(:closed, "Connection closed")
     super
     @closed = true
+    @timeout_at = nil
   end
   alias_method :close, :close_connection
 
@@ -401,8 +407,10 @@ class Remailer::Connection < EventMachine::Connection
   end
   
   def connect_notification(code, message = nil)
+    @connected = code
+
     send_notification(:connect, code, message || self.remote)
-    send_callback(:on_connect)
+    send_callback(:on_connect) if (code)
   end
 
   def error_notification(code, message)

data/lib/remailer/connection/smtp_interpreter.rb

@@ -49,6 +49,15 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
         enter_state(:helo)
       end
     end
+    
+    interpret(421) do |message|
+      delegate.connect_notification(false, "Connection timed out")
+      delegate.debug_notification(:error, "[#{@state}] 421 #{message}")
+      delegate.error_notification(421, message)
+      delegate.send_callback(:on_error)
+
+      enter_state(:terminated)
+    end
   end
   
   state :helo do
@@ -161,7 +170,12 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
   
   state :mail_from do
     enter do
-      delegate.send_line("MAIL FROM:<#{delegate.active_message[:from]}>")
+      if (delegate.active_message)
+        delegate.send_line("MAIL FROM:<#{delegate.active_message[:from]}>")
+      else
+        delegate.message_callback(false, "Delegate has no active message")
+        enter_state(:reset)
+      end
     end
 
     interpret(250) do
@@ -171,7 +185,12 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
   
   state :rcpt_to do
     enter do
-      delegate.send_line("RCPT TO:<#{delegate.active_message[:to]}>")
+      if (delegate.active_message)
+        delegate.send_line("RCPT TO:<#{delegate.active_message[:to]}>")
+      else
+        delegate.message_callback(false, "Delegate has no active message")
+        enter_state(:reset)
+      end
     end
     
     interpret(250) do
@@ -234,7 +253,7 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
   
   state :reset do
     enter do
-      delegate.send_line("RESET")
+      delegate.send_line("RSET")
     end
     
     interpret(250) do

data/lib/remailer/interpreter.rb

@@ -59,6 +59,11 @@ class Remailer::Interpreter
     StateProxy.new(config, &block)
   end
   
+  # This is a method to convert a spec and a block into a proper parser
+  # method. If spec is specified, it should be a Fixnum, or a Regexp. A 
+  # Fixnum defines a  minimum size to process, useful for packed binary
+  # streams, and a Regexp defines a pattern that must match before the parser
+  # is engaged.
   def self.parser_for_spec(spec, &block)
     case (spec)
     when nil
@@ -100,7 +105,7 @@ class Remailer::Interpreter
     @on_error = block
   end
   
-  # Returns the currently defined parser.
+  # Returns the parser used when no state-specific parser has been defined.
   def self.default_parser
     @parser ||= lambda { |s| _s = s.dup; s.replace(''); _s }
   end
@@ -152,9 +157,10 @@ class Remailer::Interpreter
   end
   
   # Parses a given string and returns the first interpretable token, if any,
-  # or nil otherwise. The string is not modified.
-  def parse(s)
-    instance_exec(s, &parser)
+  # or nil otherwise. If an interpretable token is found, the supplied string
+  # will be modified to have that matching portion removed.
+  def parse(buffer)
+    instance_exec(buffer, &parser)
   end
   
   # Returns the parser defined for the current state, or the default parser.
@@ -184,7 +190,8 @@ class Remailer::Interpreter
   # Interprets a given object with an optional set of arguments. The actual
   # interpretation should be defined by declaring a state with an interpret
   # block defined.
-  def interpret(object, *args)
+  def interpret(*args)
+    object = args.first
     config = self.class.states[@state]
     callbacks = (config and config[:interpret])
     
@@ -194,16 +201,17 @@ class Remailer::Interpreter
       end
     
       if (matched)
+        args.shift
         instance_exec(*args, &proc)
 
         return true
       end
     end
     
-    if (trigger_callbacks(@state, :default, *([ object ] + args)))
+    if (trigger_callbacks(@state, :default, *args))
       # Handled by default
       true
-    elsif (proc = self.class.default)
+    elsif (proc = self.class.default_interpreter)
       instance_exec(*args, &proc)
     else
       if (proc = self.class.on_error_handler)

data/remailer.gemspec

@@ -1,56 +1,54 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.3.6"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2010-12-17}
-  s.description = %q{EventMachine capable SMTP engine}
+  s.date = %q{2011-01-12}
+  s.description = %q{EventMachine SMTP Mail User Agent}
   s.email = %q{scott@twg.ca}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/remailer.rb",
-     "lib/remailer/connection.rb",
-     "lib/remailer/connection/smtp_interpreter.rb",
-     "lib/remailer/connection/socks5_interpreter.rb",
-     "lib/remailer/interpreter.rb",
-     "lib/remailer/interpreter/state_proxy.rb",
-     "remailer.gemspec",
-     "test/config.example.rb",
-     "test/helper.rb",
-     "test/unit/remailer_connection_smtp_interpreter_test.rb",
-     "test/unit/remailer_connection_socks5_interpreter_test.rb",
-     "test/unit/remailer_connection_test.rb",
-     "test/unit/remailer_interpreter_state_proxy_test.rb",
-     "test/unit/remailer_interpreter_test.rb",
-     "test/unit/remailer_test.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/remailer.rb",
+    "lib/remailer/connection.rb",
+    "lib/remailer/connection/smtp_interpreter.rb",
+    "lib/remailer/connection/socks5_interpreter.rb",
+    "lib/remailer/interpreter.rb",
+    "lib/remailer/interpreter/state_proxy.rb",
+    "remailer.gemspec",
+    "test/config.example.rb",
+    "test/helper.rb",
+    "test/unit/remailer_connection_smtp_interpreter_test.rb",
+    "test/unit/remailer_connection_socks5_interpreter_test.rb",
+    "test/unit/remailer_connection_test.rb",
+    "test/unit/remailer_interpreter_state_proxy_test.rb",
+    "test/unit/remailer_interpreter_test.rb",
+    "test/unit/remailer_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/remailer}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Reactor-Ready SMTP Mailer}
   s.test_files = [
     "test/config.example.rb",
-     "test/helper.rb",
-     "test/unit/remailer_connection_smtp_interpreter_test.rb",
-     "test/unit/remailer_connection_socks5_interpreter_test.rb",
-     "test/unit/remailer_connection_test.rb",
-     "test/unit/remailer_interpreter_state_proxy_test.rb",
-     "test/unit/remailer_interpreter_test.rb",
-     "test/unit/remailer_test.rb"
+    "test/helper.rb",
+    "test/unit/remailer_connection_smtp_interpreter_test.rb",
+    "test/unit/remailer_connection_socks5_interpreter_test.rb",
+    "test/unit/remailer_connection_test.rb",
+    "test/unit/remailer_interpreter_state_proxy_test.rb",
+    "test/unit/remailer_interpreter_test.rb",
+    "test/unit/remailer_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/unit/remailer_interpreter_test.rb

@@ -22,6 +22,24 @@ class AutomaticDelegate
   end
 end
 
+class LineInterpreter < Remailer::Interpreter
+  attr_reader :lines
+  
+  state :initialized do
+    enter do
+      @lines = [ ]
+    end
+  end
+  
+  parse(/^.*?\r?\n/) do |data|
+    data.chomp
+  end
+  
+  default do |line|
+    @lines << line
+  end
+end
+
 class ExampleInterpreter < Remailer::Interpreter
   include TestTriggerHelper
 
@@ -65,7 +83,7 @@ end
 
 class RemailerInterpreterTest < Test::Unit::TestCase
   def test_default_state
-    assert_equal [ :initialized, :terminated ], Remailer::Interpreter.states_defined
+    assert_equal [ :initialized, :terminated ], Remailer::Interpreter.states_defined.collect { |s| s.to_s }.sort.collect { |s| s.to_sym }
     assert_equal true, Remailer::Interpreter.state_defined?(:initialized)
     assert_equal true, Remailer::Interpreter.state_defined?(:terminated)
     assert_equal false, Remailer::Interpreter.state_defined?(:unknown)
@@ -121,6 +139,55 @@ class RemailerInterpreterTest < Test::Unit::TestCase
     assert_equal 'Stop message', interpreter.message
     assert_equal :terminated, interpreter.state
   end
+  
+  def test_interpreter_can_process
+    interpreter = LineInterpreter.new
+
+    assert_equal [ ], interpreter.lines
+    
+    line = "EXAMPLE LINE\n"
+    
+    interpreter.process(line)
+    
+    assert_equal 'EXAMPLE LINE', interpreter.lines[-1]
+    assert_equal '', line
+    
+    line << "ANOTHER EXAMPLE LINE\r\n"
+    
+    interpreter.process(line)
+    
+    assert_equal 'ANOTHER EXAMPLE LINE', interpreter.lines[-1]
+    assert_equal '', line
+    
+    line << "LINE ONE\r\nLINE TWO\r\n"
+    
+    interpreter.process(line)
+    
+    assert_equal 'LINE ONE', interpreter.lines[-2]
+    assert_equal 'LINE TWO', interpreter.lines[-1]
+    assert_equal '', line
+    
+    line << "INCOMPLETE LINE"
+    
+    interpreter.process(line)
+
+    assert_equal 'LINE TWO', interpreter.lines[-1]
+    assert_equal "INCOMPLETE LINE", line
+    
+    line << "\r"
+    
+    interpreter.process(line)
+
+    assert_equal 'LINE TWO', interpreter.lines[-1]
+    assert_equal "INCOMPLETE LINE\r", line
+    
+    line << "\n"
+    
+    interpreter.process(line)
+
+    assert_equal 'INCOMPLETE LINE', interpreter.lines[-1]
+    assert_equal '', line
+  end
 
   def test_default_handler_for_interpreter
     interpreter = ExampleInterpreter.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Scott Tadman
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2011-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: EventMachine capable SMTP engine
+description: EventMachine SMTP Mail User Agent
 email: scott@twg.ca
 executables: []
 
@@ -28,7 +28,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION
@@ -52,8 +51,8 @@ homepage: http://github.com/twg/remailer
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,25 +0,0 @@
-*.gem
-
-config.rb
-
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC