fastcaptcha 0.2.0 → 0.2.1

data/README

@@ -13,14 +13,14 @@ REQUIREMENT:
 USAGE:
 
   >> require 'fastcaptcha'
-  >> captcha = FastCaptcha.new # defaults to memcached and low complexity captchas.
+  >> captcha = FastCaptcha.new # defaults to redis for caching and low complexity captchas.
   >> challenge = captcha.generate
   >> puts challenge.key
   >> puts challenge.image # PNG image data
 
   >> require 'fastcaptcha'
-  >> require 'moneta/redis2'
-  >> captcha = FastCaptcha.new(Moneta::Redis2.new, 3) # use redis & level 3 complexity
+  >> require 'moneta/memcache'
+  >> captcha = FastCaptcha.new(Moneta::Memcache.new, 3) # use memcached instead & level 3 complexity
   >> challenge = captcha.generate
   >> puts challenge.key
   >> puts challenge.image # PNG image data
@@ -35,10 +35,15 @@ SINATRA HELPER:
 
   require 'sinatra/captcha'
   class MyApp < Sinatra::Base
-    # ttl of captcha before user has to respond - 10s is an aggressive but reasonable value.
+    # ttl of captcha before user has to respond.
     set :captcha_ttl, 30
+
     # complexity 1 is simple, 4 is wicked hard (makes segmentation very difficult).
     set :captcha_level, 2
+
+    # use memcached instead of redis (default).
+    # set :captcha_cache, Moneta::Memcache
+
     register Sinatra::Captcha
   end
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/fastcaptcha.rb

@@ -41,7 +41,8 @@ class FastCaptcha
   end
 
   def cache_connection
-    Moneta::Memcache.new
+    require 'moneta/redis2'
+    Moneta::Redis2.new
   end
 
   class Challenge

data/lib/sinatra/captcha.rb

@@ -14,15 +14,24 @@ module Sinatra
     end
   end
   module Captcha
+    def self.set_captcha_cache_class app
+      unless app.respond_to? :captcha_cache
+        require 'moneta/redis2'
+        app.set :captcha_cache, Moneta::Redis2
+      end
+    end
+
     def self.registered app
       app.helpers CaptchaHelpers
 
-      app.set :captcha_ttl,     60  unless app.respond_to? :captcha_ttl
-      app.set :captcha_level,   2   unless app.respond_to? :captcha_level
-      app.set :captcha_width,   200 unless app.respond_to? :captcha_width
-      app.set :captcha_height,  50  unless app.respond_to? :captcha_height
+      app.set :captcha_ttl,     60             unless app.respond_to? :captcha_ttl
+      app.set :captcha_level,   2              unless app.respond_to? :captcha_level
+      app.set :captcha_width,   200            unless app.respond_to? :captcha_width
+      app.set :captcha_height,  50             unless app.respond_to? :captcha_height
       app.set :captcha_handler, Image.new(app)
 
+      set_captcha_cache_class(app)
+
       app.get '/captcha/refresh' do
         content_type 'text/plain'
         app.captcha_handler.html('captcha', params['key'])
@@ -54,7 +63,7 @@ module Sinatra
         @width, @height = app.captcha_width, app.captcha_height
       end
 
-      def html id='captcha', key=nil
+      def html id = 'captcha', key = nil
         challenge = @generator.generate @ttl, false
         snippet = <<-HTML
           <div id="#{id}">
@@ -67,8 +76,8 @@ module Sinatra
         HTML
       end
 
-      def ajax_html id='captcha_ajax'
-        divid = id + '_div'
+      def ajax_html id = 'captcha_ajax'
+        div_id  = id + '_div'
         snippet = <<-HTML
           <script type="text/javascript">
             $(document).ready(function() {
@@ -87,7 +96,7 @@ module Sinatra
             function load_captcha_#{id}() {
                 $('##{id}_r').hide();
                 $('##{id}').slideDown(250);
-                $('##{id}').load('/captcha/snippet/#{divid}', function() {
+                $('##{id}').load('/captcha/snippet/#{div_id}', function() {
                   $('##{id}').find('input[name="captcha[response]"]').focus();
                 });
                 $('##{id}').delay(#{@ttl*500}).slideUp(250, function() {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bharanee Rathna