rucaptcha 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb32b93e6a58016c5fb75bc0f74ef9db13f3642748eda7962739680612725bf3
-  data.tar.gz: 39fbbece91c7e0ae082d6f2c25c73cecc083366e6881502483b978e75883eddc
+  metadata.gz: 8da58614b04f686a030c0d4a21be5979312f79e0832bf51fe9fda72896c19675
+  data.tar.gz: ad7de5404b7b5d13b48f83a0bbb7e2c31916b021f9e4fce151e8aeb7d675a347
 SHA512:
-  metadata.gz: 4e46623dd14ba547ac2b569b5ad6e9debfb20ccc5275b7c3860cd4de391c0bc221edfae10efbf5b946fb40467b9a55a66a311876da5dba6941ad94162fb5e79e
-  data.tar.gz: e3c22ba0b553b491908b88b898d84c4764f7fa8fbb8b994454e1883f91e185032ba3acc1076791831bcaf46574914fbd68d1cbc5653338b7cf64a6f71b54ff69
+  metadata.gz: c417a2a25f6a3e3ac60997677ea21ff0788fdd3e4dd6a6694a23b55babc264ed2a1d21a8361c7db6b10c9397e0a208a093b3963f758bcbf37675ea640c8c829c
+  data.tar.gz: 9c51aed47c9ee1a7938d2758be6a65f7f84e81901b41ea3b2c847378184052468f97392b4a141fd9656950880d8864f6941c49b014187cf1e8e2c7a15f076643

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
 
@@ -162,3 +162,14 @@ else
   render :new
 end
 ```
+
+## Performance
+
+`rake benchmark` to run benchmark test.
+
+```
+Warming up --------------------------------------
+      Generate image    51.000  i/100ms
+Calculating -------------------------------------
+      Generate image    526.350  (± 2.5%) i/s -      2.652k in   5.041681s
+```

data/Rakefile

@@ -29,6 +29,37 @@ 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
+
+task :memory do
+  require "rucaptcha"
+  require "memory_profiler"
+
+  RuCaptchaCore.create(5, 5)
+
+  report = MemoryProfiler.report do
+    1000.times do
+      RuCaptchaCore.create(5, 5)
+    end
+  end
+
+  GC.start
+  report.pretty_print
+
+  puts "------------------------- Result Guide -------------------------"
+  puts "If [Total retained] have any bytes, there will have memory leak."
+end
+
+task :benchmark do
+  require "rucaptcha"
+  require "benchmark/ips"
+
+  RuCaptchaCore.create(5, 5)
+
+  Benchmark.ips do |x|
+    x.report("Generate image") { RuCaptchaCore.create(5, 5) }
+    x.compare!
+  end
+end

data/app/controllers/ru_captcha/captcha_controller.rb

@@ -7,7 +7,7 @@ module RuCaptcha
       headers["Pragma"] = "no-cache"
       data = generate_rucaptcha
 
-      opts = { disposition: "inline", type: "image/png" }
+      opts = { disposition: "inline", type: "image/jpeg" }
       send_data data, opts
     end
   end

data/ext/rucaptcha/src/captcha.rs

@@ -1,6 +1,6 @@
 use image::{ImageBuffer, Rgb};
-use imageproc::drawing::{draw_cubic_bezier_curve_mut, draw_hollow_ellipse_mut, draw_text_mut};
-use imageproc::noise::{gaussian_noise_mut, salt_and_pepper_noise_mut};
+use imageproc::drawing::{draw_cubic_bezier_curve_mut, draw_text_mut};
+use imageproc::noise::gaussian_noise_mut;
 use rand::{thread_rng, Rng};
 use rusttype::{Font, Scale};
 use std::io::Cursor;
@@ -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(3) + 1) as i32 {
-            let offset = j * (rand_num(2) as i32 + 1);
+            // 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: 300,
-            height: 100,
+            width: 220,
+            height: 70,
             complexity: 5,
         }
     }
@@ -234,15 +247,9 @@ impl CaptchaBuilder {
             ((5 * self.complexity) - 5) as u64,
         );
 
-        salt_and_pepper_noise_mut(
-            &mut image,
-            ((0.001 * self.complexity as f64) - 0.001) as f64,
-            (0.8 * self.complexity as f64) as u64,
-        );
-
         let mut bytes: Vec<u8> = Vec::new();
         image
-            .write_to(&mut Cursor::new(&mut bytes), image::ImageFormat::Png)
+            .write_to(&mut Cursor::new(&mut bytes), image::ImageFormat::Jpeg)
             .unwrap();
 
         Captcha { text, image: bytes }

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties