remailer 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/remailer/abstract_connection.rb

@@ -209,6 +209,8 @@ class Remailer::AbstractConnection < EventMachine::Connection
   def unbind
     return if (@unbound)
 
+    self.cancel_timer!
+
     self.after_unbind
 
     @unbound = true
@@ -249,12 +251,6 @@ class Remailer::AbstractConnection < EventMachine::Connection
     self.set_timer!
   end
   
-  def detach
-    self.cancel_timer!
-
-    super
-  end
-  
   # Returns the current state of the active interpreter, or nil if no state
   # is assigned.
   def state
@@ -335,7 +331,7 @@ class Remailer::AbstractConnection < EventMachine::Connection
       remote_options = @options
       interpreter = @interpreter
       
-      if (@connecting_to_proxy)
+      if (self.proxy_connection_initiated?)
         remote_options = @options[:proxy]
       end
       

data/lib/remailer/smtp/client.rb

@@ -163,18 +163,6 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
       error_notification(:out_of_band, "Receiving data before a protocol has been established.")
     end
   end
-
-  def post_init
-    @timer = EventMachine.add_periodic_timer(1) do
-      check_for_timeouts!
-    end
-  end
-  
-  #
-  def detach
-    @timer.cancel
-    super
-  end
   
   # Returns the current state of the active interpreter, or nil if no state
   # is assigned.
@@ -214,62 +202,6 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
   rescue
     nil
   end
-
-  # Resets the timeout time. Returns the time at which a timeout will occur.
-  def reset_timeout!
-    @timeout_at = Time.now + @timeout
-  end
-  
-  # Returns the number of seconds remaining until a timeout will occur, or
-  # nil if no time-out is pending.
-  def time_remaning
-    @timeout_at and (@timeout_at.to_i - Time.now.to_i)
-  end
-  
-  # Checks for a timeout condition, and if one is detected, will close the
-  # connection and send appropriate callbacks.
-  def check_for_timeouts!
-    return if (!@timeout_at or Time.now < @timeout_at or @timed_out)
-
-    @timed_out = true
-    @timeout_at = nil
-
-    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)
-      remote_options = @options
-      interpreter = @interpreter
-      
-      if (self.proxy_connection_initiated?)
-        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
-      interpreter = @interpreter
-
-      if (interpreter and interpreter.respond_to?(:close))
-        interpreter.close
-      else
-        send_callback(:on_disconnect)
-      end
-    end
-
-    close_connection
-  end
   
   # Returns true if pipelining support has been detected on the connection,
   # false otherwise.

data/lib/remailer/smtp/server/interpreter.rb

@@ -1,6 +1,6 @@
 class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
   # == State Definitions ====================================================
-  
+
   default do |error|
     delegate.send_line("500 Invalid command")
   end
@@ -159,8 +159,8 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
     
     default do |line|
       # RFC5321 4.5.2 - Leading dot is removed if line has content
-      
-      @transaction.data << (line.sub(/^\./, '') + Remailer::Constants::CRLF)
+
+      @transaction.data << (line.sub(/^\./, '') << Remailer::Constants::CRLF)
     end
   end
   

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "remailer"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = "2012-03-19"
+  s.date = "2012-11-30"
   s.description = "EventMachine SMTP Mail User Agent"
   s.email = "scott@twg.ca"
   s.extra_rdoc_files = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/twg/remailer"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.24"
   s.summary = "Reactor-Ready SMTP Mailer"
 
   if s.respond_to? :specification_version then

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.expand_path(*%w[ .. lib ]), File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'timeout'
@@ -14,6 +14,8 @@ rescue => e
   raise "EventMachine gem could not be loaded: #{e.class}: #{e}"
 end
 
+puts $LOAD_PATH.inspect
+
 require 'remailer'
 
 class Proc

data/test/unit/remailer_imap_client_test.rb

@@ -31,7 +31,7 @@ class RemailerIMAPClientTest < Test::Unit::TestCase
         capabilities
       end
       
-      assert_equal %w[ IMAP4rev1 UNSELECT IDLE NAMESPACE QUOTA ID XLIST CHILDREN X-GM-EXT-1 XYZZY SASL-IR AUTH=XOAUTH ], capabilities
+      assert_equal %w[ IMAP4rev1 UNSELECT IDLE NAMESPACE QUOTA ID XLIST CHILDREN X-GM-EXT-1 XYZZY SASL-IR AUTH=XOAUTH AUTH=XOAUTH2 ], capabilities
       
       # -- LOGIN ------------------------------------------------------------
       

data/test/unit/remailer_smtp_server_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require File.expand_path('../helper', File.dirname(__FILE__))
 
 class RemailerSMTPServerTest < Test::Unit::TestCase
   def test_bind
@@ -67,9 +67,9 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
       
       sender = 'sender@example.com'.freeze
       recipient = 'recipient@example.net'.freeze
-      data = "Subject: Re: Test Message\r\n\r\nTest message.\r\n\r\n.test\r\n.\r\n".freeze
+      content = "Subject: Re: Test Message\r\n\r\nTest message.\r\n\r\n.test\r\n.\r\n".freeze
       
-      client.send_email(sender, recipient, data)
+      client.send_email(sender, recipient, content)
       
       assert_eventually(30) do
         transaction
@@ -77,7 +77,7 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
       
       assert_equal sender, transaction.sender
       assert_equal [ recipient ], transaction.recipients
-      assert_equal data, transaction.data
+      assert_equal content + Remailer::Constants::CRLF, transaction.data
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remailer
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2157010820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157010820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EventMachine SMTP Mail User Agent
 email: scott@twg.ca
 executables: []
@@ -86,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Reactor-Ready SMTP Mailer