deathbycaptcha 4.0.2 → 4.1.1

data/README.md

@@ -12,6 +12,11 @@ Thread-safety note
 
 The API is thread-safe, which means it is perfectly fine to share a client instance between multiple threads.
 
+Latest version
+--------------
+
+The latest version of this API is 4.1.1.
+
 Installation
 ------------
 

data/deathbycaptcha.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Rafael Barbolo Lopes, Rafael Ivan Garcia"]
   s.email       = ["tech@infosimples.com.br"]
-  s.homepage    = "http://github.com/infosimples/deathbycaptcha"
+  s.homepage    = "http://www.infosimples.com.br/en/open-source/captcha-solving-api/"
   s.summary     = %q{Ruby API for DeathByCaptcha (Captcha Solver as a Service)}
   s.description = %q{Ruby API for DeathByCaptcha (Captcha Solver as a Service)}
 

data/lib/deathbycaptcha/client.rb

@@ -11,7 +11,7 @@ module DeathByCaptcha
     
     attr_accessor :config
     
-    def initialize(username, password, extra={})
+    def initialize(username, password, extra = {})
       data = {
         :is_verbose => false, # If true, prints messages during execution
         :logger_output => STDOUT, # Logger output path or IO instance
@@ -23,11 +23,9 @@ module DeathByCaptcha
         :http_base_url => 'http://api.deathbycaptcha.com/api', # Base HTTP API url
         :http_response_type => 'application/json', # Preferred HTTP API server's response content type, do not change
         :socket_host => 'api.deathbycaptcha.com', # Socket API server's host
-        :socket_port => (8123..8130).map {|p| p}, # Socket API server's ports range
+        :socket_port => (8123..8130).map { |p| p }, # Socket API server's ports range
         :username => username, # DeathByCaptcha username
-        :password_hashed => Digest::SHA1.hexdigest(password), # DeathByCaptcha user's password encrypted
-        :password => '', # DeathByCaptcha user's password not encrypted
-        :password_is_hashed => true # True, if the password is hashed
+        :password => password, # DeathByCaptcha user's password not encrypted
       }.merge(extra)
       
       @config = DeathByCaptcha::Config.new(data) # Config instance
@@ -70,13 +68,6 @@ module DeathByCaptcha
       raise DeathByCaptcha::Errors::NotImplemented
     end
     
-    #
-    # Remove an unsolved CAPTCHA
-    #
-    def remove(cid)
-      raise DeathByCaptcha::Errors::NotImplemented
-    end
-    
     #
     # Upload a CAPTCHA
     #
@@ -84,7 +75,7 @@ module DeathByCaptcha
     # whether the CAPTCHA is case-sensitive or not.  Returns CAPTCHA details
     # on success.
     #
-    def upload(captcha, options={})
+    def upload(captcha, options = {})
       raise DeathByCaptcha::Errors::NotImplemented
     end
     
@@ -97,27 +88,30 @@ module DeathByCaptcha
     # timeout (in seconds).  Removes unsolved CAPTCHAs.  Returns CAPTCHA
     # details if (correctly) solved.
     #
-    def decode(captcha, options={})
-      options = {:timeout => config.default_timeout, :is_case_sensitive => false, :is_raw_content => false}.merge(options)
+    def decode(captcha, options = {})
+      options = {
+        :timeout => config.default_timeout,
+        :is_case_sensitive => false,
+        :is_raw_content => false
+      }.merge(options)
+      
       deadline = Time.now + options[:timeout]
       c = upload(captcha, options)
       if c
+        
         while deadline > Time.now and (c['text'].nil? or c['text'].empty?)
           sleep(config.polls_interval)
           c = get_captcha(c['captcha'])
         end
         
         if c['text']
-          if c['is_correct']
-            return c
-          end
+          return c if c['is_correct']
         else
           remove(c['captcha'])
         end
         
       end
       
-      
     end
     
     #
@@ -129,11 +123,7 @@ module DeathByCaptcha
     # Return a hash with the user's credentials
     #
     def userpwd
-      if config.password_is_hashed
-        return {:username => config.username, :password => config.password_hashed, :is_hashed => '1'}
-      else
-        return {:username => config.username, :password => config.password}
-      end
+      { :username => config.username, :password => config.password }
     end
     
     #
@@ -144,7 +134,7 @@ module DeathByCaptcha
     #
     # Log a command and a message
     #
-    def log(cmd, msg='')
+    def log(cmd, msg = '')
       if @config.is_verbose
         @logger.info "#{cmd}: #{msg}"
       end
