two_captcha 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2779681253ef270666b343ac55f430b790229a1
-  data.tar.gz: e02d828d5a7af4d3707ff246f8fbadf85ad012c1
+  metadata.gz: 29bc40bcdecf08c3315a97224e2dbc0b7308f737
+  data.tar.gz: f16d6172e691101d63534746c83da27d109abdb0
 SHA512:
-  metadata.gz: 7b5c68c961ebd3f92dfd265ec3489ae772430fcf16b51f6486adcd46befc360c0e0ad6adbd034734500afedc24728210cc7a1fe3b6da8b9c02ee503636087e0a
-  data.tar.gz: 67dc5d2753dc923afc74ef5b30f10b950488d1c76f2440e129c083a3b385afe72b0aed30baa42afb748bb78b1f68ec9729ee6c290a82b80ef5e2b56c7b26cc82
+  metadata.gz: 36c9c2bd793aba1dda0b4ce7414ab2b56ae5193c314714f6b2b33f22cec13ecc8ffbf29ac0fb997b866890079b3131b316a26c5a05274bc300e55d93072f6573
+  data.tar.gz: 0d7d9a545bdfa066e551031a824129635ca4b4f2639de54204bb2d7d2beeb8a9fc40b93e51bc1eba051836534b68ead71a595dff9be271300b1b6aa327710de3

data/README.md

@@ -98,9 +98,34 @@ Or install it yourself as:
 
 ## Clickable CAPTCHAs (e.g. "No CAPTCHA reCAPTCHA")
 
-To solve captchas similar to
-[reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736), you can add
-the param `coordinatescaptcha: 1` to your request.
+There are two ways of solving captchas similar to
+[reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736).
+
+### (Prefered) Sending the `googlekey` and `pageurl` parameters
+
+This method requires no browser emulation. You can send two parameters that identify website in which the captcha is found.
+
+Please read the oficial documentation at https://2captcha.com/newapi-recaptcha-en for
+more information.
+
+  ```ruby
+  options = {
+    googlekey: 'xyz',
+    pageurl: 'http://example.com/example=1'
+  }
+
+  client.decode_recaptcha_v2(options)
+  ```
+
+  The response will be a code that validates the form, like the following:
+
+  ```ruby
+  "03AHJ_VuuHAqJKxcTH6sbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcw0u2KqgjHPiXWwlulOw0Ef82tH6SOSbXdelgkvdDl8HreKFug05zfadw2n-A2HoTgYteVA53Q46VatEcZofa5eKfaWgvrPS-IP1DpV4bnUEG69-VbWAx7fJ-p4rHSxq-ZYesBkk9yYFrAiT_70uSz8lg3iqRImfRW91RIkEq8A5UBn4vABUQvlDV4eoKpeNUKDmHOABHkdsV8_1KEgCbabIwsIuIkN1_hw-Mkg0NRdWuXgNtOWen0Zv65yl6D31yhyLV2s0h3ygQwrpxJpBWs7o_rG2TaVfi0y9S5cYr-YlMTHszvMQCVllf5WAiNAgV28JuAnFH5WqRHqT56Tz6ZVNigIToEzq1tnfuewgmJuyyP_woy_MGRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdgIPT9Xdbo_dm4pLGZ0CNd5WQcjil_kZN_uErRssv9r8j5SC6tsIPBneQLqqqsg8Hyt9kjIh0N10d6-sFeV3QWw-OuzCrPSNYc-_AxvwaB0GUAOmHDDbj8kKz1oqfdBwJienRm246cbstqdc7uAHHuLWLpt1A5W-56PEbb3Zs-HNo3kcjvlJcfrOVJKW68-G3S635EJ9SBm9GFKzFojEu4-TF9CvYNJKaXY9dDev_TVbBaWpWN2Ctx5hHKRbtD1_g2LsGUTDkpo7wrf4pbAyP34zeMRBI1wrrV12PBKnuafaMjy2KIFLt0LM91uWiBzEC61AiSKKEwP2nydRIyIFGwbLFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZw3sra3yRt9ziDVKKDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05kr5R6OVHfeUszn5OiYeVh8Q_gTMsEf4wdaOsQWGZhWQIS8Vi_6IYzwQsnOtYdI6T8q4IDrQh-9eemVn0gNI6gdyknStQ7DoujdPGt20qzpURMwHaw"
+  ```
+
+### Sending the challenge image
+
+You can add the param `coordinatescaptcha: 1` to your request.
 
 Please read the oficial documentation at https://2captcha.com/en-api-recaptcha for
 more information.
