two_captcha 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c78a3d0fc1086113ee19839c34915f2ee25dfd
-  data.tar.gz: 93324acc8b929a1ce9afd091854fb613a65b1880
+  metadata.gz: 020a0e50cda97516940c1b430cff1432dad0ce34
+  data.tar.gz: 030416788dfa9f339cc9645e1ed0d2428767da01
 SHA512:
-  metadata.gz: 1bbb44cd113201bc56e8f1a29bc3f933a5a0e2e9f5fc90eb69c33c381768ca8b3822ac1175a64289e52e8bbe6bb2d3a525587704388c57865fb6582460de7288
-  data.tar.gz: 4cd54178eefe7b37bf5a21451bf35cbd8d03a03056bb8c9783756198f6e8591820ceba41b7a373e902415a51801685212040dbafe586a27eda428dff9fa7325d
+  metadata.gz: 2fe57791572de606158764bddc2aa86856df09649cbf82d386a1965a558c90c1f53c661e92f7d45f280aec6863a592a6ebffa324d2ba2adc26914e2052d01fd7
+  data.tar.gz: 4aac7b9588bef5e641922ccb405ff89ce301b022f50df2071742f89fe1b89753261d43fe9b370fc5af29831ce3ac3a29de23c2b918dea4e675617888b62bdac7

data/Changelog.md

@@ -0,0 +1,9 @@
+# TwoCaptcha Changes
+
+### 1.4.0
+
+* **breaking changes:**
+  * The method "decode_recaptcha_v2" now always return a TwoCaptcha::Captcha
+    object. It was returning a string when successful.
+* enhancements:
+  * Add tests to solve RecaptchaV2 with the preferred method.

data/README.md

@@ -103,10 +103,11 @@ There are two ways of solving captchas similar to
 
 ### (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.
+This method requires no browser emulation. You can send two parameters that
+identify the website in which the captcha is found.
 
-Please read the oficial documentation at https://2captcha.com/newapi-recaptcha-en for
-more information.
+Please read the [oficial documentation](https://2captcha.com/newapi-recaptcha-en)
+for more information.
 
   ```ruby
   options = {
@@ -115,12 +116,15 @@ more information.
   }
 
   client.decode_recaptcha_v2(options)
+  captcha.text        # Solution of the captcha
+  captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
   ```
 
-  The response will be a code that validates the form, like the following:
+  The solution (`captcha.text`) 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"
+  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
   ```
 
 ### Sending the challenge image

data/lib/two_captcha/client.rb

@@ -105,30 +105,21 @@ module TwoCaptcha
 
       fail(TwoCaptcha::GoogleKey) if options[:googlekey].empty?
 
-      payload_in = {
+      upload_options = {
         method: 'userrecaptcha',
         googlekey: options[:googlekey],
         pageurl: options[:pageurl]
       }
+      decoded_captcha = upload(upload_options)
 
-      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)
-
-      while response_res.match(/CAPTCHA_NOT_READY|CAPCHA_NOT_READY/i)
-        sleep(polling)
-        response_res = request('res', :get, payload_res)
+      # pool untill the answer is ready
+      while decoded_captcha.text.to_s.empty?
+        sleep([polling, 10].max) # sleep at least 10 seconds
+        decoded_captcha = captcha(decoded_captcha.id)
         fail TwoCaptcha::Timeout if (Time.now - started_at) > timeout
       end
 
-      JSON.load(response_res)['request']
+      decoded_captcha
     end
 
     # Upload a captcha to 2Captcha.
@@ -139,8 +130,8 @@ module TwoCaptcha
     #
     def upload(options = {})
       args = {}
-      args[:body]   = options[:raw64]
-      args[:method] = 'base64'
+      args[:body]   = options[:raw64] if options[:raw64]
+      args[:method] = options[:method] || 'base64'
       args.merge!(options)
       response = request('in', :multipart, args)
 

data/lib/two_captcha/version.rb

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

data/spec/lib/client_spec.rb

@@ -92,4 +92,22 @@ describe TwoCaptcha::Client do
       it { expect(@captcha.id).to match(/[0-9]{9}/) }
     end
   end
+
+  context 'image reCAPTCHA v2' do
+    before(:all) { @client = TwoCaptcha.new(key) }
+
+    describe '#decode_recaptcha_v2!' do
+      before(:all) do
+        options = {
+          googlekey: '6Le-wvkSAAAAAPBMRTvw0Q4Muexq9bi0DJwx_mJ-',
+          pageurl: 'https://www.google.com/recaptcha/api2/demo'
+        }
+        @captcha = @client.decode_recaptcha_v2!(options)
+      end
+
+      it { expect(@captcha).to be_a(TwoCaptcha::Captcha) }
+      it { expect(@captcha.text.size).to be > 50 } # not perfect, I know
+      it { expect(@captcha.id).to match(/[0-9]{9}/) }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Rafael Barbolo
@@ -64,6 +64,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md