@@ -159,22 +149,24 @@ module DeathByCaptcha
     # => a url if it's a String and starts with 'http://'
     # => a filesystem path otherwise
     #
-    def load_file(captcha, is_raw_content=false)
+    def load_file(captcha, is_raw_content = false)
+      
       file = nil
+      
       if is_raw_content
         # Create a temporary file, write the raw content and return it
         tmp_file_path = File.join(Dir.tmpdir, "captcha_#{Time.now.to_i}_#{rand}")
-        File.open(tmp_file_path, 'wb') {|f| f.write captcha}
+        File.open(tmp_file_path, 'wb') { |f| f.write captcha }
         file = File.open(tmp_file_path, 'r')
         
       elsif captcha.kind_of? File
         # simply return the file
         file = captcha
         
-      elsif captcha.kind_of? String and captcha[0,7] == 'http://'
+      elsif captcha.kind_of? String and captcha.match(/^https?:\/\//i)
         # Create a temporary file, download the file, write it to tempfile and return it
         tmp_file_path = File.join(Dir.tmpdir, "captcha_#{Time.now.to_i}_#{rand}")
-        File.open(tmp_file_path, 'w') {|f| f.write RestClient.get(captcha)}
+        File.open(tmp_file_path, 'wb') { |f| f.write RestClient.get(captcha) }
         file = File.open(tmp_file_path, 'r')
         
       else
@@ -189,9 +181,10 @@ module DeathByCaptcha
         raise DeathByCaptcha::Errors::CaptchaOverflow
       end
       
-      return file
+      file
+      
     end
     
   end
   
-end
+end

data/lib/deathbycaptcha/error.rb

@@ -1,14 +1,14 @@
 module DeathByCaptcha
+  
   module Errors
     
-    
     #
     # Custom Error class for rescuing from DeathByCaptcha API errors
     #
     class Error < StandardError
 
       def initialize(message)
-        super "#{message} (DEATHBYCAPTCHA API ERROR)"
+        super("#{message} (DEATHBYCAPTCHA API ERROR)")
       end
 
     end
@@ -18,7 +18,7 @@ module DeathByCaptcha
     #
     class NotImplemented < Error
       def initialize
-        super 'The requested functionality was not implemented'
+        super('The requested functionality was not implemented')
       end
     end
     
@@ -27,7 +27,7 @@ module DeathByCaptcha
     #
     class CallError < Error
       def initialize
-        super 'HTTP call failed'
+        super('HTTP call failed')
       end
     end
     
@@ -36,7 +36,7 @@ module DeathByCaptcha
     #
     class AccessDenied < Error
       def initialize
-        super 'Access denied, please check your credentials and/or balance'
+        super('Access denied, please check your credentials and/or balance')
       end
     end
     
@@ -45,7 +45,7 @@ module DeathByCaptcha
     #
     class CaptchaEmpty
       def initialize
-        super 'CAPTCHA image is empty or could not be loaded'
+        super('CAPTCHA image is empty or could not be loaded')
       end
     end
     
@@ -54,9 +54,16 @@ module DeathByCaptcha
     #
     class CaptchaOverflow
       def initialize
-        super 'CAPTCHA image is too big'
+        super('CAPTCHA image is too big')
+      end
+    end
+    
+    class ServiceOverload
+      def initialize
+        super('CAPTCHA was rejected due to service overload, try again later')
       end
     end
     
   end
+  
 end

data/lib/deathbycaptcha/http_client.rb

@@ -25,22 +25,23 @@ module DeathByCaptcha
       not call("captcha/#{cid}/remove", userpwd)['captcha']
     end
     
-    def a(nome, test=false, valor="verdade")
-      puts nome,test,valor
-    end
-    
     #
     # Protected methods.
     #
     protected
     
-    def upload(captcha, options={})
-      options = {:is_case_sensitive => false, :is_raw_content => false}.merge(options)
+    def upload(captcha, options = {})
+      options = {
+        :is_case_sensitive => false,
+        :is_raw_content => false
+      }.merge(options)
+      
       data = userpwd
       data[:swid] = config.software_vendor_id
       data[:is_case_sensitive] = options[:is_case_sensitive] ? 1 : 0
       data[:captchafile] = load_file(captcha, options[:is_raw_content])
       response = call('captcha', data)
+      
       return response if response['captcha']
     end
     
@@ -49,7 +50,9 @@ module DeathByCaptcha
     #
     private
     
-    def call(cmd, payload={}, headers={})
+    def call(cmd, payload = {}, headers = {})
+      
+      headers = {} unless headers.is_a?(Hash)
       headers['Accept'] = config.http_response_type if headers['Accept'].nil?
       headers['User-Agent'] = config.api_version if headers['User-Agent'].nil?
       
@@ -74,6 +77,9 @@ module DeathByCaptcha
       rescue RestClient::RequestFailed => exc
         raise DeathByCaptcha::Errors::AccessDenied
         
+      rescue RestClient::ServiceUnavailable => exc
+        raise DeathByCaptcha::Errors::ServiceOverload
+      
       else
         raise DeathByCaptcha::Errors::CallError
         
@@ -85,8 +91,7 @@ module DeathByCaptcha
     
   end
   
-  
-  def self.http_client(username, password, extra={})
+  def self.http_client(username, password, extra = {})
     DeathByCaptcha::HTTPClient.new(username, password, extra)
   end
   

data/lib/deathbycaptcha/socket_client.rb

@@ -25,7 +25,7 @@ module DeathByCaptcha
     end
     
     def get_user
-      call('user', userpwd)
+      call('user')
     end
     
     def get_captcha(cid)
@@ -33,19 +33,8 @@ module DeathByCaptcha
     end
 
     def report(cid)
-      call("captcha/#{cid}/report", userpwd)[:is_correct]
-      
-      data = userpwd
-      data['captcha'] = cid
-      not call('report', data)[:is_correct]
-    end
-    
-    def remove(cid)
-      not call("captcha/#{cid}/remove", userpwd)[:captcha]
-      
-      data = userpwd
-      data['captcha'] = cid
-      not call('remove', data)[:captcha]
+      data = { 'captcha' => cid }
+      call('report', data)[:is_correct]
     end
     
     #
@@ -53,14 +42,13 @@ module DeathByCaptcha
     #
     protected
     
-    def upload(captcha, is_case_sensitive=false, is_raw_content=false)
-      data = userpwd
-      data[:captcha] = Base64.encode64(load_file(captcha, is_raw_content).read)
+    def upload(captcha, is_case_sensitive = false, is_raw_content = false)
+      data = {
+        :captcha => Base64.encode64(load_file(captcha, is_raw_content).read),
+        :is_case_sensitive => (is_case_sensitive ? 1 : 0)
+      }
       
-      data[:is_case_sensitive] = is_case_sensitive ? 1 : 0
-      response = call('upload', data)
-      
-      response
+      call('upload', data)
     end
     
     #
@@ -178,13 +166,13 @@ module DeathByCaptcha
         end
       end
       
-      return buf[0, buf.size - 1] if buf.size > 0
+      return buf[0, buf.size] if buf.size > 0
       raise IOError.new('recv() timed out')
     end
     
     def call(cmd, data = {})
       data = {} if data.nil?
-      data.merge!({:cmd => cmd, :version => config.api_version})
+      data.merge!({ :cmd => cmd, :version => config.api_version })
       
       request = data.to_json
       log('SEND', request.to_s)
@@ -192,6 +180,10 @@ module DeathByCaptcha
       response = nil
       
       (0...1).each do
+        if not @socket and cmd != 'login'
+          call('login', userpwd)
+        end
+        
         # Locks other threads.
         # If another thread has already acquired the lock, this thread will be locked.
         @mutex.lock
@@ -241,7 +233,6 @@ module DeathByCaptcha
     
   end
   
-  
   def self.socket_client(username, password, extra={})
     DeathByCaptcha::SocketClient.new(username, password, extra)
   end

data/lib/deathbycaptcha/version.rb

@@ -1,4 +1,4 @@
 module DeathByCaptcha
-  VERSION = "4.0.2"
-  API_VERSION = "DBC/Ruby v4.0.2"
+  VERSION = "4.1.1"
+  API_VERSION = "DBC/Ruby v4.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deathbycaptcha
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000 -03:00
-default_executable: 
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153340400 !ruby/object:Gem::Requirement
+  requirement: &2160211420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153340400
+  version_requirements: *2160211420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153339900 !ruby/object:Gem::Requirement
+  requirement: &2160210400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +32,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153339900
+  version_requirements: *2160210400
 description: Ruby API for DeathByCaptcha (Captcha Solver as a Service)
 email:
 - tech@infosimples.com.br
@@ -54,8 +53,7 @@ files:
 - lib/deathbycaptcha/http_client.rb
 - lib/deathbycaptcha/socket_client.rb
 - lib/deathbycaptcha/version.rb
-has_rdoc: true
-homepage: http://github.com/infosimples/deathbycaptcha
+homepage: http://www.infosimples.com.br/en/open-source/captcha-solving-api/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -75,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: deathbycaptcha
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby API for DeathByCaptcha (Captcha Solver as a Service)