winton-captcha 1.2.0 → 1.2.1

data/README.markdown

@@ -7,12 +7,11 @@ Goals
 -----
 
 * Batch generate captchas
-* Use ciphered filenames (no need to store filename/captcha code pairs)
-* Captchas refresh automatically
+* Use ciphered filenames (no need to store filename/captcha pairs)
 * Easy configuration
-** Number of captchas
-** Period for captcha refresh
-** Colors, wave, implode
+  * Number of captchas
+  * Period for captcha refresh
+  * Colors, wave, implode
 * Handle lots of users
 
 Install
@@ -42,13 +41,7 @@ Captcha::Config.new(
 
 See <code>lib/captcha/config.rb</code> for more options.
 
-### Add public/images/captchas/* to your .gitignore file
-
-<pre>
-public/images/captchas/*
-</pre>
-
-### Add acts\_as\_captcha to application_controller.rb
+### application_controller.rb
 
 <pre>
 class ApplicationController < ActionController::Base
@@ -58,7 +51,7 @@ end
 
 You may now use the <code>reset_captcha</code> method in any controller.
 
-### Add acts\_as\_captcha to your model
+### user.rb
 
 <pre>
 class User < ActiveRecord::Base
@@ -66,9 +59,9 @@ class User < ActiveRecord::Base
 end
 </pre>
 
-No parameters behaves like <code>:field => true</code>, a default error is added to the "captcha" field.
+With no parameters, a default error is added to the "captcha" field (<code>:field => true</code>).
 
-Use <code>:base => true</code> to activate a default error for base.
+Specify <code>:base => true</code> to use a default error for base.
 
 ### In your view
 
@@ -84,4 +77,13 @@ user = User.new
 user.known_captcha = session[:captcha]
 user.captcha = params[:captcha]
 user.save
-</pre>
+reset_captcha
+</pre>
+
+### crontab
+
+<pre>
+0 0 * * * cd /path/to/rails/app && /usr/bin/rake RAILS_ENV=production captcha:generate
+</pre>
+
+Your config file sets the captcha refresh period. The rake task just checks if its time to repopulate, and does so if necessary.

data/captcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'captcha'
-  s.version = '1.2.0'
+  s.version = '1.2.1'
   s.date    = '2009-03-27'
   
   s.summary     = "A Google-style captcha for enterprise Rails apps"
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     spec/lib/captcha_spec.rb
     spec/spec.opts
     spec/spec_helper.rb
+    tasks/captcha.rake
   ]
   # = MANIFEST =
 end

data/init.rb

@@ -4,5 +4,4 @@ if defined?(RAILS_ROOT) && File.exists?("#{RAILS_ROOT}/lib/captcha_config.rb")
 end
 
 ActionController::Base.send :include, Captcha::Action
-ActiveRecord::Base.send :include, Captcha::Model
-Captcha::Generator.new
+ActiveRecord::Base.send :include, Captcha::Model

data/lib/captcha/config.rb

@@ -10,8 +10,6 @@ module Captcha
     end
     ONE_DAY = 24 * 60 * 60
     
-    @@exists = {}
-    @@exists_since = Time.now
     @@options = {
       :password => 'captcha',
       :colors => {
@@ -66,14 +64,7 @@ module Captcha
     end
     
     def self.exists?(code)
-      if Time.now - @@exists_since > 60 * 60
-        @@exists = {}
-        @@exists_since = Time.now
-      end
-      unless @@exists[code]
-        @@exists[code] = File.exists?("#{@@options[:destination]}/#{code}.jpg")
-      end
-      @@exists[code]
+      File.exists?("#{@@options[:destination]}/#{code}.jpg")
     end
   
     def self.options
@@ -82,7 +73,7 @@ module Captcha
   
     def self.last_modified
       file = self.captchas.first
-      if file
+      if file && File.exists?(file)
         File.mtime(file)
       else
         nil

data/lib/captcha/generator.rb

@@ -8,10 +8,10 @@ module Captcha
       return unless Config.options
       return if Config.last_modified && Config.last_modified > Time.now - Config.options[:generate_every]
       path = Config.options[:destination]
-      if File.exists?(path)
-        FileUtils.rm_rf Config.options[:destination]
+      Config.captchas.each do |captcha|
+        FileUtils.rm_f captcha
       end
-      FileUtils.mkdir_p Config.options[:destination]
+      FileUtils.mkdir_p path
       (1..Config.options[:count]).each do |x|
         image = Image.new Config.options
         path = "#{Config.options[:destination]}/#{Cipher.encrypt(image.code)}.jpg"

data/spec/lib/captcha_spec.rb

@@ -23,6 +23,12 @@ describe :captcha do
     @generator.generate
     codes.should_not == Captcha::Config.codes
   end
+  it "should not regenerate before the files are older than the generate_every option" do
+    codes = Captcha::Config.codes
+    sleep 1
+    @generator.generate
+    codes.should == Captcha::Config.codes
+  end
   it "should not allow more than the captcha limit to exist" do
     sleep @delay
     @generator.generate

data/tasks/captcha.rake

@@ -0,0 +1,6 @@
+namespace :captcha do
+  desc 'Generate a batch of captchas'
+  task :generate => :environment do
+    Captcha::Generator.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-captcha
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -38,6 +38,7 @@ files:
 - spec/lib/captcha_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/captcha.rake
 has_rdoc: false
 homepage: http://github.com/winton/captcha
 post_install_message: