remailer 0.4.2 → 0.4.3

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "scott@twg.ca"
     gem.homepage = "http://github.com/twg/remailer"
     gem.authors = [ "Scott Tadman" ]
+    gem.add_runtime_dependency 'eventmachine'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/remailer/connection.rb

@@ -77,14 +77,38 @@ class Remailer::Connection < EventMachine::Connection
       host_port = proxy_options[:port] || SOCKS5_PORT
     end
 
-    begin
-      EventMachine.connect(host_name, host_port, self, options)
-    rescue EventMachine::ConnectionError => e
-       options[:connect].is_a?(Proc) and options[:connect].call(false, e.to_s)
-       options[:on_error].is_a?(Proc) and options[:on_error].call(e.to_s)
-       options[:debug].is_a?(Proc) and options[:debug].call(:error, e.to_s)
-       options[:error].is_a?(Proc) and options[:error].call(:connect_error, e.to_s)
+    EventMachine.connect(host_name, host_port, self, options)
+
+  rescue EventMachine::ConnectionError => e
+    case (options[:connect])
+    when Proc
+      options[:connect].call(false, e.to_s)
+    when IO
+      options[:connect].puts(e.to_s)
+    end
+    
+    case (options[:on_error])
+    when Proc
+      options[:on_error].call(e.to_s)
+    when IO
+      options[:on_error].puts(e.to_s)
+    end
+
+    case (options[:debug])
+    when Proc
+      options[:debug].call(:error, e.to_s)
+    when IO
+      options[:debug].puts(e.to_s)
+    end
+    
+    case (options[:error])
+    when Proc
+      options[:error].call(:connect_error, e.to_s)
+    when IO
+      options[:error].puts(e.to_s)
     end
+    
+    false
   end
   
   # Warns about supplying a Proc which does not appear to accept the required

data/lib/remailer/connection/socks5_interpreter.rb

@@ -62,11 +62,11 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
     end
     
     parse do |s|
-      return unless (s.length >= 2)
+      if (s.length >= 2)
+        version, method = s.slice!(0,2).unpack('CC')
       
-      version, method = s.slice!(0,2).unpack('CC')
-      
-      method
+        method
+      end
     end
     
     interpret(SOCKS5_METHOD[:username_password]) do
@@ -168,7 +168,7 @@ class Remailer::Connection::Socks5Interpreter < Remailer::Interpreter
   state :failed do
     enter do
       message = "Proxy server returned error code #{@reply}: #{SOCKS5_REPLY[@reply]}"
-      delegate.debug(:error, message)
+      delegate.debug_notification(:error, message)
       delegate.connect_notification(false, message)
       delegate.close_connection
     end

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remailer}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-03-02}
   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.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Reactor-Ready SMTP Mailer}
   s.test_files = [
     "test/config.example.rb",
@@ -52,13 +52,15 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
     else
+      s.add_dependency(%q<eventmachine>, [">= 0"])
     end
   else
+    s.add_dependency(%q<eventmachine>, [">= 0"])
   end
 end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: remailer
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+  prerelease: 
+  version: 0.4.3
 platform: ruby
 authors: 
 - Scott Tadman
@@ -14,10 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -05:00
+date: 2011-03-02 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: EventMachine SMTP Mail User Agent
 email: scott@twg.ca
 executables: []
@@ -60,21 +66,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Reactor-Ready SMTP Mailer