deathbycaptcha 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85231874d833eab0bd84ac29b980d0c00bcb308d
-  data.tar.gz: 91e8dec5412a607e32032e6f8b209a969d288ca7
+  metadata.gz: fd52fe97e5ea7f1e12508b4493c81ccae8325e03
+  data.tar.gz: 103578ff684f01a035ba01e6cebd985a05cbad24
 SHA512:
-  metadata.gz: 2d397c364a4b95457252ddd07bdf9a52e8bc0d298932a591515812074310cb98492278cf8679e49e4c1c5b2b33b2eed9faeaff009347699856130724899f7829
-  data.tar.gz: 9f0e76625b2565b2340866068dc10b9290259d2346ec91f8505ea70234e8ca2df09ec0b41a0d573d064b6c74a8128ebbad8dca21fdc61de91c6a102a4264ba0c
+  metadata.gz: 5abe419b602a8e27cec06d5ff934f567c4dbe9e3a93132a852cf4bb2a6bfac6b55ace0c7f575cac69332089d72b7d91c6f434a7508e17bfa2d6154e9eff90004
+  data.tar.gz: e41f0460ac71a5ca5c482346d227f824a862c06209786aecfa027aa52c27a1955944910e652bbd4c84c24b37beebc854a11bf33978a51a574443664be91695d7

data/lib/deathbycaptcha/client.rb

@@ -82,21 +82,22 @@ module DeathByCaptcha
     # @return [DeathByCaptcha::Captcha] The captcha (with solution if an error is not raised).
     #
     def decode!(options = {})
-      deadline = Time.now + self.timeout
+      ::Timeout.timeout(self.timeout) do
+        raw64 = load_captcha(options)
+        raise DeathByCaptcha::InvalidCaptcha if raw64.to_s.empty?
 
-      raw64 = load_captcha(options)
-      raise DeathByCaptcha::InvalidCaptcha if raw64.to_s.empty?
+        _captcha = self.upload(raw64)
+        while _captcha.text.to_s.empty?
+          sleep(self.polling)
+          _captcha = self.captcha(_captcha.id)
+        end
 
-      _captcha = self.upload(raw64)
-      while _captcha.text.to_s.empty? && deadline > Time.now
-        sleep(self.polling)
-        _captcha = self.captcha(_captcha.id)
-      end
-
-      raise DeathByCaptcha::IncorrectSolution if !_captcha.is_correct
-      raise DeathByCaptcha::Timeout if _captcha.text.to_s.empty?
+        raise DeathByCaptcha::IncorrectSolution if !_captcha.is_correct
 
-      _captcha
+        _captcha
+      end
+    rescue ::Timeout::Error
+      raise DeathByCaptcha::Timeout
     end
 
     # Retrieve information from an uploaded captcha.

data/lib/deathbycaptcha/client/socket.rb

@@ -76,10 +76,10 @@ module DeathByCaptcha
         password: self.password
       )
 
-      response = ::Socket.tcp(HOST, PORTS.sample) do |socket|
-        socket.puts payload.to_json
-        socket.read
-      end
+      socket = create_socket()
+      socket.puts(payload.to_json)
+      response = socket.read()
+      socket.close()
 
       begin
         response = JSON.parse(response)
@@ -103,6 +103,28 @@ module DeathByCaptcha
       response
     end
 
+    # Create a new socket connection with DeathByCaptcha API.
+    # This method is necessary because Ruby 1.9.7 doesn't support connection
+    # timeout and only Ruby 2.2.0 fixes a bug with unsafe sockets threads.
+    #
+    # In Ruby >= 2.2.0, this could be implemented as simply as:
+    # ::Socket.tcp(HOST, PORTS.sample, connect_timeout: 0)
+    #
+    def create_socket
+      socket = ::Socket.new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
+      sockaddr = ::Socket.sockaddr_in(PORTS.sample, HOST)
+      begin # emulate blocking connect
+        socket.connect_nonblock(sockaddr)
+      rescue IO::WaitWritable
+        IO.select(nil, [socket]) # wait 3-way handshake completion
+        begin
+          socket.connect_nonblock(sockaddr) # check connection failure
+        rescue Errno::EISCONN
+        end
+      end
+      socket
+    end
+
     # Return a cached http client for methods that doesn't work with sockets.
     #
     def http_client

data/lib/deathbycaptcha/version.rb

@@ -1,4 +1,4 @@
 module DeathByCaptcha
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
   API_VERSION = "DBC/Ruby v#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deathbycaptcha
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Débora Setton Fernandes, Rafael Barbolo, Rafael Ivan Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby API for DeathByCaptcha (Captcha Solver as a Service)