@@ -118,6 +143,11 @@ more information.
 The response will be an array containing coordinates where the captcha should be
 clicked. For the captcha above it should look something like:
 
+  ```ruby
+  # captcha.text
+  "coordinates:x=50.66999816894531,y=130.3300018310547;x=236.66998291015625,y=328.3299865722656"
+  ```
+
 ## Audio reCAPTCHA v2
 
   ```ruby
@@ -157,18 +187,13 @@ convertions before calling the API.
 
 TwoCaptcha gem uses [Semantic Versioning](http://semver.org/).
 
-#### Ruby versions tested
+#### Tested Ruby versions
 
 * MRI 2.2.2
 * MRI 2.2.0
 * MRI 2.1.4
 * MRI 2.0.0
 
-# Maintainers
-
-* [Marcelo Mita](http://github.com/marcelomita)
-* [Rafael Barbolo](http://github.com/barbolo)
-
 ## Contributing
 
 1. Fork it ( https://github.com/infosimples/two_captcha/fork )

data/lib/two_captcha/client.rb

@@ -78,6 +78,61 @@ module TwoCaptcha
       decoded_captcha
     end
 
+    #
+    # Solve reCAPTCHA v2.
+    #
+    # @param [Hash] options Options hash. Check docs for the method decode!.
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_recaptcha_v2(options = {})
+      decode_recaptcha_v2!(options)
+    rescue TwoCaptcha::Error => ex
+      TwoCaptcha::Captcha.new
+    end
+
+    #
+    # Solve reCAPTCHA v2.
+    #
+    # @param [Hash] options Options hash.
+    # @option options [String]  :googlekey The open key of the site in which recaptcha is installed.
+    # @option options [String]  :pageurl The URL of the page where the recaptcha is encountered.
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_recaptcha_v2!(options = {})
+      started_at = Time.now
+
+      fail(TwoCaptcha::GoogleKey) if options[:googlekey].empty?
+
+      payload_in = {
+        method: 'userrecaptcha',
+        googlekey: options[:googlekey],
+        pageurl: options[:pageurl]
+      }
+
+      response_in = request('in', :get, payload_in)
+      status, captcha_id = response_in.split('|')
+
+      payload_res = {
+        action: 'get',
+        json: '1',
+        id: captcha_id
+      }
+
+      response_res = request('res', :get, payload_res)
+      result = JSON.load(response_res)
+
+      while ['CAPCHA_NOT_READY', 'CAPTCHA_NOT_READY'].include? result['request']
+        sleep(polling)
+        response_res = request('res', :get, payload_res)
+        result = JSON.load(response_res)
+        fail TwoCaptcha::Timeout if (Time.now - started_at) > timeout
+      end
+
+      result['request']
+    end
+
     # Upload a captcha to 2Captcha.
     #
     # This method will not return the solution. It helps on separating concerns.

data/lib/two_captcha/errors.rb

@@ -98,6 +98,12 @@ module TwoCaptcha
     end
   end
 
+  class GoogleKey < Error
+    def initialize
+      super('Missing googlekey parameter')
+    end
+  end
+
   RESPONSE_ERRORS = {
     'ERROR_WRONG_USER_KEY'           => TwoCaptcha::WrongUserKey,
     'ERROR_KEY_DOES_NOT_EXIST'       => TwoCaptcha::InvalidUserKey,
@@ -111,6 +117,7 @@ module TwoCaptcha
     'IP_BANNED'                      => TwoCaptcha::IpBanned,
     'ERROR_WRONG_ID_FORMAT'          => TwoCaptcha::WrongIdFormat,
     'ERROR_CAPTCHA_UNSOLVABLE'       => TwoCaptcha::CaptchaUnsolvable,
-    'ERROR_EMPTY_ACTION'             => TwoCaptcha::EmptyAction
+    'ERROR_EMPTY_ACTION'             => TwoCaptcha::EmptyAction,
+    'ERROR_GOOGLEKEY'                => TwoCaptcha::GoogleKey
   }
 end

data/lib/two_captcha/version.rb

@@ -1,4 +1,4 @@
 module TwoCaptcha
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
   USER_AGENT = "TwoCaptcha/Ruby v#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Marcelo Mita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,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 2Captcha (Captcha Solver as a Service)