rucaptcha 3.0.0.beta1-arm64-darwin → 3.0.2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb669f6c9742142d809d1e88fd21f9281e3d05e33c5ff0987c648f48408a4ed
-  data.tar.gz: 306b98fa6a56802657185bd1008a44cec0a087540b27ec318ecf162e053f1ac7
+  metadata.gz: befc27505a478e583a83cff44657905ce6cb4f46c71313158b910685cf723da9
+  data.tar.gz: 4d136a44c8da6fb77c9ac3715fa6565037343d93cdc66bbc87f4d3c78b238714
 SHA512:
-  metadata.gz: 49391ef1edf9cf6daac8a21ddf2dfbc17d6c16cb90461723109fc7cedd327bb00c51b4df92e265e2bb525963099b00506cf7cbee812063f6952387d80158cd58
-  data.tar.gz: 9d7896c26762c4383ef19e8c10a00099c6beda32387faa9046c30263e3c87a87b4e6fc9b7936da86107c3da729ea754ac7a0401cd43137c3a1f974b4d4724ccd
+  metadata.gz: e2d346c98f7eaa970009655b6cbf647178011327974611deaa4123c8c49fa6703b010552e4dc40198ccf3a113bd33d25bfb4a70c9a24e3c2c1fe6e5c779ec313
+  data.tar.gz: ef65ce28b8575f8a99627069a9c3eeb572340af2d5d1fa4ea0fe2124ee5d91f311ab0c55801537ba5bf383522f05b0081a124738001ac4b5677cc289755ca032

data/README.md

@@ -14,7 +14,7 @@ Captcha Gem for Rails, which generates captcha image by Rust.
 
 ## Example
 
