rucaptcha 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5dc2eab0dce97fc48b2785dd334c40a4e56478
-  data.tar.gz: 6260f7dfde2dd1c4ab3ec7724d8e1e3d207f0ac8
+  metadata.gz: 7eb3d814d1abc1f5a0e0697ab96db602c4e8a716
+  data.tar.gz: c57741d52df52d8b57fa724a55ece1240cd028c3
 SHA512:
-  metadata.gz: 90b1cf57de8baa5a48411565437bc71eec34753a4a5fdf88b9b58f054d00a75b1d3df84aa2cd0544c7287f0ff5d59bf897a9c355fe9ca55e04355d07ac8cd30b
-  data.tar.gz: f6ffd1634b07751ebbf19207ef45864c3bf4ff99c2333e1c7a5510fa3db844a3dbbad5808a5ec119322dfffc52781feb08d49fcaabb623a8b335cdf2b3bc14c0
+  metadata.gz: d636f015eb7350878264ea6b5f9b966a2ff7cd7a9ca42d932f3b6ad00814ad0cd997e407ffdea89399e7db95758626b04f57a9bc9a635837022d7153a0ea555d
+  data.tar.gz: 1333a867127f01c83fe2554d453c7fd9061581d167aeccf2bd8ea4bd5ceef45d0f71e884d5c206fef179d7a2b654329aa95e58dca0b0b0331f2109dd5cb2c353

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+2.1.0
+-----
+
+- Mount Router by default, not need config now.
+- Default use [:file_store, 'tmp/cache/rucaptcha/session'] as RuCaptcha.config.cache_store, now it can work without any configurations.
+
+> NOTE: But you still need care about `config.cache_store` to setup on a right way.
+
 2.0.3
 -----
 

data/README.md

@@ -35,28 +35,20 @@ RuCaptcha.configure do
   # self.style = :colorful
   # Custom captcha code expire time if you need, default: 2 minutes
   # self.expires_in = 120
-  # [Requirement/重要]
+  # [Requirement / 重要]
   # Store Captcha code where, this config more like Rails config.cache_store
   # default: Read config info from `Rails.application.config.cache_store`
   # But RuCaptcha requirements cache_store not in [:null_store, :memory_store, :file_store]
-  # 默认：会从 Rails 配置的 cache_store 里面读取相同的配置信息，用于存储验证码字符
+  # 默认：会从 Rails 配置的 cache_store 里面读取相同的配置信息，并尝试用可以运行的方式，用于存储验证码字符
   # 但如果是 [:null_store, :memory_store, :file_store] 之类的，你可以通过下面的配置项单独给 RuCaptcha 配置 cache_store
   self.cache_store = :mem_cache_store
 end
 ```
 
-Edit `config/routes.rb`, add the following code:
-
-```rb
-Rails.application.routes.draw do
-  ...
-  mount RuCaptcha::Engine => "/rucaptcha"
-  ...
-end
-```
-
 Controller `app/controller/account_controller.rb`
 
+When you called `verify_rucaptcha?`, it will uses value from `params[:_rucaptcha]` to validation.
+
 ```rb
 class AccountController < ApplicationController
   def create
@@ -68,6 +60,17 @@ class AccountController < ApplicationController
     end
   end
 end
+
+class ForgotPasswordController < ApplicationController
+  def create
+    # without any args
+    if verify_rucaptcha?
+      to_send_email
+    else
+      redirect_to '/forgot-password', alert: 'Invalid captcha code.'
+    end
+  end
+end
 ```
 
 > TIP: Sometime you may need keep last verified captcha code in session on `verify_rucaptcha?` method call, you can use `keep_session: true`. For example: `verify_rucaptcha? @user, keep_session: true`.
@@ -75,13 +78,17 @@ end
 View `app/views/account/new.html.erb`
 
 ```erb
-<form>
+<form method="POST">
   ...
   <div class="form-group">
     <%= rucaptcha_input_tag(class: 'form-control', placeholder: 'Input Captcha') %>
     <%= rucaptcha_image_tag(alt: 'Captcha') %>
   </div>
   ...
+
+  <div class="form-group">
+    <button type="submit" class="btn btn-primary">Submit</button>
+  </div>
 </form>
 ```
 

data/lib/rucaptcha.rb

@@ -19,8 +19,9 @@ module RuCaptcha
       if Rails.application
         @config.cache_store = Rails.application.config.cache_store
       else
-        @config.cache_store = :null_store
+        @config.cache_store = :mem_cache_store
       end
+      @config.cache_store
       @config
     end
 
@@ -32,6 +33,27 @@ module RuCaptcha
       style = config.style == :colorful ? 1 : 0
       self.create(style)
     end
+
+    def check_cache_store!
+      cache_store = RuCaptcha.config.cache_store
+      store_name = cache_store.is_a?(Array) ? cache_store.first : cache_store
+      if [:memory_store, :null_store, :file_store].include?(store_name)
+        RuCaptcha.config.cache_store = [:file_store, Rails.root.join('tmp/cache/rucaptcha/session')]
+
+        puts "
+
+  RuCaptcha's cache_store requirements are stored across processes and machines,
+  such as :mem_cache_store, :redis_store, or other distributed storage.
+  But your current set is #{cache_store}, it has changed to :file_store for working.
+  NOTE: :file_store is still not a good way, it only works with single server case.
+
+  Please make config file `config/initializes/rucaptcha.rb` to setup `cache_store`.
+  More infomation please read GitHub RuCaptcha README file.
+  https://github.com/huacnlee/rucaptcha
+
+"
+      end
+    end
   end
 end
 

data/lib/rucaptcha/engine.rb

@@ -2,26 +2,14 @@ module RuCaptcha
   class Engine < ::Rails::Engine
     isolate_namespace RuCaptcha
 
-    initializer 'rucaptcha.prepend.cache' do
-      cache_store = RuCaptcha.config.cache_store
-      store_name = cache_store.is_a?(Array) ? cache_store.first : cache_store
-      if [:memory_store, :null_store, :file_store].include?(store_name)
-        msg = "
-
-  RuCaptcha's cache_store requirements are stored across processes and machines,
-  such as :mem_cache_store, :redis_store, or other distributed storage.
-  But your current set is :#{store_name}.
-
-  Please make config file `config/initializes/rucaptcha.rb` to setup `cache_store`.
-  More infomation please read GitHub RuCaptcha README file.
-
-"
-        if store_name == :null_store
-          raise msg
-        else
-          puts msg
-        end
+    initializer 'rucaptcha.init' do |app|
+      # https://github.com/rails/rails/blob/3-2-stable/actionpack/lib/action_dispatch/routing/route_set.rb#L268
+      # `app.routes.append` start from Rails 3.2 - 5.0
+      app.routes.append do
+        mount RuCaptcha::Engine => '/rucaptcha'
       end
+
+      RuCaptcha.check_cache_store!
     end
   end
 end

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: This is a Captcha gem for Rails Applications. It drawing captcha image with