deathbycaptcha 5.0.5 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c08aa72d280a8c0849735ba8b6e69cd755f51fee
-  data.tar.gz: c3e83f7d34fe105668c9eb85a5d5e0269dbec77c
+  metadata.gz: 0ade8e91dabaff38c45364e41cc0e90eb667dc3b
+  data.tar.gz: 2563cc60295125efac5e573fa478aa57b7f6ddc3
 SHA512:
-  metadata.gz: 03b9e78a451f67074d94808132ce7de0982fc2a6d1ce2bc7011e4589bcf6f31d91e63f0a55adea4401bbe672ef636e29b933fbb5c666d2fde4c446bc56a3c1a1
-  data.tar.gz: 70ba966a1fdfae5748b24bdb41d7c0ae73dfb1b058b0c5c115e97b5ec841f6c91ff631b17fec862599092a3a50d9bb0cc619e82142a27b827e7b0d997276d7a5
+  metadata.gz: 5ef6a321ccd6c67cff5afed7048c1c8ec627b14baaa2e40c210183e371cc2c681a280c6fedfc78f927cb00b62fd93c8b8d67157bd955441fc61e2d48d2865554
+  data.tar.gz: bc31af5d0705e589468c08bae270ddaa85b03a9f9fa7bf7b991d70f08bb2d421d98719697bd7861d86552a48b82ca35c8a76d00e96e28e90dce28597231ee9e4

data/README.md

