two_captcha 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85dec926f62d43f6629fea1232276b55950cac27c107e64d064f6374f571c6b6
-  data.tar.gz: 9e962be8d8d1dd76f6cfe7644003a042b3bcccf216aa5d820fd057c95d930c22
+  metadata.gz: 9d9f28e64ed32b2c3bb8973f14bea2dbb15828550806d0306e6bdbdf07815562
+  data.tar.gz: eaa46657370a298929c7e5f49104abb3f696a74cddeddb8f1052a1f3c2140b8d
 SHA512:
-  metadata.gz: 11dc25d38866f051f13963f460c9b8d5b813d0960b4f1ce8fa3b0c589555d368021cae3994cd1e9d0e6f730940a6921fa91173a70e48a29ec25b7a3903ac814e
-  data.tar.gz: 762fd992e1b9fa35cfc91baf729d280d123298a46f92b75a6dc03e3b42294184d3a4c84cfc449b5d6d44615f54434c5a1d9c0b565ce1ab7d310cf907996b0d50
+  metadata.gz: cc567f2ecf5c0771e1b1ca7cade9c44a33abe2a224256132d2d8326798b998f5b8750fdbb489995c320a705f68ed7d9bb685450c87174c71389d987eb06258a0
+  data.tar.gz: dac73380663bc6471b233db9b30a6d2be296b27fa92131a3beaf54f7a155d503658c7ad53accf1e500eb50704413bd9af931793f6ccc200251dce157f5dbe1f3

data/README.md

@@ -223,6 +223,21 @@ following:
   captcha.text # Solution of the captcha
   ```
 
+## Using proxy or other custom options
+
+You are allowed to use custom options like `proxy`, `proxytype` or `userAgent` whenever the 2Captcha API supports it. Example:
+
+  ```ruby
+  options = {
+    sitekey: 'xyz',
+    pageurl: 'http://example.com/example=1',
+    proxy: 'login:password@123.123.123.123:3128',
+    userAgent: 'user agent'
+  }
+
+  captcha = client.decode_hcaptcha!(options)
+  ```
+
 ## Notes
 
 #### Thread-safety

data/lib/two_captcha/client.rb

@@ -18,9 +18,9 @@ module TwoCaptcha
     # @return [TwoCaptcha::Client] A Client instance.
     #
     def initialize(key, options = {})
-      self.key    = key
-      self.timeout  = options[:timeout] || 60
-      self.polling  = options[:polling] || 5
+      self.key     = key
+      self.timeout = options[:timeout] || 60
+      self.polling = options[:polling] || 5
     end
 
     # Decode the text from an image (i.e. solve a captcha).
@@ -105,11 +105,7 @@ module TwoCaptcha
 
       fail(TwoCaptcha::GoogleKey) if options[:googlekey].empty?
 
-      upload_options = {
-        method: 'userrecaptcha',
-        googlekey: options[:googlekey],
-        pageurl: options[:pageurl]
-      }
+      upload_options = { method: 'userrecaptcha' }.merge(options)
       decoded_captcha = upload(upload_options)
 
       # pool untill the answer is ready
@@ -152,13 +148,9 @@ module TwoCaptcha
       fail(TwoCaptcha::GoogleKey) if options[:googlekey].empty?
 
       upload_options = {
-        method:    'userrecaptcha',
-        version:   'v3',
-        googlekey: options[:googlekey],
-        pageurl:   options[:pageurl],
-        action:    options[:action],
-        min_score: options[:min_score]
-      }
+        method:  'userrecaptcha',
+        version: 'v3',
+      }.merge(options)
       decoded_captcha = upload(upload_options)
 
       # pool untill the answer is ready
@@ -196,13 +188,9 @@ module TwoCaptcha
     def decode_hcaptcha!(options = {})
       started_at = Time.now
 
-      fail(TwoCaptcha::GoogleKey) if options[:sitekey].empty?
+      fail(TwoCaptcha::SiteKey) if options[:sitekey].empty?
 
-      upload_options = {
-        method:    'hcaptcha',
-        sitekey:   options[:sitekey],
-        pageurl:   options[:pageurl]
-      }
+      upload_options = { method: 'hcaptcha' }.merge(options)
       decoded_captcha = upload(upload_options)
 
       # pool untill the answer is ready

data/lib/two_captcha/version.rb

@@ -1,4 +1,4 @@
 module TwoCaptcha
-  VERSION = '1.6.0'
+  VERSION = '1.7.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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Rafael Barbolo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ruby API for 2Captcha (Captcha Solver as a Service)