racaptcha 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80c7408ad417d8f3fea20f1d934334f37de3289fc90165d16f23b3c84715d13
-  data.tar.gz: f1d66f613aee6a35590db8ead09bb92cebe8bb75e44f371c80290eeaf2e3597d
+  metadata.gz: bd350dc677de5fe1ce13a3eba19cd6fc13c30a9c1b44bc637159052048ad7546
+  data.tar.gz: 9d96dfa982a4ad938527503b7d016d0676dca65b549130a49386f14e680590ec
 SHA512:
-  metadata.gz: 4ef9ca7b1aa9eef11426535e5c09e3ce64325e5674c691c1e3c2e87d42980c5ec1082262c2cd73c6ae6ba934f3919134709e8921a78de01517e2841cd5e1d3ac
-  data.tar.gz: 22c419b540e631434119e0bc6903f4c564493d4154a7d805c9afa4b20dffb6193b9713fedbfc26e412adc5d0b78b23b7e45e1163638d2d1e2239f1f03966de40
+  metadata.gz: eb0b70aa4e1eba0163423978537baa80db9b454240181b12b6d281a5049b7d5cb5e96bb526c6433784e79ce4981c259f307d02ce8a1de4260d6e50db47cdd13c
+  data.tar.gz: de457a2212c8ea03e03cf16a571be3746dbe7b57c2d09915135c84ee3d244fa34a262d6d11fb313bbbe44336cbd9ebdf77cd19c1459416440502e133ad691d04

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

@@ -15,5 +15,25 @@ 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.1"
+  VERSION = "0.2.2"
 end

data/lib/racaptcha.rb

@@ -1,35 +1,16 @@
 require "active_support/all"
-require "racaptcha/racaptcha"
-require "racaptcha/version"
 require "racaptcha/configuration"
+require "racaptcha/version"
 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        = 5
-      @config.strikethrough = true
-      @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)
-      config.instance_exec(&block)
-    end
 
     def cache
       return @cache if defined? @cache
 
-      @cache = ActiveSupport::Cache.lookup_store(RaCaptcha.config.cache_store)
+      @cache = ActiveSupport::Cache.lookup_store(config.cache_store)
       @cache
     end
 
@@ -49,12 +30,12 @@ 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)
+      cache.write(generate_cache_key(cache_key), _val, expires_in: config.expires_in)
       res[1]
     end
 
@@ -69,15 +50,15 @@ module RaCaptcha
       options ||= {}
 
       _key = generate_cache_key(options[:cache_key])
-      store_info = RaCaptcha.cache.read(_key)
+      store_info = cache.read(_key)
       # Make sure move used key
-      RaCaptcha.cache.delete(_key) unless options[:keep_cache]
+      cache.delete(_key) unless options[:keep_cache]
 
       # Make sure session exist
       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

data/racaptcha.gemspec

@@ -38,6 +38,6 @@ 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_runtime_dependency 'activesupport', '>= 5.2.4.3'
   spec.add_development_dependency 'rake-compiler', '~> 1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racaptcha
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - wangrui
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -89,8 +89,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.