two_captcha 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f01f12561a53cdfd920b3e70a91f090d939c3ac7
-  data.tar.gz: 3adb06109188455e97090a63b969304fc91d0d33
+  metadata.gz: 055315d1b7cfb0bafcb2542dcdf1996ed273753d
+  data.tar.gz: 62bba1e3f36d178aa38f7a860f50124740d938a7
 SHA512:
-  metadata.gz: f87d4828f1727afd418bbf2d5c9986fa4449bfe785c5617a0cef33d50b5216f1649b2d6c99837daf702b180035fa6c761a9b0b3e80f6851c2bb7037f34c77586
-  data.tar.gz: 4fb90567f9a014e3b63a14aac518c632fee79ac03c68966ef27601f183e56951e2e3c4b8c1ef33bfd16ef76195f059b10ea7b78f765612d332701659b11a7f42
+  metadata.gz: 0023a248fbba3ed1af6a714256b3e61ad91616145d2b5db1d5edea2e7da87cebe8c6d88f7e706425c411b3b0e92c4b362207237d04f8312bc79401e3dc6466c6
+  data.tar.gz: 3c161aa8ef5031a56d33873da65c27f474aa6a07999a530e3f39982158841f381baa479e8cf2c32dbe41822f58ecf6ea6ce8312218f11c405eb9ce46d24dbc76

data/README.md

@@ -1,6 +1,4 @@
-Developed by [Infosimples](https://infosimples.com), a brazilian company that
-offers [data extraction solutions](https://infosimples.com/en/data-engineering)
-and [Ruby on Rails development](https://infosimples.com/en/software-development).
+Developed by [Infosimples](https://infosimples.com), a [big data company](https://infosimples.com/en/data-engineering).
 
 # TwoCaptcha
 
@@ -98,17 +96,17 @@ Or install it yourself as:
   # return an XML string with the current service load.
   ```
 
-## New ReCaptcha
+## 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 'id_constructor: 23' to your request.
+the param `coordinatescaptcha: 1` to your request.
 
-Please read the oficial documentation at https://2captcha.com/support/faq/30/ for
+Please read the oficial documentation at https://2captcha.com/en-api-recaptcha for
 more information.
 
   ```ruby
-  client.decode(url: 'http://bit.ly/1xXZcKo', id_constructor: 23)
+  client.decode(url: 'http://bit.ly/clickcaptcha', coordinatescaptcha: 1)
   ```
 
 **Captcha (screenshot)**
@@ -117,13 +115,12 @@ more information.
 
 ![Example of a captcha based on image clicks](captchas/2.jpg)
 
-The response will be an array containing the indexes for each image that should
-be clicked counting from left to right. For the captcha above it should look
-something like:
+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.indexes
-[1, 9]
+# captcha.coordinates
+[[234, 330], [48, 137]]
 ```
 
 ## Notes

data/lib/two_captcha.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'json'
 require 'net/http'
+require 'openssl'
 
 # The module TwoCaptcha contains all the code for the two_captcha gem.
 # It acts as a safely namespace that isolates logic from TwoCaptcha from any

data/lib/two_captcha/client.rb

@@ -55,6 +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.
     #
     # @return [TwoCaptcha::Captcha] The captcha (with solution) if an error is
     #                               not raised.
@@ -88,7 +89,7 @@ module TwoCaptcha
       args[:body]   = options[:raw64]
       args[:method] = 'base64'
       [:phrase, :regsense, :numeric, :calc, :min_len, :max_len, :language,
-       :header_acao, :id_constructor].each do |key|
+       :header_acao, :id_constructor, :coordinatescaptcha].each do |key|
         args[key] = options[key] if options[key]
       end
       response = request('in', :multipart, args)

data/lib/two_captcha/models/captcha.rb

@@ -7,5 +7,9 @@ module TwoCaptcha
     def indexes
       text.gsub('click:', '').split(/[^0-9]/).map(&:to_i)
     end
+
+    def coordinates
+      text.scan(/x=([0-9]+),y=([0-9]+)/).map { |x, y| [x.to_i, y.to_i] }
+    end
   end
 end

data/lib/two_captcha/version.rb

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

data/spec/lib/client_spec.rb

@@ -4,7 +4,7 @@ key              = CREDENTIALS['key']
 captcha_id       = CREDENTIALS['captcha_id']
 captcha_solution = CREDENTIALS['solution']
 image64          = Base64.encode64(File.open('captchas/1.png', 'rb').read)
-recaptcha64      = Base64.encode64(File.open('captchas/2.jpg', 'rb').read)
+clickable64      = Base64.encode64(File.open('captchas/2.jpg', 'rb').read)
 
 describe TwoCaptcha::Client do
   describe 'create' do
@@ -58,15 +58,23 @@ describe TwoCaptcha::Client do
     end
   end
 
-  context 'new reCAPTCHA' do
+  context 'clickable CAPTCHA' do
     before(:all) { @client = TwoCaptcha.new(key) }
 
     describe '#decode!' do
-      before(:all) { @captcha = @client.decode!(raw64: recaptcha64, id_constructor: 23) }
+      before(:all) do
+        @captcha = @client.decode!(raw64: clickable64, coordinatescaptcha: 1)
+        @xy1, @xy2 = @captcha.coordinates.sort_by { |e| e[0] }
+      end
 
       it { expect(@captcha).to be_a(TwoCaptcha::Captcha) }
-      it { expect(@captcha.indexes).to eq([1, 9]) }
       it { expect(@captcha.id).to match(/[0-9]{9}/) }
+
+      it { expect(@captcha.coordinates.size).to eq(2) }
+      it { expect(@xy1[0]).to be_between(9, 99).inclusive }
+      it { expect(@xy1[1]).to be_between(97, 187).inclusive }
+      it { expect(@xy2[0]).to be_between(187, 279).inclusive }
+      it { expect(@xy2[1]).to be_between(276, 366).inclusive }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Marcelo Mita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler