geetest_ruby_sdk 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f67d9fe2e2bbb890315f13c0214eed4701469d9ec0d44f83dc5b27857e5e68
-  data.tar.gz: 1e036fc6881bd36939e8906e7d654de5c3a1c3a5b8a18622b2235ef60faa9bfc
+  metadata.gz: 821275cdf801ef0f419d8b19257c7968f60fd1844af7b423f3309021e7b5e9da
+  data.tar.gz: ca687f43eb5d4f57d5a1b21294042eeb97e49735094c04e9bbd89494f7a2f912
 SHA512:
-  metadata.gz: 0af8da7eab3fe0bcda683c48b5e0a5684c889374ba94cd6da3b7a747fccb360054c88deef110f3d4d108d8aafb31daaa21df57153c6b9305919b27024635086e
-  data.tar.gz: 66094c37b4d7dd3b9e636b89851a3bfaf9aa8d2c86c7ee5dec32e6e918ee3b00adb3515e40a2ff61245e3cbb24b226e700005dd2a9a5f133caf57314fe6cbdd9
+  metadata.gz: b31d970fe4a4ed029a43baac51ffe563bb5b131548fcddf033013dd7bb513b3963992921f5b55e328954acbbddf594e64d5050913c57599878eaee1b9866eaf5
+  data.tar.gz: 7adc639a9c1eb2eca5269f7d8555e169f4f0689a6689966463d7939db2f48fa084e8f480bd06eab63bcfe1d6469f646bdcf6c2834e4dcf07acee4b2fba5b5b8c

data/.github/workflows/main.yml

@@ -0,0 +1,23 @@
+name: Main
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    env:
+      RAILS_ENV: test
+      GEMFILE_RUBY_VERSION: 2.7.6
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'logger'
-gem 'openssl', '~> 2.2'
 gem 'rest-client'
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geetest_ruby_sdk (4.0.3)
+    geetest_ruby_sdk (4.0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -18,14 +18,11 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    ipaddr (1.2.4)
     logger (1.5.1)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     netrc (0.11.0)
-    openssl (2.2.2)
-      ipaddr
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -83,7 +80,6 @@ DEPENDENCIES
   bundler (~> 2.0)
   geetest_ruby_sdk!
   logger
-  openssl (~> 2.2)
   rake (~> 12.0)
   rest-client
   rspec (~> 3.0)

data/lib/geetest/v3/account.rb

@@ -33,12 +33,17 @@ module Geetest
         @digest_mod = options.fetch(:digest_mod, Account::DEFAULT_DIGEST_MOD)
       end
 
-      def register(**options)
-        Register.new(account: self).register(options)
+      def register(options = {})
+        Register.new(account: self).register(**options)
       end
 
-      def validate?(challenge: nil, validate: nil, seccode: nil, **options)
-        Validator.new(account: self).valid?(challenge, validate, seccode, options)
+      def validate?(data = {})
+        options = data.transform_keys(&:to_sym)
+        challenge = options.delete(:challenge)
+        validate = options.delete(:validate)
+        seccode = options.delete(:seccode)
+
+        Validator.new(account: self).valid?(challenge, validate, seccode, **options)
       end
     end
   end

data/lib/geetest/v4/account.rb

@@ -16,16 +16,10 @@ module Geetest
         @api_server = URI.parse options.fetch(:api_server, DEFAULT_API_SERVER)
       end
 
-      def validate?(lot_number: nil, captcha_output: nil, pass_token: nil, gen_time: nil, **options)
-        return false unless lot_number && captcha_output && pass_token && gen_time
+      def validate?(data = {})
+        payload, options = prepare_payload(data)
+        return false if payload.nil?
 
-        payload = {
-          lot_number: lot_number,
-          captcha_output: captcha_output,
-          pass_token: pass_token,
-          gen_time: gen_time,
-          sign_token: Encryptor.encrypt(lot_number).with(captcha_key).by(DIGEST_MOD).to_s
-        }
         response = request! payload, options
         Geetest.logger.debug "Geetest validate failed, reason: #{response['reason']}" if response['result'] != 'success'
         response['result'] == 'success'
@@ -36,6 +30,20 @@ module Geetest
 
       private
 
+      def prepare_payload(data)
+        options = data.transform_keys(&:to_sym)
+        payload = {
+          lot_number: options.delete(:lot_number),
+          captcha_output: options.delete(:captcha_output),
+          pass_token: options.delete(:pass_token),
+          gen_time: options.delete(:gen_time)
+        }.compact
+        return [nil, nil] unless payload.size == 4
+
+        payload[:sign_token] = Encryptor.encrypt(payload[:lot_number]).with(captcha_key).by(DIGEST_MOD).to_s
+        [payload, options]
+      end
+
       def request!(payload, options = {})
         response = RestClient.post "#{api_server}/validate?captcha_id=#{captcha_id}", options.merge(payload)
         JSON.parse response.body

data/lib/geetest_ruby_sdk/version.rb

@@ -1,3 +1,3 @@
 module GeetestRubySdk
-  VERSION = '4.0.3'
+  VERSION = '4.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geetest_ruby_sdk
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Yuehao Hua
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Ruby version of Geetest SDK