racaptcha 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80c7408ad417d8f3fea20f1d934334f37de3289fc90165d16f23b3c84715d13
-  data.tar.gz: f1d66f613aee6a35590db8ead09bb92cebe8bb75e44f371c80290eeaf2e3597d
+  metadata.gz: 44a2c6f49f4b55bcb3c88f3fc6f0e6693f61fee8d392a6cedb921524641bd5e9
+  data.tar.gz: 5620531b8a5e2924a87a751f6a282360f410342ca3d1f87dc7021a4ba3c83571
 SHA512:
-  metadata.gz: 4ef9ca7b1aa9eef11426535e5c09e3ce64325e5674c691c1e3c2e87d42980c5ec1082262c2cd73c6ae6ba934f3919134709e8921a78de01517e2841cd5e1d3ac
-  data.tar.gz: 22c419b540e631434119e0bc6903f4c564493d4154a7d805c9afa4b20dffb6193b9713fedbfc26e412adc5d0b78b23b7e45e1163638d2d1e2239f1f03966de40
+  metadata.gz: 31273910d07ab1a8b9e54520072df00862e10a9707e7b0af0ea8b6a4c369e16ef7bca5f3f7fdaf590b838573cbf5d8d628d5b7f711263158a4c6df6606203599
+  data.tar.gz: e3ff4cc023e22b70aef4bf0e79f870b983f66e8729701db0cbca595368d92da5004c647a448bfbd6d297e035c0e349dd4af856c4671b3dc29d41de1d779e6fbe

data/Gemfile.lock

@@ -1,29 +1,28 @@
 PATH
   remote: .
   specs:
-    racaptcha (0.1.0)
-      activesupport (>= 5.0)
+    racaptcha (0.2.2)
+      activesupport (>= 5.2.4.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
+    minitest (5.15.0)
     rake (13.0.1)
     rake-compiler (1.1.0)
       rake
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -33,4 +32,4 @@ DEPENDENCIES
   rake-compiler (~> 1)
 
 BUNDLED WITH
-   2.0.1
+   2.3.12

data/lib/racaptcha/cache.rb

@@ -0,0 +1,12 @@
+require "fileutils"
+
+module RaCaptcha
+  class << self
+    def cache
+      return @cache if defined? @cache
+
+      @cache = ActiveSupport::Cache.lookup_store(RaCaptcha.config.cache_store)
+      @cache
+    end
+  end
+end

data/lib/racaptcha/version.rb

@@ -1,3 +1,3 @@
 module RaCaptcha
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/racaptcha.rb

@@ -1,8 +1,9 @@
 require "active_support/all"
-require "racaptcha/racaptcha"
 require "racaptcha/version"
 require "racaptcha/configuration"
+require "racaptcha/cache"
 require "racaptcha/errors/configuration"
+require "racaptcha/racaptcha"
 
 module RaCaptcha
   class << self
@@ -10,29 +11,19 @@ module RaCaptcha
       return @config if defined?(@config)
 
       @config = Configuration.new
-      @config.style         = :colorful
-      @config.length        = 5
+      @config.style = :colorful
+      @config.length = 4
       @config.strikethrough = true
-      @config.outline       = false
-      @config.expires_in    = 2.minutes
+      @config.outline = false
+      @config.expires_in = 2.minutes
       @config.skip_cache_store_check = false
-
-      @config.cache_store = :file_store
-      @config.cache_store
       @config
     end
 
-    def setup(&block)
+    def configure(&block)
       config.instance_exec(&block)
     end
 
-    def cache
-      return @cache if defined? @cache
-
-      @cache = ActiveSupport::Cache.lookup_store(RaCaptcha.config.cache_store)
-      @cache
-    end
-
     # generate new captcha without cache
     def generate
       style = config.style == :colorful ? 1 : 0
@@ -49,13 +40,14 @@ module RaCaptcha
 
     # generate new captcha with cache
     def generate_captcha(cache_key = nil)
-      res = RaCaptcha.generate
+      res = generate
       _val = {
         code: res[0],
         time: Time.now.to_i
       }
-      RaCaptcha.cache.write(generate_cache_key(cache_key), _val, expires_in: RaCaptcha.config.expires_in)
-      res[1]
+      RaCaptcha.cache.write(generate_cache_key(cache_key), _val, expires_in: config.expires_in)
+      # 验证码图片，验证码，缓存key
+      [res[1], res[0], cache_key]
     end
 
     # verify captcha
@@ -74,18 +66,18 @@ module RaCaptcha
       RaCaptcha.cache.delete(_key) unless options[:keep_cache]
 
       # Make sure session exist
-      return false if store_info.blank?
+      return [false, "未找到存储的验证码"] if store_info.blank?
 
       # Make sure not expire
-      return false if (Time.now.to_i - store_info[:time]) > RaCaptcha.config.expires_in
+      return [false, "验证码已过期"] if (Time.now.to_i - store_info[:time]) > config.expires_in
 
       # Make sure have captcha
-      captcha = (options[:captcha] || "").downcase.strip
-      return false if captcha.blank?
+      captcha = options[:captcha].to_s.downcase.strip
+      return [false, "请传递用户输入的验证码"] if captcha.blank?
 
-      return false if captcha != store_info[:code]
+      return [false, "验证码无效"] if captcha != store_info[:code]
 
-      true
+      return [true, "验证码正确"]
     end
 
     private

data/racaptcha.gemspec

@@ -38,6 +38,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
   spec.extensions            = %w[ext/racaptcha/extconf.rb]
 
-  spec.add_runtime_dependency 'activesupport', '>= 5.0'
   spec.add_development_dependency 'rake-compiler', '~> 1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: racaptcha
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - wangrui
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +48,7 @@ files:
 - ext/racaptcha/font.h
 - ext/racaptcha/racaptcha.c
 - lib/racaptcha.rb
+- lib/racaptcha/cache.rb
 - lib/racaptcha/configuration.rb
 - lib/racaptcha/errors/configuration.rb
 - lib/racaptcha/version.rb
@@ -89,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.11
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: This is a Captcha gem for ruby.