em-socksify 0.2.0 → 0.2.1

data/lib/em-socksify/socks5.rb

@@ -18,7 +18,7 @@ module EventMachine
         send_data [5, 1, 0].pack('CCC')
 
         if matches = @socks_target_host.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/)
-          send_data "\xF1\x00\x01" + matches.to_a[1 .. -1].map { |s| s.to_i }.pack('CCCC')
+          send_data "\x01" + matches.to_a[1 .. -1].map { |s| s.to_i }.pack('CCCC')
 
         elsif @socks_target_host =~ /^[:0-9a-f]+$/
           raise SOCKSError, 'TCP/IPv6 over SOCKS is not yet supported (inet_pton missing in Ruby & not supported by Tor)'
@@ -100,6 +100,8 @@ module EventMachine
 
             socks_unhook(ip)
           end
+        rescue Exception => e
+          @socks_deferrable.fail(e)
         end
 
         def socks_methods

data/lib/em-socksify/socksify.rb

@@ -7,11 +7,14 @@ module EventMachine
       @socks_username = username
       @socks_password = password
       @socks_version = version
-      @socks_callback = blk
       @socks_data = ''
 
       socks_hook
       socks_send_handshake
+
+      @socks_deferrable = DefaultDeferrable.new
+      @socks_deferrable.callback(&blk) if blk
+      @socks_deferrable
     end
 
     def socks_hook
@@ -31,7 +34,7 @@ module EventMachine
         remove_method :receive_data
       end
 
-      @socks_callback.call(ip)
+      @socks_deferrable.succeed(ip)
     end
 
     def socks_receive_data(data)

data/lib/em-socksify/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
 
 module Socksify
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-socksify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156395280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156395280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156394860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156394860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'EventMachine SOCKSify shim: adds SOCKS support to any protocol'
 email:
 - ilya@igvita.com
@@ -73,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em-socksify
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'EventMachine SOCKSify shim: adds SOCKS support to any protocol'