-![1](https://user-images.githubusercontent.com/5518/195587367-6b579046-1d75-4a64-8e8f-4475da8932fa.png) ![2](https://user-images.githubusercontent.com/5518/195587377-08065df4-80ad-4c3f-baf4-2da7f9919b19.png) ![3](https://user-images.githubusercontent.com/5518/195587383-de8f73ea-e934-4c9d-b278-c78fb69cad58.png) ![4](https://user-images.githubusercontent.com/5518/195587381-a67e586d-0b54-4d6f-89c8-a431b085e16c.png)
+<img src="https://user-images.githubusercontent.com/5518/196329734-fee49f62-050b-44c8-a5a8-7ffdd3c5a3f6.png" height="50" alt="0"> <img src="https://user-images.githubusercontent.com/5518/196329738-64b264a1-e3fb-4804-ac46-0df18fb31d1e.png" height="50" alt="1"> <img src="https://user-images.githubusercontent.com/5518/196329740-e10ded26-ba46-4e9b-93b8-ce30c198f880.png" height="50" alt="2"> <img src="https://user-images.githubusercontent.com/5518/196329743-c7b055b8-b309-4554-8c95-66c5caf4437d.png" height="50" alt="3"> <img src="https://user-images.githubusercontent.com/5518/196329745-eb68f0c3-ccac-4fa3-aa7a-cc4c2caeb41e.png" height="50" alt="4"> <img src="https://user-images.githubusercontent.com/5518/196329746-b15a9f71-262e-4699-87c7-a5561c6caf2c.png" height="50" alt="5"> <img src="https://user-images.githubusercontent.com/5518/196329747-d111a5d3-89a1-487b-989e-5be8059488c2.png" height="50" alt="6"> <img src="https://user-images.githubusercontent.com/5518/196329749-2cb44aa3-8b59-427c-91f3-59566d6de8a5.png" height="50" alt="7"> <img src="https://user-images.githubusercontent.com/5518/196329754-ae64374b-f2e5-44b8-a7f4-3aee1405c193.png" height="50" alt="8"> <img src="https://user-images.githubusercontent.com/5518/196329755-26b88705-bf34-4d32-a4dc-076530582a90.png" height="50" alt="9">
 
 ## Feature
 

data/Rakefile

@@ -29,6 +29,6 @@ task default: :spec
 task :preview do
   require "rucaptcha"
   res = RuCaptchaCore.create(5, 5)
-  warn res[0]
+  warn "-------------------------\n#{res[0]}"
   puts res[1].pack("c*")
 end

data/app/controllers/ru_captcha/captcha_controller.rb

@@ -0,0 +1,14 @@
+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"
+      data = generate_rucaptcha
+
+      opts = { disposition: "inline", type: "image/png" }
+      send_data data, opts
+    end
+  end
+end

data/config/locales/rucaptcha.en.yml

@@ -0,0 +1,3 @@
+en:
+  rucaptcha:
+    invalid: "The captcha code is incorrect (if you can't read, you can click image to refresh it)"

data/config/locales/rucaptcha.pt-BR.yml

@@ -0,0 +1,3 @@
+'pt-BR':
+  rucaptcha:
+    invalid: "Código inválido!"

data/config/locales/rucaptcha.zh-CN.yml

@@ -0,0 +1,3 @@
+'zh-CN':
+  rucaptcha:
+    invalid: "验证码不正确（如无法识别，可以点击刷新验证码）"

data/config/locales/rucaptcha.zh-TW.yml

@@ -0,0 +1,3 @@
+'zh-TW':
+  rucaptcha:
+    invalid: "驗證碼不正確（如無法識別，可以點擊刷新驗證碼）"

data/config/routes.rb

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

data/ext/rucaptcha/src/captcha.rs

@@ -1,5 +1,5 @@
 use image::{ImageBuffer, Rgb};
-use imageproc::drawing::{draw_cubic_bezier_curve_mut, draw_hollow_ellipse_mut, draw_text_mut};
+use imageproc::drawing::{draw_cubic_bezier_curve_mut, draw_text_mut};
 use imageproc::noise::{gaussian_noise_mut, salt_and_pepper_noise_mut};
 use rand::{thread_rng, Rng};
 use rusttype::{Font, Scale};
@@ -14,7 +14,12 @@ static BASIC_CHAR: [char; 54] = [
 static FONT_BYTES1: &[u8; 145008] = include_bytes!("../fonts/FuzzyBubbles-Regular.ttf");
 static FONT_BYTES2: &[u8; 37792] = include_bytes!("../fonts/Handlee-Regular.ttf");
 
-static COLORS: [(u8, u8, u8); 10] = [
+// https://coolors.co/cc0b8f-7c0abe-5700c8-3c2ea4-3d56a8-3fa67e-45bb30-69d003-a0d003-d8db02
+static COLORS: [(u8, u8, u8); 14] = [
+    (197, 166, 3),
+    (187, 87, 5),
+    (176, 7, 7),
+    (186, 9, 56),
     (204, 11, 143),
     (124, 10, 190),
     (87, 0, 200),
@@ -47,7 +52,7 @@ fn get_captcha(len: usize) -> Vec<String> {
 
 #[allow(unused)]
 fn get_color() -> Rgb<u8> {
-    let rnd = rand_num(COLORS.len());
+    let rnd = rand_num(COLORS.len() - 1);
     let c = COLORS[rnd];
     Rgb([c.0, c.1, c.2])
 }
@@ -94,19 +99,28 @@ fn cyclic_write_character(res: &[String], image: &mut ImageBuffer<Rgb<u8>, Vec<u
     } as f32;
 
     let colors = get_colors(res.len());
+    let line_colors = get_colors(res.len());
 
     let xscale = scale - rand_num((scale * 0.2) as usize) as f32;
     let yscale = h as f32 - rand_num((h * 0.2) as usize) as f32;
 
+    // Draw line, ellipse first as background
+    for (i, _) in res.iter().enumerate() {
+        let line_color = line_colors[i];
+        draw_interference_line(1, image, line_color);
+        draw_interference_ellipse(1, image, line_color);
+    }
+
+    // Draw text
     for (i, _) in res.iter().enumerate() {
         let text = &res[i];
 
         let color = colors[i];
         let font = get_font();
-        let line_color = colors[rand_num(colors.len() - 1)];
 
-        for j in 0..(rand_num(2) + 1) as i32 {
-            let offset = j * (rand_num(3) as i32 + 1);
+        for j in 0..(rand_num(3) + 1) as i32 {
+            // Draw text again with offset
+            let offset = j * (rand_num(2) as i32);
             draw_text_mut(
                 image,
                 color,
@@ -120,9 +134,6 @@ fn cyclic_write_character(res: &[String], image: &mut ImageBuffer<Rgb<u8>, Vec<u
                 text,
             );
         }
-
-        draw_interference_line(1, image, line_color);
-        draw_interference_ellipse(1, image, line_color);
     }
 }
 
@@ -139,7 +150,7 @@ fn draw_interference_line(num: usize, image: &mut ImageBuffer<Rgb<u8>, Vec<u8>>,
         let ctrl_x = get_next((width / 6) as f32, width / 4 * 3);
         let ctrl_y = get_next(x1, height - 5);
 
-        let ctrl_x2 = get_next((width / 4) as f32, width / 4 * 3);
+        let ctrl_x2 = get_next((width / 12) as f32, width / 12 * 3);
         let ctrl_y2 = get_next(x1, height - 5);
         // Randomly draw bezier curves
         draw_cubic_bezier_curve_mut(
@@ -159,10 +170,12 @@ fn draw_interference_ellipse(
     color: Rgb<u8>,
 ) {
     for _ in 0..num {
+        // max cycle width 20px
         let w = (10 + rand_num(10)) as i32;
         let x = rand_num((image.width() - 25) as usize) as i32;
         let y = rand_num((image.height() - 15) as usize) as i32;
-        draw_hollow_ellipse_mut(image, (x, y), w, w, color);
+
+        imageproc::drawing::draw_filled_ellipse_mut(image, (x, y), w, w, color);
     }
 }
 
@@ -182,8 +195,8 @@ impl CaptchaBuilder {
     pub fn new() -> Self {
         CaptchaBuilder {
             length: 4,
-            width: 240,
-            height: 64,
+            width: 300,
+            height: 100,
             complexity: 5,
         }
     }

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = "3.0.0.beta1"
+  VERSION = "3.0.2"
 end

data/lib/rucaptcha.rb

@@ -48,7 +48,7 @@ module RuCaptcha
       raise RuCaptcha::Errors::Configuration, "length config error, value must in 3..7" unless length.in?(3..7)
 
       result = RuCaptchaCore.create(length, config.difficulty || 5)
-      [result[0], result[1].pack("c*")]
+      [result[0].downcase, result[1].pack("c*")]
     end
 
     def check_cache_store!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.2
 platform: arm64-darwin
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -46,9 +46,17 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/controllers/ru_captcha/captcha_controller.rb
+- config/locales/rucaptcha.en.yml
+- config/locales/rucaptcha.pt-BR.yml
+- config/locales/rucaptcha.zh-CN.yml
+- config/locales/rucaptcha.zh-TW.yml
+- config/routes.rb
 - ext/rucaptcha/Cargo.lock
 - ext/rucaptcha/Cargo.toml
 - ext/rucaptcha/extconf.rb
+- ext/rucaptcha/fonts/FuzzyBubbles-Regular.ttf
+- ext/rucaptcha/fonts/Handlee-Regular.ttf
 - ext/rucaptcha/src/captcha.rs
 - ext/rucaptcha/src/lib.rs
 - lib/rucaptcha.rb
@@ -80,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.0.dev
 signing_key: