rucaptcha 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d19351a61db05ab5f038cca14190d70473117a8
-  data.tar.gz: 17f368f3e963f2bc89597ea6489c61eb1013be94
+  metadata.gz: 0c8619ffa153f60752223f1f764b7145849b1b4b
+  data.tar.gz: f7d6b3358ba52b86886550e41902cee4220bec28
 SHA512:
-  metadata.gz: 1c92ef1378ecfba89ec2aca42e88336690cc23a8e24dde0e0dfeadfe9e9f60e9fd389f3921c3167f3f014b5dbbce9a0e1058a6d39c582ea36a2fc8b37767f1b9
-  data.tar.gz: b4f5acca22355975f074cc20d0ec6822c4960b8103993b9524e79ae2c4e696c83b34e755189d803a2ab6b91a0384e9840b234ae7f454a5b32223ca998afcb6cf
+  metadata.gz: aa2eebcabe01dca90464094dbd7bc367d09c7ab230c2f80a60acada970df844821affeb074ddfba828240576c7b9aa22ed6aed504a4144ce066ef2103580f301
+  data.tar.gz: 1f8a4758678ff5b44a94572db65ab6eb7040f451254b58dddeeddc8aa8e4b380805cbd27b994f8fa78f8fad0fb68ba74bb60b8b30ea65869d93bf0a808697915

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+0.5.0
+
+- Fix cache with Rails 5.
+
 0.4.5
+-----
 
 - Removed `posix-spawn` dependency, used open3 instead (core funciontality), JRuby compatible (#24)
 
 0.4.4
+-----
 
 - Remove deprecated `width`, `height` config.
 - Delete session key after verify (#23).

data/lib/rucaptcha.rb

@@ -25,11 +25,6 @@ module RuCaptcha
 
     def configure(&block)
       config.instance_exec(&block)
-
-      # enable cache if cache_limit less than 1
-      if config.cache_limit >= 1
-        RuCaptcha::Captcha.send(:include, RuCaptcha::Cache)
-      end
     end
   end
 end

data/lib/rucaptcha/cache.rb

@@ -3,30 +3,27 @@ require 'fileutils'
 module RuCaptcha
   # File Cache
   module Cache
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        alias_method_chain :create, :cache
-        alias_method_chain :random_chars, :cache
+    def self.prepended(base)
+      class << base
+        prepend ClassMethods
       end
     end
 
     module ClassMethods
-      def create_with_cache(code)
-        cache.fetch(code) do
-          create_without_cache(code)
+      def create(code)
+        cache.fetch(code, expires_in: 1.days) do
+          super(code)
         end
       end
 
-      def random_chars_with_cache
+      def random_chars
         if cached_codes.length >= RuCaptcha.config.cache_limit
           return cached_codes.sample
-        else
-          code = random_chars_without_cache
-          cached_codes << code
-          return code
         end
+
+        code = super
+        cached_codes << code
+        code
       end
 
       def cache
@@ -35,7 +32,8 @@ module RuCaptcha
         cache_path = Rails.root.join('tmp', 'cache', 'rucaptcha')
         FileUtils.mkdir_p(cache_path) unless File.exist? cache_path
         @cache = ActiveSupport::Cache::FileStore.new(cache_path)
-        @cache.clear
+        # clear expired captcha cache files on Process restart
+        @cache.cleanup
         @cache
       end
 

data/lib/rucaptcha/captcha.rb

@@ -77,7 +77,7 @@ module RuCaptcha
           png_file_path
         else
           command.strip!
-          out, err, st = Open3.capture3(command)
+          out, err, _st = Open3.capture3(command)
           raise "RuCaptcha: #{err.strip}" if err.present?
           out
         end

data/lib/rucaptcha/engine.rb

@@ -1,5 +1,12 @@
 module RuCaptcha
   class Engine < ::Rails::Engine
     isolate_namespace RuCaptcha
+
+    initializer 'rucaptcha.prepend.cache' do
+      # enable cache if cache_limit less than 1
+      if RuCaptcha.config.cache_limit >= 1
+        RuCaptcha::Captcha.send(:prepend, RuCaptcha::Cache)
+      end
+    end
   end
 end

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason Lee
@@ -9,49 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-05-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
+dependencies: []
 description: 
 email: huacnlee@gmail.com
 executables: []