racaptcha 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd350dc677de5fe1ce13a3eba19cd6fc13c30a9c1b44bc637159052048ad7546
-  data.tar.gz: 9d96dfa982a4ad938527503b7d016d0676dca65b549130a49386f14e680590ec
+  metadata.gz: 44a2c6f49f4b55bcb3c88f3fc6f0e6693f61fee8d392a6cedb921524641bd5e9
+  data.tar.gz: 5620531b8a5e2924a87a751f6a282360f410342ca3d1f87dc7021a4ba3c83571
 SHA512:
-  metadata.gz: eb0b70aa4e1eba0163423978537baa80db9b454240181b12b6d281a5049b7d5cb5e96bb526c6433784e79ce4981c259f307d02ce8a1de4260d6e50db47cdd13c
-  data.tar.gz: de457a2212c8ea03e03cf16a571be3746dbe7b57c2d09915135c84ee3d244fa34a262d6d11fb313bbbe44336cbd9ebdf77cd19c1459416440502e133ad691d04
+  metadata.gz: 31273910d07ab1a8b9e54520072df00862e10a9707e7b0af0ea8b6a4c369e16ef7bca5f3f7fdaf590b838573cbf5d8d628d5b7f711263158a4c6df6606203599
+  data.tar.gz: e3ff4cc023e22b70aef4bf0e79f870b983f66e8729701db0cbca595368d92da5004c647a448bfbd6d297e035c0e349dd4af856c4671b3dc29d41de1d779e6fbe

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/configuration.rb

@@ -15,25 +15,5 @@ module RaCaptcha
     attr_accessor :outline
     # skip_cache_store_check, default: false
     attr_accessor :skip_cache_store_check
-
-    def initialize
-      @cache_store            = :file_store
-      @expires_in             = 2.minutes
-      @style                  = :colorful
-      @length                 = 5
-      @strikethrough          = true
-      @outline                = false
-      @skip_cache_store_check = false
-    end
-  end
-
-  class << self
-    def setup
-      yield config
-    end
-
-    def config
-      @config ||= Configuration.new
-    end
   end
 end

data/lib/racaptcha/version.rb

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

data/lib/racaptcha.rb

@@ -1,17 +1,27 @@
 require "active_support/all"
-require "racaptcha/configuration"
 require "racaptcha/version"
+require "racaptcha/configuration"
+require "racaptcha/cache"
 require "racaptcha/errors/configuration"
 require "racaptcha/racaptcha"
 
 module RaCaptcha
   class << self
+    def config
+      return @config if defined?(@config)
+
+      @config = Configuration.new
+      @config.style = :colorful
+      @config.length = 4
+      @config.strikethrough = true
+      @config.outline = false
+      @config.expires_in = 2.minutes
+      @config.skip_cache_store_check = false
+      @config
+    end
 
-    def cache
-      return @cache if defined? @cache
-
-      @cache = ActiveSupport::Cache.lookup_store(config.cache_store)
-      @cache
+    def configure(&block)
+      config.instance_exec(&block)
     end
 
     # generate new captcha without cache
@@ -35,8 +45,9 @@ module RaCaptcha
         code: res[0],
         time: Time.now.to_i
       }
-      cache.write(generate_cache_key(cache_key), _val, expires_in: 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
@@ -50,23 +61,23 @@ module RaCaptcha
       options ||= {}
 
       _key = generate_cache_key(options[:cache_key])
-      store_info = cache.read(_key)
+      store_info = RaCaptcha.cache.read(_key)
       # Make sure move used key
-      cache.delete(_key) unless options[:keep_cache]
+      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]) > 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.2.4.3'
   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.2
+  version: 0.3.0
 platform: ruby
 authors:
 - wangrui
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 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.2.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
 - !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