captcha_solver 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb552923bd6768418ba4fad4480c7cb95971949d6f5c6b3f0dc62ef8c4adbd2f
-  data.tar.gz: f1fc27b083b6399ecd367d6da461afc60733cebd3df0354193f99ed920fba4ce
+  metadata.gz: 04f4869b6dabc49cc2e82c1a91e50c1cadffce98dd777709951a692293887879
+  data.tar.gz: 07471d70d929a512e66347278c65347dd48f7908722646a17fa17af35452134f
 SHA512:
-  metadata.gz: 988782a644cba122259eed79f3af63cba859204cd42313bde0c7d4ae43a357426dd018148d1fb74c6264d0a2cea6f96906889232ed9357a2dc12785d06f936aa
-  data.tar.gz: 7de72ce2784bd5aa34069e102efc9f53da879f3a59400870192cfd8d5c27db5c4bb012d2c0202532964d9f7d0d6ccad58e9c1b668571d163dc7b70994c18663b
+  metadata.gz: f85e580b4cd6f207e8d5a32f7eb3f5f5560e242723c46c935618bfb98e507c4fa6df63e418513e81abfa1e264aeaefc3b06ad49793d744ab0abf358fa05c3fda
+  data.tar.gz: ab993f1ff6f048c4d5d50e003d0bff35e99f506723b6c68d4c7da9ebac0b9b69880c8c20c5ef19d3d1bfa8472bfa8cb00e792fb085d4027297732941f4fef693

data/lib/captcha_solver/base.rb

@@ -36,7 +36,7 @@ module CaptchaSolver
       raise NotSolvedError.new(complete_response&.body)
     end
 
-    # Returns solved captcha
+    # Returns solved captcha.
     def solved_captcha
       return nil unless solved?
       captcha_value
@@ -44,79 +44,91 @@ module CaptchaSolver
 
     private
 
-    # Headers that have to be passed in each request. Use it in the child class
+    # Headers that have to be passed in each request.
     def default_request_headers
       { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded' }
     end
 
-    # Params that have to be passed in each request. Use it in the child class
+    # Parameters that have to be passed in each request.
     def default_request_params
       { key: rucaptcha_api_key, json: 1 }
     end
 
-    # Makes a in.php request. Response must be returned as JSON
-    def make_start_request
-      raise NotImplementedError.new('#make_start_request method must be implemented')
+    # Parameters which are used in in.php request.
+    def start_request_params
+      raise NotImplementedError.new('#start_request_params method must be implemented')
     end
 
-    # Calls #make_start_request and saves the result in @start_response
+    # Makes a in.php request and saves the result in @start_response.
     def start
-      @start_response = make_start_request
+      @start_response = RestClient::Request.execute(
+        method: :post,
+        url: 'http://rucaptcha.com/in.php',
+        proxy: "http://#{proxy_address}",
+        headers: default_request_headers,
+        payload: default_request_params.merge(start_request_params)
+      )
     end
 
-    # Parses response from in.php request and returns rucaptcha id
+    # Parses response from in.php request and returns rucaptcha id.
     def rucaptcha_id
       return nil if start_response.nil?
       JSON.parse(start_response.body)['request']
     end
 
-    # Checks if a in.php request is successful
+    # Checks if a in.php request is successful.
     def started?
       return false if start_response.nil?
       return false if errors_regexp.match?(start_response.body)
       !rucaptcha_id.nil?
     end
 
-    # Makes a res.php request. Response must be returned as JSON
-    def make_complete_request
-      raise NotImplementedError.new('#make_complete_request method must be implemented')
+    # Parameters which are used in res.php request.
+    def complete_request_params
+      { id: rucaptcha_id, action: 'get' }
     end
 
-    # Calls #make_complete_request and saves the result in @complete_response
+    # Makes a res.php request and saves the result in @complete_response.
     def complete
       return nil unless started?
-      @complete_response = make_complete_request
+      @complete_response = RestClient::Request.execute(
+        method: :post,
+        url: 'http://rucaptcha.com/res.php',
+        proxy: "http://#{proxy_address}",
+        headers: default_request_headers,
+        payload: default_request_params.merge(complete_request_params)
+      )
     end
 
-    # Checks if captcha solving is failed
+    # Checks if captcha solving is failed.
     def failed?
       return false if complete_response.nil?
       errors_regexp.match? complete_response.body
     end
 
-    # Checks if captcha is solved
+    # Checks if captcha is solved.
     def solved?
       return false if complete_response.nil?
       return false if failed?
       !not_ready_regexp.match?(complete_response.body) && !captcha_value.nil?
     end
 
-    # Parses response from res.php request and returns captcha value
+    # Parses response from res.php request and returns captcha value.
     def captcha_value
       JSON.parse(complete_response.body)['request']
     end
 
-    # The error that is returned by res.php request if captcha is not solved yet
+    # The error that is returned by res.php request if captcha is not solved yet.
     def not_ready_regexp
       /CAPCHA_NOT_READY/i
     end
 
-    # Any error that might be returned by in.php or res.php request
+    # Any error that might be returned by in.php or res.php request.
     def errors_regexp
       /(ERROR|BANNED|MAX_USER_TURN|REPORT_NOT_RECORDED)/i
     end
 
-    # Makes a delay between requests
+    # Makes a delay between requests.
     def wait_for(seconds)
       puts "Waiting for #{seconds} seconds"
       seconds.times do |i|

data/lib/captcha_solver/recaptcha_v1.rb

@@ -2,7 +2,6 @@ require 'base64'
 
 module CaptchaSolver
   class RecaptchaV1 < Base
-
     attr_reader :image_path, :help_params
 
     def initialize(args)
@@ -43,40 +42,21 @@ module CaptchaSolver
       }[help_params[:language].to_sym] || 0
     end
 
-    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(
-          body: base64_image,
-          method: :base64,
-          phrase: phrase,
-          regsense: register_sensitive,
-          numeric: numeric,
-          calc: calculation,
-          language: language,
-        )
-      )
-    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
-
     def base64_image
       @base64_image ||=
         File.open(image_path, 'rb') { |file| Base64.encode64(file.read) }
     end
+
+    def start_request_params
+      {
+        body: base64_image,
+        method: 'base64',
+        phrase: phrase,
+        regsense: register_sensitive,
+        numeric: numeric,
+        calc: calculation,
+        language: language,
+      }
+    end
   end
 end

data/lib/captcha_solver/recaptcha_v2.rb

@@ -10,31 +10,12 @@ module CaptchaSolver
 
     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'
-        )
-      )
+    def start_request_params
+      {
+        method: 'userrecaptcha',
+        googlekey: google_key,
+        pageurl: page_url
+      }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captcha_solver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Randi Korhonen