rucaptcha 2.0.0.beta4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abeea0fd2c1d23218c330e3ff7452b3b9906d6b4
-  data.tar.gz: f9b5ff05abf6034537d7076ff3c16b968372455c
+  metadata.gz: 3d77f76c426739b1dff568c242d92e8aab993894
+  data.tar.gz: ce46de282f893b397a26c82bd7071090a2e9a405
 SHA512:
-  metadata.gz: d9e5ed41b6c855ced136802a1117e9b9a22ad1838d2e8eb1e5ba049bba2580a5b1497bd0bae9202028fe306b629807806b065d44997913764114a3f41a3e8710
-  data.tar.gz: a0a6e2411fb7bae88685ab07f24b74d177d8838170fb4d106c28f0718c3fd759f8b64d85745a2957142a7cf55db4e1476fdc6fa47f1833bbb660e13c270203e5
+  metadata.gz: a0f3f2fb8b5055f82019568aad37d8d927fb5dfc8c68325ec437f9c5d2746b826cb0e42b0868e5088f4e93bcab2e48c6a58ff6ce7aeae5364417436a42019690
+  data.tar.gz: fcef86bd39c1facaa06fc399947298477ba8924ede6091e6351379293b8d22db6be792706a4c79e07f4358febcea078bd8eacacb28928fa87127926be1f685ff

data/CHANGELOG.md

@@ -6,8 +6,9 @@
 WARNING!: This version have so many break changes!
 
 - Use C ext instead of ImageMagick, now it's no dependencies!
-- New captcha style, because C code is complex, just generate black chars.
-- Remove `len`, `style`, `font_size`, `cache_limit` config key, no support now.
+- New captcha style.
+- Remove `len`, `font_size`, `cache_limit` config key, no support now.
+- Output `GIF` format.
 
 1.2.0
 -----

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/huacnlee/rucaptcha.svg)](https://travis-ci.org/huacnlee/rucaptcha)
 [![Code Climate](https://codeclimate.com/github/huacnlee/rucaptcha/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/rucaptcha)
 
-This is a Captcha gem for Rails Applications. It drawing captcha image with C extension.
+This is a Captcha gem for Rails Applications. It drawing captcha image with C code.
 
 ## Example
 
@@ -31,6 +31,8 @@ Create `config/initializers/rucaptcha.rb`
 
 ```rb
 RuCaptcha.configure do
+  # Color style, default: :colorful, allows: [:colorful, :black_white]
+  # self.style = :colorful
   # Custom captcha code expire time if you need, default: 2 minutes
   # self.expires_in = 120
   # [Requirement]

data/ext/rucaptcha/colors.h

@@ -3,21 +3,21 @@
 static char *colors[] = {
   // Black 500 #000000
   "GIF89a" "\xc8\0\x46\0" "\x83" "\0\0"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
-  "\x00\x00\x00"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
+  "\x11\x11\x11"
   "\xff\xff\xff" "," "\0\0\0\0" "\xc8\0\x46\0" "\0" "\x04",
 
   // Red 500 #F44336

data/ext/rucaptcha/extconf.rb

@@ -1,4 +1,2 @@
 require 'mkmf'
-
-# dir_config(extension_name)
 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[6]);
-void makegif(unsigned char im[70*200], unsigned char gif[gifsize]);
+void makegif(unsigned char im[70*200], unsigned char gif[gifsize], int style);
 
 #include <unistd.h>
 #include <stdint.h>
@@ -16,13 +16,16 @@ void makegif(unsigned char im[70*200], unsigned char gif[gifsize]);
 static int8_t *lt[];
 const int gifsize=17646;
 
-void makegif(unsigned char im[70*200], unsigned char gif[gifsize]) {
+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_idx = rand() % color_len;
+  if (style == 0) {
+    color_idx = 0;
+  }
   memcpy(gif,colors[color_idx],13+48+10+1);
 
   int x,y;
@@ -185,20 +188,21 @@ VALUE RuCaptcha = Qnil;
 
 void Init_rucaptcha();
 
-VALUE create(VALUE self);
+VALUE create(VALUE self, VALUE style);
 
 void Init_rucaptcha() {
   RuCaptcha = rb_define_module("RuCaptcha");
-  rb_define_singleton_method(RuCaptcha, "create", create, 0);
+  rb_define_singleton_method(RuCaptcha, "create", create, 1);
 }
 
-VALUE create(VALUE self) {
+VALUE create(VALUE self, VALUE style) {
   char l[6];
   unsigned char im[80*200];
   unsigned char gif[gifsize];
+  int i_style = FIX2INT(style);
 
-  captcha(im,l);
-  makegif(im,gif);
+  captcha(im, l);
+  makegif(im, gif, i_style);
 
   VALUE result = rb_ary_new2(2);
   rb_ary_push(result, rb_str_new2(l));

data/lib/rucaptcha.rb

@@ -14,6 +14,7 @@ module RuCaptcha
     def config
       return @config if defined?(@config)
       @config = Configuration.new
+      @config.style       = :colorful
       @config.expires_in  = 2.minutes
       if Rails.application
         @config.cache_store = Rails.application.config.cache_store
@@ -26,6 +27,11 @@ module RuCaptcha
     def configure(&block)
       config.instance_exec(&block)
     end
+
+    def generate()
+      style = config.style == :colorful ? 1 : 0
+      self.create(style)
+    end
   end
 end
 

data/lib/rucaptcha/configuration.rb

@@ -5,5 +5,7 @@ module RuCaptcha
     attr_accessor :cache_store
     # rucaptcha expire time, default 2 minutes
     attr_accessor :expires_in
+    # Color style, default: :colorful, allows: [:colorful, :black_white]
+    attr_accessor :style
   end
 end

data/lib/rucaptcha/controller_helpers.rb

@@ -14,7 +14,7 @@ module RuCaptcha
 
     # Generate a new Captcha
     def generate_rucaptcha
-      res = RuCaptcha.create()
+      res = RuCaptcha.generate()
       session_val = {
         code: res[0],
         time: Time.now.to_i

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '2.0.0.beta4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -79,9 +79,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2