rucaptcha 2.5.2 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0f693b4f35cc76366adb1033505846be68ee73e4905323c387fa85659be090
-  data.tar.gz: 8ad6fb95de0a8a425e1b4371c00f6297a7318a480a7fb060841a894b01498ad4
+  metadata.gz: 43b066933f98fbca0c17c9399112a974f4d012bebeaa12975eef9a9e8cd03c74
+  data.tar.gz: 106d354acfaa8850da0f11ae92d2e3268603e3582951aefec484d03d4f2e8635
 SHA512:
-  metadata.gz: 0375e726391a3d72b42b78850d915d6a3300016446f02f18ecee5ac6a5274438ade2cbc210325afc29628fe9f667e47c0a3b7d28448123f6f5610613ec94b9ee
-  data.tar.gz: 16c0121a2f24f8c3bf2a94c463df55a6d6e4ac84f52973eab7baa05d7e51940099fd68427f08cbaa9847fea0d9f409ace6bda490ef33e280a1b1e18c6e22bec5
+  metadata.gz: f0e0389c00e0a44deae317c609eae2a3ff716e125f0c485b37cd32a659ff60b152e945f6c8cf2691f815ee4da5531663d35ec15e8df0b1820d161f0ec7ec7dad
+  data.tar.gz: af4b7c997648efa973e81f19c187ecd8710c5c0e5884b6c9c42ae8d6ac98f48bf49b1ebf867a707c73fbd9ce8629c9d0d9835182463e8effa91bdd8be2e62c83

data/CHANGELOG.md

