ruby-2captcha 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc7d94f83479f1d8c57bb4cf2315a2fcb04475a7c9f2ca170b09648d95d830e
-  data.tar.gz: 759ff2de9c3fed201fcb467e52b4fe2c0d24af9c006596ed58002c3b2f7b42b4
+  metadata.gz: d80f00729bbf9f6f08867c59bb5d6e078dbe7675dc14a0b7dd65922ab640663c
+  data.tar.gz: b8dd22428eab71d775a7d597bd42d661f8ded8cd1b94f30c7c54be507ea5a769
 SHA512:
-  metadata.gz: 9c9f92edcd7270fa86a6fcc287734596c8a9de31bb491451ab2569adb3d555c104716436cfb386dab9d95e0a4bb747a85e6a4dfc7ff705c4ae2b31689e8615ad
-  data.tar.gz: 71bd866a8dfe6e82b49abe66537ec7d2b0bcdef58e6e2bace9f9fc024a0e21e071aaa021cca517a31bf2f1d2b3296c94ece3485a76dab9d2d92190aab86c84aa
+  metadata.gz: 36f2d745961278c462b64b2cccbc30b6fee82b67e0b4f768f8068babb1c9af5b8e675b88089ad7c81afa33321f288749ac808d01f23966a50c498a70dea4aeac
+  data.tar.gz: f91c2ec90c7d09edf188c47b9718bf4152f508f808146b965a3be0e8fa69dbf661cc70df9b8634ff760bcdf54d79d44873119abf09bb353f494203139b670c02

data/lib/api_2captcha/client.rb

@@ -27,7 +27,8 @@ module Api2Captcha
       @domain = DEFAULT_DOMAIN
     end
 
-    def solve(method, params = {}, file_path = nil, return_id: false)
+    def solve(method, file_path = nil, return_id: false, **params)
+      params = params.transform_keys(&:to_s)
       params["method"] = method
       params["key"] = @api_key
       params["soft_id"] = @soft_id
@@ -70,7 +71,8 @@ module Api2Captcha
         when Net::HTTPSuccess
           response_json = JSON.parse(response.body)
           if response_json["status"] == 1
-            return response_json["request"]
+            response_json["captcha_id"] = captcha_id
+            return response_json
           elsif response_json["request"] == "CAPCHA_NOT_READY"
             sleep(polling_interval)
           else
@@ -169,12 +171,12 @@ module Api2Captcha
     end
 
     def audio(params)
-      audio = params.delete(:audio)
+      audio = params.delete("audio")
       audio_content = File.file?(audio) ? File.binread(audio) : audio
 
       params = params.merge(
         "body" => Base64.strict_encode64(audio_content),
-        "lang" => params[:lang]
+        "lang" => params["lang"]
       )
       solve("audio", params)
     end
@@ -198,12 +200,12 @@ module Api2Captcha
     end
 
     def get_params(params)
-      params[:image].nil? ? params : file_params(params)
+      params["image"].nil? ? params : file_params(params)
     end
 
     def file_params(params)
-      image = params.delete(:image)
-      hint_image = params.delete(:hint_image)
+      image = params.delete("image")
+      hint_image = params.delete("hint_image")
 
       image_content = get_image_content(image)
       hint_image_content = get_image_content(hint_image) if hint_image
@@ -245,7 +247,7 @@ module Api2Captcha
         if response_json["status"] == 1
           response_json["request"]
         else
-          raise ApiException, "API Error: #{response_json["error_text"]}"
+          raise ApiException, "API Error: #{response_json["request"]}"
         end
       else
         raise NetworkException, "Network Error: #{response.code.to_i}"

data/lib/api_2captcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Api2Captcha
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-2captcha
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - 2captcha.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies: []
 description: Ruby package for easy integration with the API of 2captcha captcha solving
   service to bypass recaptcha, hcaptcha, funcaptcha, geetest and solve any other captchas.