@@ -182,6 +182,55 @@ something like:
 [1, 9]
 ```
 
+## New Recaptcha by Token API
+
+> It's currently available only with the :http client.
+
+To solve captchas similar to
+[reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736), you can also use
+**Token API**
+
+Please, read the oficial documentation at
+http://deathbycaptcha.com/user/api/newtokenrecaptcha
+
+### Using the Token API
+
+```ruby
+# Read above all the instructions on how to solve a captcha.
+captcha = client.decode!(type: 4, token_params: {
+    # optional proxy if needed and server verifies
+    #proxy: "http://127.0.0.1:3128",
+    #proxytype: "HTTP",
+    googlekey: "6Ld2sf4SAAAAAKSgzs0Q13IZhY02Pyo31S2jgOB5",
+    pageurl: "https://patrickhlauke.github.io/recaptcha/"
+  })
+```
+
+You should specify arguments with *type = 4* and an all token params required by DBC API
+
+The response will be a text (token), which you can access with  **text** or **token** method.
+
+```ruby
+# captcha.text
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd
+saD2H0e6S3547xi1FlqJB4rob46J0-wfZMj6YpyVa0WGCfpWzBWcLn7tO_EYs
+vEC_3kfLNINWa5LnKrnJTDXTOz-JuCKvEXx0EQqzb0OU4z2np4uyu79lc_Ndv
+L0IRFc3Cslu6UFV04CIfqXJBWCE5MY0Ag918r14b43ZdpwHSaVVrUqzCQMCyb
+cGq0yxLQf9eSexFiAWmcWLI5nVNA81meTXhQlyCn5bbbI2IMSEErDqceZjf1m
+X3M67BhIb4"
+
+# captcha.token
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd
+saD2H0e6S3547xi1FlqJB4rob46J0-wfZMj6YpyVa0WGCfpWzBWcLn7tO_EYs
+vEC_3kfLNINWa5LnKrnJTDXTOz-JuCKvEXx0EQqzb0OU4z2np4uyu79lc_Ndv
+L0IRFc3Cslu6UFV04CIfqXJBWCE5MY0Ag918r14b43ZdpwHSaVVrUqzCQMCyb
+cGq0yxLQf9eSexFiAWmcWLI5nVNA81meTXhQlyCn5bbbI2IMSEErDqceZjf1m
+X3M67BhIb4"
+```
+
+> Those captchas sometimes took more than 60 seconds to solve
+> So consider increasing the client's *timeout*
+
 ## Notes
 
 #### Thread-safety
@@ -238,14 +287,6 @@ This gem has been tested on the following versions of Ruby:
 * MRI 2.0.0
 * MRI 1.9.3
 
-# Maintainers
-
-* [Débora Setton Fernandes](http://github.com/deborasetton)
-* [Marcelo Mita](http://github.com/marcelomita)
-* [Rafael Barbolo](http://github.com/barbolo)
-* [Rafael Ivan Garcia](http://github.com/rafaelivan)
-
-
 ## Contributing
 
 1. Fork it ( https://github.com/infosimples/deathbycaptcha/fork )

data/lib/deathbycaptcha/client.rb

@@ -86,8 +86,12 @@ module DeathByCaptcha
     def decode!(options = {})
       started_at = Time.now
 
-      raw64 = load_captcha(options)
-      raise DeathByCaptcha::InvalidCaptcha if raw64.to_s.empty?
+      # don't load image data for Token API
+      raw64 = nil
+      unless options[:type] == 4
+        raw64 = load_captcha(options)
+        raise DeathByCaptcha::InvalidCaptcha if raw64.to_s.empty?
+      end
 
       decoded_captcha = self.upload(options.merge(raw64: raw64))
 

data/lib/deathbycaptcha/client/http.rb

@@ -61,6 +61,12 @@ module DeathByCaptcha
 
         payload[:banner] = "base64:#{banner64}"
         payload[:banner_text] = options[:banner_text].to_s
+
+      elsif options[:type].to_i == 4
+        payload = {
+          type: 4,
+          token_params: options[:token_params].to_json,
+        }
       end
 
       response = perform('captcha', :post_multipart, payload)

data/lib/deathbycaptcha/models/captcha.rb

@@ -24,5 +24,6 @@ module DeathByCaptcha
     end
     alias_method :coordinates, :parsed_text
     alias_method :indexes, :parsed_text
+    alias_method :token, :text
   end
 end

data/lib/deathbycaptcha/version.rb

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

data/spec/lib/image_captcha_spec.rb

@@ -6,6 +6,12 @@ path2         = './captchas/2.jpg' # path of the captcha (Coordinates API)
 path3_grid    = './captchas/3-grid.jpg' # path of the grid (Image Group API)
 path3_banner  = './captchas/3-banner.jpg' # path of the grid (Image Group API)
 banner_text3  = 'Click all images with bananas'
+token_params = {
+  #proxy: "http://127.0.0.1:3128",
+  #proxytype: "HTTP",
+  googlekey: "6Ld2sf4SAAAAAKSgzs0Q13IZhY02Pyo31S2jgOB5",
+  pageurl: "https://patrickhlauke.github.io/recaptcha/"
+}
 
 describe 'Solving an image based captcha' do
   before(:all) { @client = DeathByCaptcha.new(username, password, :http) }
@@ -53,4 +59,22 @@ describe 'Solving an image based captcha' do
       it { expect(@captcha.id).to eq(@captcha.captcha) }
     end
   end
+
+  context 'Token API' do
+    describe '#decode!' do
+      before(:all) do
+        @captcha = @client.decode!(
+          type: 4,
+          token_params: token_params,
+        )
+      end
+      it { expect(@captcha).to be_a(DeathByCaptcha::Captcha) }
+      it { expect(@captcha.text).to eq(@captcha.token) }
+      it { expect(@captcha.token).to match(/\A"?\S+"?\Z/) }
+      it { expect(@captcha.token.size).to be > 30 }
+      it { expect(@captcha.is_correct).to be true }
+      it { expect(@captcha.id).to be > 0 }
+      it { expect(@captcha.id).to eq(@captcha.captcha) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deathbycaptcha
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.1.0
 platform: ruby
 authors:
 - Rafael Barbolo, Rafael Ivan Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby API for DeathByCaptcha (Captcha Solver as a Service)