deathbycaptcha 4.1.5 → 5.0.0

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+RSpec.configure do |config|
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+
+  # Print tests results with color.
+  config.color = true
+
+  # Only accept the new syntax of "expect" instead of "should".
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+require 'yaml'
+require 'deathbycaptcha'
+
+
+CREDENTIALS = YAML.load_file('spec/credentials.yml')

metadata

@@ -1,91 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: deathbycaptcha
 version: !ruby/object:Gem::Version
-  version: 4.1.5
-  prerelease: 
+  version: 5.0.0
 platform: ruby
 authors:
-- Rafael Barbolo Lopes, Rafael Ivan Garcia
+- Débora Setton Fernandes, Rafael Barbolo, Rafael Ivan Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
-description: Ruby API for DeathByCaptcha (Captcha Solver as a Service)
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+description: DeathByCaptcha allows you to solve captchas with manual labor
 email:
-- tech@infosimples.com.br
+- team@infosimples.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
-- MIT-LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
+- captchas/1.png
 - deathbycaptcha.gemspec
 - lib/deathbycaptcha.rb
 - lib/deathbycaptcha/client.rb
-- lib/deathbycaptcha/config.rb
-- lib/deathbycaptcha/errors.rb
-- lib/deathbycaptcha/http_client.rb
-- lib/deathbycaptcha/socket_client.rb
+- lib/deathbycaptcha/client/http.rb
+- lib/deathbycaptcha/client/socket.rb
+- lib/deathbycaptcha/exceptions.rb
+- lib/deathbycaptcha/models.rb
+- lib/deathbycaptcha/models/captcha.rb
+- lib/deathbycaptcha/models/server_status.rb
+- lib/deathbycaptcha/models/user.rb
+- lib/deathbycaptcha/patches.rb
 - lib/deathbycaptcha/version.rb
-homepage: http://www.infosimples.com.br/en/open-source/captcha-solving-api/
-licenses: []
+- spec/credentials.yml.example
+- spec/lib/client_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/infosimples/deathbycaptcha
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: deathbycaptcha
-rubygems_version: 1.8.25
+rubyforge_project: 
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby API for DeathByCaptcha (Captcha Solver as a Service)
-test_files: []
-has_rdoc: 
+test_files:
+- spec/credentials.yml.example
+- spec/lib/client_spec.rb
+- spec/spec_helper.rb

data/lib/deathbycaptcha/config.rb

@@ -1,42 +0,0 @@
-module DeathByCaptcha
-
-  #
-  # Config class
-  # based on http://mjijackson.com/2010/02/flexible-ruby-config-objects
-  #
-  class Config
-
-    def initialize(data = {})
-      @data = {}
-      update!(data)
-    end
-
-    def update!(data)
-      data.each do |key, value|
-        self[key] = value
-      end
-    end
-
-    def [](key)
-      @data[key.to_sym]
-    end
-
-    def []=(key, value)
-      if value.class == Hash
-        @data[key.to_sym] = Config.new(value)
-      else
-        @data[key.to_sym] = value
-      end
-    end
-
-    def method_missing(sym, *args)
-      if sym.to_s =~ /(.+)=$/
-        self[$1] = args.first
-      else
-        self[sym]
-      end
-    end
-
-  end
-
-end

data/lib/deathbycaptcha/errors.rb

@@ -1,69 +0,0 @@
-module DeathByCaptcha
-
-  module Errors
-
-    #
-    # Custom Error class for rescuing from DeathByCaptcha API errors.
-    #
-    class Error < StandardError
-
-      def initialize(message)
-        super("#{message} (DEATHBYCAPTCHA API ERROR)")
-      end
-
-    end
-
-    #
-    # Raised when a method tries to access a not implemented method.
-    #
-    class NotImplemented < Error
-      def initialize
-        super('The requested functionality was not implemented')
-      end
-    end
-
-    #
-    # Raised when a HTTP call fails.
-    #
-    class CallError < Error
-      def initialize
-        super('HTTP call failed')
-      end
-    end
-
-    #
-    # Raised when the user is not allowed to access the API.
-    #
-    class AccessDenied < Error
-      def initialize
-        super('Access denied, please check your credentials and/or balance')
-      end
-    end
-
-    #
-    # Raised when the captcha file could not be loaded or is empty.
-    #
-    class CaptchaEmpty < Error
-      def initialize
-        super('CAPTCHA image is empty or could not be loaded')
-      end
-    end
-
-    #
-    # Raised when the size of the captcha file is too big.
-    #
-    class CaptchaOverflow < Error
-      def initialize
-        super('CAPTCHA image is too big')
-      end
-    end
-
-    class ServiceOverload < Error
-      def initialize
-        super('CAPTCHA was rejected due to service overload, try again later')
-      end
-    end
-
-  end
-
-end

data/lib/deathbycaptcha/http_client.rb

