captcha_solver 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ed3564d211ceb7a85f8c30d69e260cc2e894e244fbb43632b4dec636f76a5b
-  data.tar.gz: c010d83f964d6bf5ffd3af41d8d7e5bef9d7da0096d8562f8f463bbc2f98e25f
+  metadata.gz: 1b3f328452ef3fc2ff920e8f87336ea979152e7f33a243887e25e45f88e3cbb4
+  data.tar.gz: 851f4d47bf4bb394c8651d5711b15828b15be85abc422e6fe3bb4eb637aaa43e
 SHA512:
-  metadata.gz: ed9ce33144a282c63f7bd6b4f195d13aac583454774d2c3fe6b45eb647c81f181876f17ec4c9cc75a8c29a7d31983cde4eb78f42781b9ade01af05f3e9a82432
-  data.tar.gz: 5969a50b29d16ebd0e1fe32d033200c53549840aec35db05ab85fb842b68c336af35395845acf8a44445ab9a3c4ce50a51b7ae32c5bc601d5d27e66e35ac0e1f
+  metadata.gz: 91ff9c119d6a048bdcab810e414c4a55e77b4bf02a25ca6d0909777c7765e13914339c98030dc8b4b1c4526d9a2392d68e90b4b6fd653b31840af72a77f7eb84
+  data.tar.gz: 686cd8c8c7e39b6baa71aea17b81fa1c5654147fb0ce2be8418d17c623bd99e2d187d9427410b29a0a62faaaa6d4f5104308bf2b47f16461332aeebd764faf11

data/lib/captcha_solver/base.rb

@@ -11,7 +11,7 @@ module CaptchaSolver
     attr_reader :rucaptcha_api_key, :proxy_address,
       :start_response, :complete_response
 
-    def initialize(args)
+    def initialize(args = {})
       @rucaptcha_api_key = ENV['rucaptcha_api_key']
       @proxy_address = args[:proxy_address]
     end
@@ -66,15 +66,15 @@ module CaptchaSolver
 
     # Parses response from in.php request and returns rucaptcha id
     def rucaptcha_id
-      return nil if start_response.blank?
+      return nil if start_response.nil?
       JSON.parse(start_response.body)['request']
     end
 
     # Checks if a in.php request is successful
     def started?
-      return false if start_response.blank?
+      return false if start_response.nil?
       return false if errors_regexp.match?(start_response.body)
-      rucaptcha_id.present?
+      !rucaptcha_id.nil?
     end
 
     # Makes a res.php request. Response must be returned as JSON
@@ -90,15 +90,15 @@ module CaptchaSolver
 
     # Checks if captcha solving is failed
     def failed?
-      return false if complete_response.blank?
+      return false if complete_response.nil?
       errors_regexp.match? complete_response.body
     end
 
     # Checks if captcha is solved
     def solved?
-      return false if complete_response.blank?
+      return false if complete_response.nil?
       return false if failed?
-      !not_ready_regexp.match?(complete_response.body) && captcha_value.present?
+      !not_ready_regexp.match?(complete_response.body) && !captcha_value.nil?
     end
 
     # Parses response from res.php request and returns captcha value

data/lib/captcha_solver/recaptcha_v2.rb

@@ -0,0 +1,40 @@
+module CaptchaSolver
+  class RecaptchaV2 < Base
+    attr_reader :google_key, :page_url
+
+    def initialize(args)
+      super
+      @google_key = args[:google_key]
+      @page_url = args[:page_url]
+    end
+
+    private
+
+    def make_start_request
+      RestClient::Request.execute(
+        method: :post,
+        url: 'http://rucaptcha.com/in.php',
+        proxy: "http://#{proxy_address}",
+        headers: default_request_headers,
+        payload: default_request_params.merge(
+          method: 'userrecaptcha',
+          googlekey: google_key,
+          pageurl: page_url
+        )
+      )
+    end
+
+    def make_complete_request
+      RestClient::Request.execute(
+        method: :post,
+        url: 'http://rucaptcha.com/res.php',
+        proxy: "http://#{proxy_address}",
+        headers: default_request_headers,
+        payload: default_request_params.merge(
+          id: rucaptcha_id,
+          action: 'get'
+        )
+      )
+    end
+  end
+end

data/lib/captcha_solver.rb

@@ -1,4 +1,7 @@
+require 'rest-client'
+
 require 'captcha_solver/base'
+require 'captcha_solver/recaptcha_v2'
 
 module CaptchaSolver
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captcha_solver
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Randi Korhonen
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-05-03 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: Gem that uses RuCaptcha API to solver any type of captcha
 email: randikorhonen@gmail.com
 executables: []
@@ -18,6 +32,7 @@ extra_rdoc_files: []
 files:
 - lib/captcha_solver.rb
 - lib/captcha_solver/base.rb
+- lib/captcha_solver/recaptcha_v2.rb
 homepage: https://rubygems.org/gems/captcha_solver
 licenses:
 - MIT