two_captcha 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 055315d1b7cfb0bafcb2542dcdf1996ed273753d
-  data.tar.gz: 62bba1e3f36d178aa38f7a860f50124740d938a7
+  metadata.gz: b2779681253ef270666b343ac55f430b790229a1
+  data.tar.gz: e02d828d5a7af4d3707ff246f8fbadf85ad012c1
 SHA512:
-  metadata.gz: 0023a248fbba3ed1af6a714256b3e61ad91616145d2b5db1d5edea2e7da87cebe8c6d88f7e706425c411b3b0e92c4b362207237d04f8312bc79401e3dc6466c6
-  data.tar.gz: 3c161aa8ef5031a56d33873da65c27f474aa6a07999a530e3f39982158841f381baa479e8cf2c32dbe41822f58ecf6ea6ce8312218f11c405eb9ce46d24dbc76
+  metadata.gz: 7b5c68c961ebd3f92dfd265ec3489ae772430fcf16b51f6486adcd46befc360c0e0ad6adbd034734500afedc24728210cc7a1fe3b6da8b9c02ee503636087e0a
+  data.tar.gz: 67dc5d2753dc923afc74ef5b30f10b950488d1c76f2440e129c083a3b385afe72b0aed30baa42afb748bb78b1f68ec9729ee6c290a82b80ef5e2b56c7b26cc82

data/README.md

@@ -118,9 +118,17 @@ 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:
 
+## Audio reCAPTCHA v2
+
+  ```ruby
+  client.decode(url: 'http://bit.ly/audiorecaptchav2', recaptchavoice: 1)
+  ```
+
+The response will be a simple text:
+
 ```ruby
-# captcha.coordinates
-[[234, 330], [48, 137]]
+# captcha.text
+'61267'
 ```
 
 ## Notes

data/lib/two_captcha/client.rb

@@ -55,7 +55,7 @@ module TwoCaptcha
     # @option options [Integer] :language       (0) https://2captcha.com/setting
     # @option options [Integer] :header_acao    (0) https://2captcha.com/setting
     # @option options [Integer] :id_constructor (0) 23 if new reCAPTCHA.
-    # @option options [Integer] coordinatescaptcha (0) 1 if clickable captcha.
+    # @option options [Integer] :coordinatescaptcha (0) 1 if clickable captcha.
     #
     # @return [TwoCaptcha::Captcha] The captcha (with solution) if an error is
     #                               not raised.
@@ -88,10 +88,7 @@ module TwoCaptcha
       args = {}
       args[:body]   = options[:raw64]
       args[:method] = 'base64'
-      [:phrase, :regsense, :numeric, :calc, :min_len, :max_len, :language,
-       :header_acao, :id_constructor, :coordinatescaptcha].each do |key|
-        args[key] = options[key] if options[key]
-      end
+      args.merge!(options)
       response = request('in', :multipart, args)
 
       unless response.match(/\AOK\|/)

data/lib/two_captcha/version.rb

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

data/spec/lib/client_spec.rb

@@ -5,6 +5,7 @@ captcha_id       = CREDENTIALS['captcha_id']
 captcha_solution = CREDENTIALS['solution']
 image64          = Base64.encode64(File.open('captchas/1.png', 'rb').read)
 clickable64      = Base64.encode64(File.open('captchas/2.jpg', 'rb').read)
+audio64          = Base64.encode64(File.open('captchas/3.mp3', 'rb').read)
 
 describe TwoCaptcha::Client do
   describe 'create' do
@@ -77,4 +78,18 @@ describe TwoCaptcha::Client do
       it { expect(@xy2[1]).to be_between(276, 366).inclusive }
     end
   end
+
+  context 'audio reCAPTCHA v2' do
+    before(:all) { @client = TwoCaptcha.new(key) }
+
+    describe '#decode!' do
+      before(:all) do
+        @captcha = @client.decode!(raw64: audio64, recaptchavoice: 1)
+      end
+
+      it { expect(@captcha).to be_a(TwoCaptcha::Captcha) }
+      it { expect(@captcha.text.downcase).to eq '61267' }
+      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.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcelo Mita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - bin/setup
 - captchas/1.png
 - captchas/2.jpg
+- captchas/3.mp3
 - lib/two_captcha.rb
 - lib/two_captcha/client.rb
 - lib/two_captcha/errors.rb