@@ -1,98 +0,0 @@
-require 'rest_client'
-require 'json'
-require 'digest/md5'
-
-module DeathByCaptcha
-
-  #
-  # DeathByCaptcha HTTP API client
-  #
-  class HTTPClient < DeathByCaptcha::Client
-
-    def get_user
-      call('user', userpwd)
-    end
-
-    def get_captcha(cid)
-      call("captcha/#{cid}")
-    end
-
-    def report(cid)
-      call("captcha/#{cid}/report", userpwd)['is_correct']
-    end
-
-    def remove(cid)
-      not call("captcha/#{cid}/remove", userpwd)['captcha']
-    end
-
-    #
-    # Protected methods.
-    #
-    protected
-
-    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], options[:headers])
-      response                  = call('captcha', data)
-
-      return response if response['captcha']
-    end
-
-    #
-    # Private methods.
-    #
-    private
-
-    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?
-
-      log('SEND', "#{cmd} #{payload}")
-
-      begin
-        url = "#{config.http_base_url}/#{cmd}"
-
-        if payload.empty?
-          response = RestClient.get(url, headers)
-        else
-          response = RestClient.post(url, payload, headers)
-        end
-
-        log('RECV', "#{response.size} #{response}")
-
-        return JSON.load(response)
-
-      rescue RestClient::Unauthorized => exc
-        raise DeathByCaptcha::Errors::AccessDenied
-
-      rescue RestClient::RequestFailed => exc
-        raise DeathByCaptcha::Errors::CallError
-
-      rescue RestClient::ServiceUnavailable => exc
-        raise DeathByCaptcha::Errors::ServiceOverload
-
-      else
-        raise DeathByCaptcha::Errors::CallError
-
-      end
-
-      return {}
-
-    end
-
-  end
-
-  def self.http_client(username, password, extra = {})
-    DeathByCaptcha::HTTPClient.new(username, password, extra)
-  end
-
-end

data/lib/deathbycaptcha/socket_client.rb

@@ -1,224 +0,0 @@
-require 'json'
-require 'digest/md5'
-require 'thread'
-require 'socket'
-require 'base64'
-
-module DeathByCaptcha
-
-  #
-  # DeathByCaptcha Socket API client
-  #
-  class SocketClient < DeathByCaptcha::Client
-
-    def initialize(username, password, extra = {})
-      @mutex  = Mutex.new
-      @socket = nil
-
-      super(username, password, extra)
-    end
-
-    def get_user
-      call('user')
-    end
-
-    def get_captcha(cid)
-      call('captcha', { :captcha => cid })
-    end
-
-    def report(cid)
-      call('report', { :captcha => cid })[:is_correct]
-    end
-
-    #
-    # Protected methods.
-    #
-    protected
-
-    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)
-      }
-
-      call('upload', data)
-    end
-
-    #
-    # Private methods.
-    #
-    private
-
-    def connect
-      unless @socket
-        log('CONN')
-        begin
-          random_port = config.socket_ports[rand(config.socket_ports.size)]
-          # Creates a new Socket.
-          addr = Socket.pack_sockaddr_in(random_port, config.socket_host)
-
-          @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-          @socket.connect_nonblock(addr)
-        rescue Errno::EINPROGRESS
-          log("INPROG", 'Waiting...')
-        rescue Exception => e
-          close # Closes the socket.
-          log('CONN', 'Could not connect.')
-          log('CONN', e.backtrace.join("\n"))
-          raise e
-        end
-      end
-      @socket
-    end
-
-    def close
-      if @socket
-        log('CLOSE')
-        begin
-          @socket.close
-        rescue Exception => e
-          log('CLOSE', 'Could not close socket.')
-          log('CLOSE', e.backtrace.join("\n"))
-        ensure
-          @socket = nil
-        end
-      end
-    end
-
-    def send(sock, buf)
-      # buf += '\n'
-      fds = [sock]
-      deadline = Time.now.to_f + 3 * config.polls_interval
-      while deadline > Time.now.to_f and not buf.empty? do
-        _, wr, ex = IO.select([], fds, fds, config.polls_interval)
-
-        if ex and ex.any?
-          raise IOError.new('send(): select() excepted')
-        elsif wr
-          while buf and not buf.empty? do
-            begin
-              sent = wr.first.send(buf, 0)
-              buf = buf[sent, buf.size - sent]
-            rescue Exception => e
-              if [35, 36].include? e.errno
-                break
-              else
-                raise e
-              end
-            end
-          end
-        end
-      end
-
-      unless buf.empty?
-        raise IOError.new('send() timed out')
-      else
-        return self
-      end
-    end
-
-    def recv(sock)
-      fds = [sock]
-      buf = ''
-
-      deadline = Time.now.to_f() + 3 * config.polls_interval
-      while deadline > Time.now.to_f do
-        rd, _, ex = IO.select(fds, [], fds, config.polls_interval)
-        if ex and ex.any?
-          raise IOError.new('send(): select() excepted')
-        elsif rd
-          while true do
-            begin
-              s = rd.first.recv_nonblock(256)
-            rescue Errno::EAGAIN
-              break
-            rescue Exception => e
-              if [35, 36].include? e.errno
-                break
-              else
-                raise e
-              end
-            else
-              if not s
-                raise IOError.new('recv(): connection lost')
-              else
-                buf += s
-              end
-            end
-          end
-          break if buf.size > 0
-        end
-      end
-
-      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 })
-
-      request = data.to_json
-      log('SEND', request.to_s)
-
-      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
-
-        begin
-          sock = connect
-          send(sock, request)
-
-          response = recv(sock)
-        rescue Exception => e
-          log('SEND', e.message)
-          log('SEND', e.backtrace.join("\n"))
-          close
-        else
-          # If no exception raised.
-          break
-        ensure
-          @mutex.unlock
-        end
-
-      end
-
-      if response.nil?
-        msg = 'Connection timed out during API request'
-        log('SEND', msg)
-
-        raise Exception.new(msg)
-      end
-
-      log('RECV', response.to_s)
-
-      begin
-        response = JSON.load(response)
-      rescue Exception => e
-        raise Exception.new('Invalid API response')
-      end
-
-      if 0x00 < response['status'] and 0x10 > response['status']
-        raise DeathByCaptcha::Errors::AccessDenied
-      elsif 0xff == response['status']
-        raise Exception.new('API server error occured')
-      else
-        return response
-      end
-
-    end
-
-  end
-
-  def self.socket_client(username, password, extra = {})
-    DeathByCaptcha::SocketClient.new(username, password, extra)
-  end
-
-end