@@ -1,88 +1,89 @@
-2.5.2
--------
+New release please visit:
+
+https://github.com/huacnlee/rucaptcha/releases
+
+## 2.5.5
+
+- Improved image for thicker interference lines.
+- Add more colors.
+
+## 2.5.4
+
+- Fix: rucaptcha input maxlength attribute with config value.
+
+## 2.5.3
+
+- Fix session invalid warning, only for development env;
+
+## 2.5.2
 
 - Fix session.id error with upgrade Rails 6.0.2.1 or Rack 2.0.8 (#84)
 
-2.5.1
--------
+## 2.5.1
 
 - Fix invalid module name error. (#78)
 
-2.5.0
--------
+## 2.5.0
 
 - Support click captcha image to refresh new one by default.
 - Use simple tag helper generate captcha img html, for avoid asset_host (#73).
 
-2.4.0
--------
+## 2.4.0
 
 - Add skip_cache_store_check configuration. (#63)
 - Fix for generate captcha with relative path, not url. (#58)
 
-2.3.2
--------
+## 2.3.2
 
 - Change Yellow and Green colors to Pink and Deep Purple to pass WCAG 2.0's contrast test. (#70)
 
-2.3.1
--------
+## 2.3.1
 
 - Fix #67 a y chars will invalid error (only in 2.3.0).
 
-2.3.0
--------
+## 2.3.0
 
 - Add `config.outline` for use outline style.
 - Reduce colors down to 5 (red, blue, green, yellow and black).
 
-2.2.0
------
+## 2.2.0
 
 - Add option `config.length` for support change number chars. (#57)
 - Add option `config.strikethrough` for enable or disable strikethrough. (#57)
 
-2.1.3
------
+## 2.1.3
 
 - Windows support fixed with `send_data` method. (#45)
 
-2.1.2
------
+## 2.1.2
 
 - Do not change captcha when `HEAD /rucaptcha`.
 
-2.1.1
------
+## 2.1.1
 
 - Mount engine use `prepend` method to get high priority in config/routes.rb.
 
-2.1.0
------
+## 2.1.0
 
 - Mount Router by default, not need config now.
 
   > IMPORTANT: Wen you upgrade this version, you need remove `mount RuCaptcha::Engine` line from your `config/routes.rb`
+
 - 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
------
+## 2.0.3
 
 - Use `ActiveSupport.on_load` to extend ActionController and ActionView.
 
-2.0.1
------
+## 2.0.1
 
 - Fix `/rucaptcha` path issue when `config.action_controller.asset_host` has setup with CDN url.
 
-2.0.0
------
+## 2.0.0
 
-*Break Changes!*
+_Break Changes!_
 
 WARNING!: This version have so many break changes!
 
@@ -90,161 +91,3 @@ WARNING!: This version have so many break changes!
 - New captcha style.
 - Remove `len`, `font_size`, `cache_limit` config key, no support now.
 - Output `GIF` format.
-
-1.2.0
------
-
-- Add an `:keep_session` option for `verify_rucaptcha?` method to giva a way for let you keep session on verify, if true, RuCaptcha will not delete the captcha code session after validation.
-
-1.1.4
------
-
-- Fix #35 just give a warning message if not setup a right cache_store, only raise on :null_store.
-
-1.1.2
------
-
-- Fix #34 rucaptcha.root_url -> root_path, to avoid generate a http url in a https application.
-- Fix spec to require Ruby 2.0.0, because there have a `Module#prepend` method called.
-
-1.1.1
------
-
-- Remove inspect log on verify_rucaptcha
-
-1.1.0
------
-
-- Add `cache_store` config key to setup a cache store location for RuCaptcha.
-- Store captcha in custom cache store.
-
-## Security Notes
-
-- Fix Session replay secure issue that when Rails application use CookieStore.
-
-1.0.0
------
-
-- Adjust to avoid lighter colors.
-- Avoid continuous chars have same color.
-- Use same color for each chars in :black_white mode.
-
-0.5.1
------
-
-- Make sure it will render image when ImageMagick stderr have warning messages. (#26)
-
-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).
-- Lighter text color, improve style.
-
-0.4.2
------
-
-- Fix NoMethodError bug when params[:_rucaptha] is nil.
-
-0.4.1
------
-
-- Add error message to resource when captcha code expired.
-
-0.4.0
------
-
-- Add `config.colorize` option, to allow use black text theme.
-
-0.3.3
------
-
-- Add `config.expires_in` to allow change captcha code expire time.
-
-0.3.2.1
--------
-
-- Add Windows development env support.
-
-0.3.2
------
-
-- Make better render positions;
-- Trim blank space.
-
-0.3.1
------
-
-- More complex Image render: compact text, strong lines, +/-5 rotate...
-- [DEPRECATION] config.width, config.height removed, use config.font_size.
-- Fix the render position in difference font sizes.
-- Fix input field type, and disable autocorrect, autocapitalize, and limit maxlength with char length;
-
-0.2.5
------
-
-- Add `session[:_rucaptcha]` expire time, for protect Rails CookieSession Replay Attack.
-- Captcha input field disable autocomplete, and set field type as `email` for shown correct keyboard on mobile view.
-
-0.2.3
------
-
-- It will raise error when call ImageMagick failed.
-
-0.2.2
------
-
-- Added locale for pt-BR language; @ramirovjr
-
-0.2.1
------
-
-- Fix issue when cache dir not exist.
-
-0.2.0
------
-
-- Added file cache, can setup how many images you want generate by `config.cache_limit`,
-  RuCaptcha will use cache for next requests.
-  When you restart Rails processes it will generate new again and clean the old caches.
-
-0.1.4
------
-
-- Fix `verify_rucaptcha?` logic in somecase.
-- Locales fixed.
-
-0.1.3
------
-
-- `zh-TW` translate file fixed.
-- Use xxx_url to fix bad captcha URL for `config.action_controller.asset_host` enabled case.
-
-0.1.2
------
-
-- No case sensitive;
-- Export config.implode;
-- Improve image color and style;
-- Don't generate chars in 'l,o,0,1'.
-- Render lower case chars on image.
-
-0.1.1
------
-
-- Include default validation I18n messages (en, zh-CN, zh-TW).
-
-0.1.0
------
-
-- First release.

data/README.md

@@ -1,12 +1,14 @@
 # RuCaptcha
 
 [![Gem Version](https://badge.fury.io/rb/rucaptcha.svg)](https://badge.fury.io/rb/rucaptcha)
-[![Build Status](https://travis-ci.org/huacnlee/rucaptcha.svg)](https://travis-ci.org/huacnlee/rucaptcha)
+[![build](https://github.com/huacnlee/rucaptcha/workflows/build/badge.svg)](https://github.com/huacnlee/rucaptcha/actions?query=workflow%3Abuild)
 
 This is a Captcha gem for Rails Applications which generates captcha image by C code.
 
-> NOTE: According to the use of Ruby China, the verification code looks like has a lower than 5% probability of being parsed by OCR and the verification code is cracked. It is recommended that you use the IP rate limit to enhance the protection.
-> NOTE: 以 Ruby China 的使用来看，验证码似乎有低于 5% 的概率被 OCR 读取解析导致验证码被破解（我们从日志分析绝大多数是成功的，但偶尔一个成功，配合大量机器攻击，导致注册了很多的垃圾账号），建议你额外配合 IP 频率限制的功能来加强保护。
+> NOTE: According to the use of Ruby China, the verification code looks like has a lower than 5% probability of being parsed by OCR and the verification code is cracked (All Image Captcha libs are has same problem). It is recommended that you use the IP rate limit to enhance the protection.
+> NOTE: 以 Ruby China 的使用来看，验证码似乎有低于 5% 的概率被 OCR 读取解析 (图片验证码都有这个问题) 导致验证码被破解（我们从日志分析绝大多数是成功的，但偶尔一个成功，配合大量机器攻击，导致注册了很多的垃圾账号），建议你额外配合 IP 频率限制的功能来加强保护。
+
+> 如果你需要更高强度的验证，建议选择商用服务。
 
 [中文介绍和使用说明](https://ruby-china.org/topics/27832)
 
@@ -64,6 +66,7 @@ RuCaptcha 没有使用 Rails Session 来存储验证码信息，因为 Rails 的
 所以，我建议大家使用的时候，配置上 `cache_store` （详见 [Rails Guides 缓存配置部分](https://ruby-china.github.io/rails-guides/caching_with_rails.html#%E9%85%8D%E7%BD%AE)的文档）到一个 Memcached 或 Redis，这才是最佳实践。
 
 #
+
 (RuCaptha do not use Rails Session to store captcha information. As the default session is stored in Cookie in Rails, there's a [Replay attack](https://en.wikipedia.org/wiki/Replay_attack) bug which may causes capthcha being destroyed if we store captcha in Rails Session.
 
 So in my design I require RuCaptcha to configure a distributed backend storage scheme, such as Memcached, Redis or other cache_store schemes which support distribution.

data/app/controllers/ru_captcha/captcha_controller.rb

@@ -2,10 +2,11 @@ module RuCaptcha
   class CaptchaController < ActionController::Base
     def index
       return head :ok if request.head?
-      headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
-      headers['Pragma'] = 'no-cache'
+
+      headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+      headers["Pragma"] = "no-cache"
       data = generate_rucaptcha
-      opts = { disposition: 'inline', type: 'image/gif' }
+      opts = {disposition: "inline", type: "image/gif"}
       send_data data, opts
     end
   end

data/config/routes.rb

@@ -1,3 +1,3 @@
 RuCaptcha::Engine.routes.draw do
-  root to: 'captcha#index'
+  root to: "captcha#index"
 end

data/ext/rucaptcha/colors.h

@@ -40,7 +40,45 @@ static char *colors[] = {
   "\xD5\x00\x00"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
 
-  // Deep Orange A700 #DD2C00
+  // Red #B71C1C
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xB7\x1C\x1C"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Red #E53935
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xE5\x39\x35"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Orange A700 #DD2C00
   "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
   "\xDD\x2C\x00"
   "\xDD\x2C\x00"
@@ -59,7 +97,140 @@ static char *colors[] = {
   "\xDD\x2C\x00"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
 
-  // Blue A700 #2962FF
+  // Orange #FF3D00
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xFF\x3D\x00"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Orange #BF360C
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xBF\x36\x0C"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Orange #FF6D00
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xFF\x6D\x00"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Green #00C853
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Green #00C853
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\x00\xC8\x53"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Green #64DD17
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\x64\xDD\x17"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Blue #2E7D32
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\x2E\x7D\x32"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Blue #2962FF
   "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
   "\x29\x62\xFF"
   "\x29\x62\xFF"
@@ -78,23 +249,61 @@ static char *colors[] = {
   "\x29\x62\xFF"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
 
-  // Pink A700 #C51162
+  // Blue #0D47A1
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\x0D\x47\xA1"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Blue #1A237E
   "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
-  "\xC5\x11\x62"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\x1A\x23\x7E"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Blue #0091EA
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
+  "\x00\x91\xEA"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
 
   // Deep Purple A700 #6200EA
@@ -114,5 +323,43 @@ static char *colors[] = {
   "\x62\x00\xEA"
   "\x62\x00\xEA"
   "\x62\x00\xEA"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Pink #F50057
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xF5\x00\x57"
+  "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
+
+  // Deep Purple A700 #4A148C
+  "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
+  "\x49\x14\x8C"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04"
 };

data/ext/rucaptcha/extconf.rb

@@ -1,2 +1,2 @@
-require 'mkmf'
-create_makefile('rucaptcha/rucaptcha')
+require "mkmf"
+create_makefile("rucaptcha/rucaptcha")

data/ext/rucaptcha/rucaptcha.c

@@ -1,7 +1,7 @@
 // http://github.com/ITikhonov/captcha
 const int gifsize;
-void captcha(unsigned char im[70*200], unsigned char l[8], int length, int i_line, int i_filter);
-void makegif(unsigned char im[70*200], unsigned char gif[gifsize], int style);
+void captcha(unsigned char im[70 * 200], unsigned char l[8], int length, int i_line, int i_filter);
+void makegif(unsigned char im[70 * 200], unsigned char gif[gifsize], int style);
 
 #include <unistd.h>
 #include <stdint.h>
@@ -14,75 +14,94 @@ void makegif(unsigned char im[70*200], unsigned char gif[gifsize], int style);
 #include "colors.h"
 
 static int8_t *lt[];
-const int gifsize=17646;
+const int gifsize = 17646;
 
-void makegif(unsigned char im[70*200], unsigned char gif[gifsize], int style) {
+void makegif(unsigned char im[70 * 200], unsigned char gif[gifsize], int style)
+{
   // tag ; widthxheight ; GCT:0:0:7 ; bgcolor + aspect // GCT
   // Image Separator // left x top // widthxheight // Flags
   // LZW code size
   srand(time(NULL));
-  int color_len = (int) sizeof(colors) / sizeof(colors[0]);
+  int color_len = (int)sizeof(colors) / sizeof(colors[0]);
   int color_idx = rand() % color_len;
-  if (style == 0) {
+  if (style == 0)
+  {
     color_idx = 0;
   }
-  memcpy(gif,colors[color_idx],13+48+10+1);
-
-  int x,y;
-  unsigned char *i=im;
-  unsigned char *p=gif+13+48+10+1;
-  for(y=0;y<70;y++) {
-    *p++=250; // Data length 5*50=250
-    for(x=0;x<50;x++)
+  memcpy(gif, colors[color_idx], 13 + 48 + 10 + 1);
+
+  int x, y;
+  unsigned char *i = im;
+  unsigned char *p = gif + 13 + 48 + 10 + 1;
+  for (y = 0; y < 70; y++)
+  {
+    *p++ = 250; // Data length 5*50=250
+    for (x = 0; x < 50; x++)
     {
-      unsigned char a=i[0]>>4,b=i[1]>>4,c=i[2]>>4,d=i[3]>>4;
-
-      p[0]=16|(a<<5);     // bbb10000
-      p[1]=(a>>3)|64|(b<<7);  // b10000xb
-      p[2]=b>>1;      // 0000xbbb
-      p[3]=1|(c<<1);    // 00xbbbb1
-      p[4]=4|(d<<3);    // xbbbb100
-      i+=4;
-      p+=5;
+      unsigned char a = i[0] >> 4, b = i[1] >> 4, c = i[2] >> 4, d = i[3] >> 4;
+
+      p[0] = 16 | (a << 5);            // bbb10000
+      p[1] = (a >> 3) | 64 | (b << 7); // b10000xb
+      p[2] = b >> 1;                   // 0000xbbb
+      p[3] = 1 | (c << 1);             // 00xbbbb1
+      p[4] = 4 | (d << 3);             // xbbbb100
+      i += 4;
+      p += 5;
     }
   }
 
   // Data length // End of LZW (b10001) // Terminator // GIF End
-  memcpy(gif+gifsize-4,"\x01" "\x11" "\x00" ";",4);
+  memcpy(gif + gifsize - 4, "\x01"
+                            "\x11"
+                            "\x00"
+                            ";",
+         4);
 }
 
-static const int8_t sw[200]={0, 4, 8, 12, 16, 20, 23, 27, 31, 35, 39, 43, 47, 50, 54, 58, 61, 65, 68, 71, 75, 78, 81, 84, 87, 90, 93, 96, 98, 101, 103, 105, 108, 110, 112, 114, 115, 117, 119, 120, 121, 122, 123, 124, 125, 126, 126, 127, 127, 127, 127, 127, 127, 127, 126, 126, 125, 124, 123, 122, 121, 120, 119, 117, 115, 114, 112, 110, 108, 105, 103, 101, 98, 96, 93, 90, 87, 84, 81, 78, 75, 71, 68, 65, 61, 58, 54, 50, 47, 43, 39, 35, 31, 27, 23, 20, 16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -23, -27, -31, -35, -39, -43, -47, -50, -54, -58, -61, -65, -68, -71, -75, -78, -81, -84, -87, -90, -93, -96, -98, -101, -103, -105, -108, -110, -112, -114, -115, -117, -119, -120, -121, -122, -123, -124, -125, -126, -126, -127, -127, -127, -127, -127, -127, -127, -126, -126, -125, -124, -123, -122, -121, -120, -119, -117, -115, -114, -112, -110, -108, -105, -103, -101, -98, -96, -93, -90, -87, -84, -81, -78, -75, -71, -68, -65, -61, -58, -54, -50, -47, -43, -39, -35, -31, -27, -23, -20, -16, -12, -8, -4};
-
-
-#define MAX(x,y) ((x>y)?(x):(y))
-
-static int letter(int n, int pos, unsigned char im[70*200], unsigned char swr[200], uint8_t s1, uint8_t s2) {
-  int8_t *p=lt[n];
-  unsigned char *r=im+200*16+pos;
-  unsigned char *i=r;
-  int sk1=s1+pos;
-  int sk2=s2+pos;
-  int mpos=pos;
-  int row=0;
-  for(;*p!=-101;p++) {
-    if(*p<0) {
-      if(*p==-100) { r+=200; i=r; sk1=s1+pos; row++; continue; }
-      i+=-*p;
+static const int8_t sw[200] = {0, 4, 8, 12, 16, 20, 23, 27, 31, 35, 39, 43, 47, 50, 54, 58, 61, 65, 68, 71, 75, 78, 81, 84, 87, 90, 93, 96, 98, 101, 103, 105, 108, 110, 112, 114, 115, 117, 119, 120, 121, 122, 123, 124, 125, 126, 126, 127, 127, 127, 127, 127, 127, 127, 126, 126, 125, 124, 123, 122, 121, 120, 119, 117, 115, 114, 112, 110, 108, 105, 103, 101, 98, 96, 93, 90, 87, 84, 81, 78, 75, 71, 68, 65, 61, 58, 54, 50, 47, 43, 39, 35, 31, 27, 23, 20, 16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -23, -27, -31, -35, -39, -43, -47, -50, -54, -58, -61, -65, -68, -71, -75, -78, -81, -84, -87, -90, -93, -96, -98, -101, -103, -105, -108, -110, -112, -114, -115, -117, -119, -120, -121, -122, -123, -124, -125, -126, -126, -127, -127, -127, -127, -127, -127, -127, -126, -126, -125, -124, -123, -122, -121, -120, -119, -117, -115, -114, -112, -110, -108, -105, -103, -101, -98, -96, -93, -90, -87, -84, -81, -78, -75, -71, -68, -65, -61, -58, -54, -50, -47, -43, -39, -35, -31, -27, -23, -20, -16, -12, -8, -4};
+
+#define MAX(x, y) ((x > y) ? (x) : (y))
+
+static int letter(int n, int pos, unsigned char im[70 * 200], unsigned char swr[200], uint8_t s1, uint8_t s2)
+{
+  int8_t *p = lt[n];
+  unsigned char *r = im + 200 * 16 + pos;
+  unsigned char *i = r;
+  int sk1 = s1 + pos;
+  int sk2 = s2 + pos;
+  int mpos = pos;
+  int row = 0;
+  for (; *p != -101; p++)
+  {
+    if (*p < 0)
+    {
+      if (*p == -100)
+      {
+        r += 200;
+        i = r;
+        sk1 = s1 + pos;
+        row++;
+        continue;
+      }
+      i += -*p;
       continue;
     }
 
-    if(sk1>=200) sk1=sk1%200;
-    int skew=sw[sk1]/16;
-    sk1+=(swr[pos+i-r]&0x1)+1;
+    if (sk1 >= 200)
+      sk1 = sk1 % 200;
+    int skew = sw[sk1] / 16;
+    sk1 += (swr[pos + i - r] & 0x1) + 1;
 
-    if(sk2>=200) sk2=sk2%200;
-    int skewh=sw[sk2]/70;
-    sk2+=(swr[row]&0x1);
+    if (sk2 >= 200)
+      sk2 = sk2 % 200;
+    int skewh = sw[sk2] / 70;
+    sk2 += (swr[row] & 0x1);
 
-    unsigned char *x=i+skew*200+skewh;
-    mpos=MAX(mpos,pos+i-r);
+    unsigned char *x = i + skew * 200 + skewh;
+    mpos = MAX(mpos, pos + i - r);
 
-    if((x-im)<70*200) *x=(*p)<<4;
+    if ((x - im) < 70 * 200)
+      *x = (*p) << 4;
     i++;
   }
   return mpos + 3;
@@ -92,100 +111,141 @@ static int letter(int n, int pos, unsigned char im[70*200], unsigned char swr[20
 
 uint32_t dr[NDOTS];
 
-static void line(unsigned char im[70*200], unsigned char swr[200], uint8_t s1) {
+static void line(unsigned char im[70 * 200], unsigned char swr[200], uint8_t s1)
+{
   int x;
-  int sk1=s1;
-  for(x=0;x<199;x++) {
-    if(sk1>=200) sk1=sk1%200;
-    int skew=sw[sk1]/20;
-    sk1+=swr[x]&0x3+1;
-    unsigned char *i= im+(200*(45+skew)+x);
-    i[0]=0; i[1]=0; i[200]=0; i[201]=0;
+  int sk1 = s1;
+  for (x = 0; x < 199; x++)
+  {
+    if (sk1 >= 200)
+      sk1 = sk1 % 200;
+    int skew = sw[sk1] / 20;
+    sk1 += swr[x] & 0x3 + 1;
+    unsigned char *i = im + (200 * (45 + skew) + x);
+    i[0] = 0;
+    i[1] = 0;
+    i[2] = 0;
+    i[3] = 0;
+    i[4] = 0;
+    i[195] = 0;
+    i[196] = 0;
+    i[197] = 0;
+    i[198] = 0;
+    i[200] = 0;
   }
 }
 
-static void dots(unsigned char im[70*200]) {
+static void dots(unsigned char im[70 * 200])
+{
   int n;
-  for(n=0;n<NDOTS;n++) {
-    uint32_t v=dr[n];
-    unsigned char *i=im+v%(200*67);
-
-    i[0]=0xff;
-    i[1]=0xff;
-    i[2]=0xff;
-    i[200]=0xff;
-    i[201]=0xff;
-    i[202]=0xff;
+  for (n = 0; n < NDOTS; n++)
+  {
+    uint32_t v = dr[n];
+    unsigned char *i = im + v % (200 * 67);
+
+    i[0] = 0xff;
+    i[1] = 0xff;
+    i[2] = 0xff;
+    i[200] = 0xff;
+    i[201] = 0xff;
+    i[202] = 0xff;
   }
 }
 
-static void blur(unsigned char im[70*200]) {
-  unsigned char *i=im;
-  int x,y;
-  for(y=0;y<68;y++) {
-    for(x=0;x<198;x++) {
-      unsigned int c11=*i,c12=i[1],c21=i[200],c22=i[201];
-      *i++=((c11+c12+c21+c22)/4);
+static void blur(unsigned char im[70 * 200])
+{
+  unsigned char *i = im;
+  int x, y;
+  for (y = 0; y < 68; y++)
+  {
+    for (x = 0; x < 198; x++)
+    {
+      unsigned int c11 = *i, c12 = i[1], c21 = i[200], c22 = i[201];
+      *i++ = ((c11 + c12 + c21 + c22) / 4);
     }
   }
 }
 
-static void filter(unsigned char im[70*200]) {
-  unsigned char om[70*200];
-  unsigned char *i=im;
-  unsigned char *o=om;
+static void filter(unsigned char im[70 * 200])
+{
+  unsigned char om[70 * 200];
+  unsigned char *i = im;
+  unsigned char *o = om;
 
-  memset(om,0xff,sizeof(om));
+  memset(om, 0xff, sizeof(om));
 
-  int x,y;
-  for(y=0;y<70;y++) {
-    for(x=4;x<200-4;x++) {
-      if(i[0]>0xf0 && i[1]<0xf0) { o[0]=0; o[1]=0; }
-      else if(i[0]<0xf0 && i[1]>0xf0) { o[0]=0; o[1]=0; }
+  int x, y;
+  for (y = 0; y < 70; y++)
+  {
+    for (x = 4; x < 200 - 4; x++)
+    {
+      if (i[0] > 0xf0 && i[1] < 0xf0)
+      {
+        o[0] = 0;
+        o[1] = 0;
+      }
+      else if (i[0] < 0xf0 && i[1] > 0xf0)
+      {
+        o[0] = 0;
+        o[1] = 0;
+      }
 
       i++;
       o++;
     }
   }
 
-  memmove(im,om,sizeof(om));
+  memmove(im, om, sizeof(om));
 }
 
-static const char *letters="abcdafahijklmnopqrstuvwxyz";
+static const char *letters = "abcdafahijklmnopqrstuvwxyz";
 
-void captcha(unsigned char im[70*200], unsigned char l[8], int length, int i_line, int i_filter) {
+void captcha(unsigned char im[70 * 200], unsigned char l[8], int length, int i_line, int i_filter)
+{
   unsigned char swr[200];
-  uint8_t s1,s2;
-
-  int f=open("/dev/urandom",O_RDONLY);
-  read(f,l,5); read(f,swr,200); read(f,dr,sizeof(dr)); read(f,&s1,1); read(f,&s2,1);
+  uint8_t s1, s2;
+
+  int f = open("/dev/urandom", O_RDONLY);
+  read(f, l, 5);
+  read(f, swr, 200);
+  read(f, dr, sizeof(dr));
+  read(f, &s1, 1);
+  read(f, &s2, 1);
   close(f);
-  memset(im,0xff,200*70); s1=s1&0x7f; s2=s2&0x3f;
+  memset(im, 0xff, 200 * 70);
+  s1 = s1 & 0x7f;
+  s2 = s2 & 0x3f;
 
   int x;
-  for(x=0;x<length;x++){
-    l[x]%=25;
+  for (x = 0; x < length; x++)
+  {
+    l[x] %= 25;
   }
-  for(x=length;x<8;x++){
-    l[length]=0;
+  for (x = length; x < 8; x++)
+  {
+    l[length] = 0;
   }
   //l[0]%=25; l[1]%=25; l[2]%=25; l[3]%=25; l[4]=0; // l[4]%=25; l[5]=0;
-  int p=30;
-  for(x=0;x<length;x++){
-    p=letter(l[x],p,im,swr,s1,s2);
+  int p = 30;
+  for (x = 0; x < length; x++)
+  {
+    p = letter(l[x], p, im, swr, s1, s2);
   }
 
-  if (i_line == 1) {
-    line(im,swr,s1);
+  if (i_line == 1)
+  {
+    line(im, swr, s1);
   }
-  // dots(im);
-  if (i_filter == 1) {
+  dots(im);
+  if (i_filter == 1)
+  {
     blur(im);
     filter(im);
   }
 
-  for(x=0;x<length;x++){
-    l[x]=letters[l[x]];
+  for (x = 0; x < length; x++)
+  {
+    l[x] = letters[l[x]];
   }
   //l[1]=letters[l[1]]; l[2]=letters[l[2]]; l[3]=letters[l[3]]; //l[4]=letters[l[4]];
 }
@@ -214,14 +274,16 @@ void Init_rucaptcha();
 
 VALUE create(VALUE self, VALUE style, VALUE length, VALUE line, VALUE filter);
 
-void Init_rucaptcha() {
+void Init_rucaptcha()
+{
   RuCaptcha = rb_define_module("RuCaptcha");
   rb_define_singleton_method(RuCaptcha, "create", create, 4);
 }
 
-VALUE create(VALUE self, VALUE style, VALUE length, VALUE line, VALUE filter) {
+VALUE create(VALUE self, VALUE style, VALUE length, VALUE line, VALUE filter)
+{
   char l[8];
-  unsigned char im[80*200];
+  unsigned char im[80 * 200];
   unsigned char gif[gifsize];
   int i_style = FIX2INT(style);
   int i_length = FIX2INT(length);
@@ -237,4 +299,3 @@ VALUE create(VALUE self, VALUE style, VALUE length, VALUE line, VALUE filter) {
 
   return result;
 }
-

data/lib/rucaptcha/cache.rb

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

data/lib/rucaptcha/controller_helpers.rb

@@ -6,21 +6,25 @@ module RuCaptcha
       helper_method :verify_rucaptcha?
     end
 
+    def rucaptcha_session_id
+      cookies[:_rucaptcha_session_id]
+    end
+
     # session key of rucaptcha
     def rucaptcha_sesion_key_key
-
-      session_id = session.respond_to?(:id) ? session.id : session[:session_id]
-      warning_when_session_invalid if session_id.blank?
+      warning_when_session_invalid if rucaptcha_session_id.blank?
 
       # With https://github.com/rack/rack/commit/7fecaee81f59926b6e1913511c90650e76673b38
       # to protected session_id into secret
-      session_id_digest = Digest::SHA256.hexdigest(session_id.inspect)
-      ['rucaptcha-session', session_id_digest].join(':')
+      session_id_digest = Digest::SHA256.hexdigest(rucaptcha_session_id.inspect)
+      ["rucaptcha-session", session_id_digest].join(":")
     end
 
     # Generate a new Captcha
     def generate_rucaptcha
-      res = RuCaptcha.generate()
+      generate_rucaptcha_session_id
+
+      res = RuCaptcha.generate
       session_val = {
         code: res[0],
         time: Time.now.to_i
@@ -44,7 +48,7 @@ module RuCaptcha
     #   verify_rucaptcha?(nil, keep_session: true)
     #   verify_rucaptcha?(nil, captcha: params[:user][:captcha])
     #
-    def verify_rucaptcha?(resource = nil, opts = {})
+    def verify_rucaptcha?(_resource = nil, opts = {})
       opts ||= {}
 
       store_info = RuCaptcha.cache.read(rucaptcha_sesion_key_key)
@@ -52,38 +56,41 @@ module RuCaptcha
       RuCaptcha.cache.delete(rucaptcha_sesion_key_key) unless opts[:keep_session]
 
       # Make sure session exist
-      if store_info.blank?
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if store_info.blank?
 
       # Make sure not expire
-      if (Time.now.to_i - store_info[:time]) > RuCaptcha.config.expires_in
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if (Time.now.to_i - store_info[:time]) > RuCaptcha.config.expires_in
 
       # Make sure parama have captcha
-      captcha = (opts[:captcha] || params[:_rucaptcha] || '').downcase.strip
-      if captcha.blank?
-        return add_rucaptcha_validation_error
-      end
+      captcha = (opts[:captcha] || params[:_rucaptcha] || "").downcase.strip
+      return add_rucaptcha_validation_error if captcha.blank?
 
-      if captcha != store_info[:code]
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if captcha != store_info[:code]
 
       true
     end
 
     private
 
+    def generate_rucaptcha_session_id
+      return if rucaptcha_session_id.present?
+
+      cookies[:_rucaptcha_session_id] = {
+        value: SecureRandom.hex(16),
+        expires: 1.day
+      }
+    end
+
     def add_rucaptcha_validation_error
       if defined?(resource) && resource && resource.respond_to?(:errors)
-        resource.errors.add(:base, t('rucaptcha.invalid'))
+        resource.errors.add(:base, t("rucaptcha.invalid"))
       end
       false
     end
 
     def warning_when_session_invalid
+      return unless Rails.env.development?
+
       Rails.logger.warn "
         WARNING! The session.id is blank, RuCaptcha can't work properly, please keep session available.
         More details about this: https://github.com/huacnlee/rucaptcha/pull/66

data/lib/rucaptcha/engine.rb

@@ -2,11 +2,11 @@ module RuCaptcha
   class Engine < ::Rails::Engine
     isolate_namespace RuCaptcha
 
-    initializer 'rucaptcha.init' do |app|
+    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.prepend` start from Rails 3.2 - 5.0
       app.routes.prepend do
-        mount RuCaptcha::Engine => '/rucaptcha'
+        mount RuCaptcha::Engine => "/rucaptcha"
       end
 
       RuCaptcha.check_cache_store! unless RuCaptcha.config.skip_cache_store_check

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '2.5.2'
+  VERSION = "2.6.1"
 end

data/lib/rucaptcha/view_helpers.rb

@@ -1,19 +1,20 @@
 module RuCaptcha
   module ViewHelpers
     def rucaptcha_input_tag(opts = {})
-      opts[:name]           = '_rucaptcha'
-      opts[:type]           = 'text'
-      opts[:autocorrect]    = 'off'
-      opts[:autocapitalize] = 'off'
-      opts[:pattern]        = '[a-zA-Z]*'
-      opts[:autocomplete]   = 'off'
-      opts[:maxlength] ||= 5
+      opts[:name] = "_rucaptcha"
+      opts[:type] = "text"
+      opts[:autocorrect] = "off"
+      opts[:autocapitalize] = "off"
+      opts[:pattern] = "[a-zA-Z]*"
+      opts[:autocomplete] = "off"
+      opts[:maxlength] = RuCaptcha.config.length
       tag(:input, opts)
     end
 
     def rucaptcha_image_tag(opts = {})
-      opts[:class] = opts[:class] || 'rucaptcha-image'
-      opts[:src] = ru_captcha.root_path
+      @rucaptcha_image_tag__image_path_in_this_request ||= "#{ru_captcha.root_path}?t=#{Time.now.strftime("%s%L")}"
+      opts[:class] = opts[:class] || "rucaptcha-image"
+      opts[:src] = @rucaptcha_image_tag__image_path_in_this_request
       opts[:onclick] = "this.src = '#{ru_captcha.root_path}?t=' + Date.now();"
       tag(:img, opts)
     end

data/lib/rucaptcha.rb

@@ -1,31 +1,32 @@
-require 'rails'
-require 'action_controller'
-require 'active_support/all'
-require 'rucaptcha/rucaptcha'
-require 'rucaptcha/version'
-require 'rucaptcha/configuration'
-require 'rucaptcha/controller_helpers'
-require 'rucaptcha/view_helpers'
-require 'rucaptcha/cache'
-require 'rucaptcha/engine'
-require 'rucaptcha/errors/configuration'
+require "rails"
+require "action_controller"
+require "active_support/all"
+require "rucaptcha/rucaptcha"
+require "rucaptcha/version"
+require "rucaptcha/configuration"
+require "rucaptcha/controller_helpers"
+require "rucaptcha/view_helpers"
+require "rucaptcha/cache"
+require "rucaptcha/engine"
+require "rucaptcha/errors/configuration"
 
 module RuCaptcha
   class << self
     def config
       return @config if defined?(@config)
+
       @config = Configuration.new
-      @config.style         = :colorful
-      @config.length        = 5
+      @config.style = :colorful
+      @config.length = 5
       @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
 
-      if Rails.application
-        @config.cache_store = Rails.application.config.cache_store
+      @config.cache_store = if Rails.application
+        Rails.application.config.cache_store
       else
-        @config.cache_store = :mem_cache_store
+        :mem_cache_store
       end
       @config.cache_store
       @config
@@ -35,24 +36,22 @@ module RuCaptcha
       config.instance_exec(&block)
     end
 
-    def generate()
+    def generate
       style = config.style == :colorful ? 1 : 0
       length = config.length
 
-      unless length.in?(3..7)
-        raise RuCaptcha::Errors::Configuration, 'length config error, value must in 3..7'
-      end
+      raise RuCaptcha::Errors::Configuration, "length config error, value must in 3..7" unless length.in?(3..7)
 
       strikethrough = config.strikethrough ? 1 : 0
       outline = config.outline ? 1 : 0
-      self.create(style, length, strikethrough, outline)
+      create(style, length, strikethrough, outline)
     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')]
+      if %i[memory_store null_store file_store].include?(store_name)
+        RuCaptcha.config.cache_store = [:file_store, Rails.root.join("tmp/cache/rucaptcha/session")]
 
         puts "
 
@@ -72,7 +71,7 @@ module RuCaptcha
 end
 
 ActiveSupport.on_load(:action_controller) do
-  ActionController::Base.send :include, RuCaptcha::ControllerHelpers
+  ActionController::Base.include RuCaptcha::ControllerHelpers
 end
 
 ActiveSupport.on_load(:action_view) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.1
 platform: ruby
 authors:
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description: 
+description:
 email: huacnlee@gmail.com
 executables: []
 extensions:
@@ -69,7 +69,7 @@ homepage: https://github.com/huacnlee/rucaptcha
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: This is a Captcha gem for Rails Applications. It drawing captcha image with
   C code so it no dependencies.