winton-captcha 1.0.4 → 1.0.5

data/README.markdown

@@ -1,7 +1,7 @@
 captcha
 =======
 
-An Rmagick based, Google-style captcha generator for Rails.
+An Rmagick based, Google-style captcha generator.
 
 
 Install
@@ -9,19 +9,69 @@ Install
 
 	script/plugin install git://github.com/winton/captcha.git
 
-### Generate config/captcha.rb
+### Create lib/captcha_config.rb (optional)
 
-	rake captcha
+<pre>
+{
+  :colors => {
+    :background => '#1B1C20',
+    :font => '#7385C5'
+  },
+  # number of captcha images to generate
+  :count => 500,
+  :destination => "#{RAILS_ROOT}/public/images/captchas"
+  ),
+  :dimensions => {
+    # canvas height (px)
+    :height => 31,
+    # canvas width (px)
+    :width => 90
+  },
+  :generate_every => 24 * 60 * 60,
+  # http://www.imagemagick.org/RMagick/doc/image2.html#implode
+  :implode => 0.2,
+  :letters => {
+    # text baseline (px)
+    :baseline => 24,
+    # number of letters in captcha
+    :count => 6,
+    :ignore => ['a','e','i','o','u','l','j','q'],
+    # font size (pts)
+    :points => 34,
+    # width of a character (used to decrease or increase space between characters) (px)
+    :width => 14
+  },
+  :ttf => File.expand_path("#{File.dirname(__FILE__)}/../../resources/captcha.ttf"),
+  # http://www.imagemagick.org/RMagick/doc/image3.html#wave
+  :wave => {
+    # range is used for randomness (px)
+    :wavelength => (20..70),
+    # distance between peak and valley of sin wave (px)
+    :amplitude => 3
+  }
+}
+</pre>
 
-Take a look at the config file.
-
-### Generate captchas
+### Create a captcha controller
 	
-	rake captcha:generate
+	script/generate controller Captchas
+
+### Add the resource to your routes.rb
+
+	map.resource :captcha
+
+### Add acts\_as\_captcha to captchas_controller.rb
+
+<pre>
+class CaptchasController < ApplicationController
+  acts_as_captcha
+end
+</pre> 
 
-### Add to .gitignore
+### Add public/images/captchas/* to your .gitignore
 
-	public/images/captchas
+  public/images/captchas/*
 
+Captchas will generate and re-generate automatically (see the <code>generate_every</code> option).
 
-##### Copyright &copy; 2008 [Winton Welsh](mailto:mail@wintoni.us)
+Access <code>/captcha</code> to retrieve the image, <code>/captcha/new</code> to grab a new image, and <code>session[:captcha]</code> for the captcha code.

data/captcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'captcha'
-  s.version = '1.0.4'
+  s.version = '1.0.5'
   s.date    = '2009-03-23'
   
   s.summary     = "An Rmagick based, Google-style captcha generator"

data/lib/captcha/action.rb

@@ -8,33 +8,23 @@ module Captcha
     module ClassMethods
       def acts_as_captcha
         include Captcha::Action::InstanceMethods
-        self.around_filter CaptchaFilter.new
       end
     end
 
     module InstanceMethods
       def new
-        files = Dir["#{RAILS_ROOT}/#{CAPTCHAS.options[:destination]}/*.jpg"]
-        @captcha = File.basename(files[rand(files.length)], '.jpg')
-        show
+        files = Dir["#{Captcha::Config.options[:destination]}/*.jpg"]
+        session[:captcha] = File.basename(files[rand(files.length)], '.jpg')
+        redirect_to(:action => :show)
       end
     
       def show
-        new unless @captcha
-        send_file "#{RAILS_ROOT}/#{CAPTCHAS.options[:destination]}/#{@captcha}.jpg", :type => 'image/jpeg', :disposition => 'inline'
-      end
-    end
-  
-    private
-  
-    class CaptchaFilter
-      def before(controller)
-        @captcha = session[:captcha]
-      end
-      def after(controller)
-        if session[:captcha] != @captcha
-          session[:captcha] = @captcha
-        end
+        new and return unless session[:captcha]
+        send_file(
+          "#{Captcha::Config.options[:destination]}/#{session[:captcha]}.jpg",
+          :disposition => 'inline',
+          :type => 'image/jpeg'
+        )
       end
     end
   

data/lib/captcha/config.rb

@@ -1,46 +1,49 @@
 module Captcha
   class Config
+    
+    PRODUCTION = defined?(RAILS_ENV) && RAILS_ENV == 'production'
+    ROOT = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/" : ''
+    
+    @@options = {
+      :colors => {
+        :background => '#1B1C20',
+        :font => '#7385C5'
+      },
+      # number of captcha images to generate
+      :count => PRODUCTION ? 500 : 10,
+      :destination => "#{ROOT}public/images/captchas",
+      :dimensions => {
+        # canvas height (px)
+        :height => 31,
+        # canvas width (px)
+        :width => 90
+      },
+      :generate_every => PRODUCTION ? 24 * 60 * 60 : 10 ** 8,
+      # http://www.imagemagick.org/RMagick/doc/image2.html#implode
+      :implode => 0.2,
+      :letters => {
+        # text baseline (px)
+        :baseline => 24,
+        # number of letters in captcha
+        :count => 6,
+        :ignore => ['a','e','i','o','u','l','j','q'],
+        # font size (pts)
+        :points => 34,
+        # width of a character (used to decrease or increase space between characters) (px)
+        :width => 14
+      },
+      :ttf => File.expand_path("#{File.dirname(__FILE__)}/../../resources/captcha.ttf"),
+      # http://www.imagemagick.org/RMagick/doc/image3.html#wave
+      :wave => {
+        # range is used for randomness (px)
+        :wavelength => (20..70),
+        # distance between peak and valley of sin wave (px)
+        :amplitude => 3
+      }
+    }
+    
     def initialize(options={})
-      @@options = {
-        :colors => {
-          :background => '#1B1C20',
-          :font => '#7385C5'
-        },
-        # number of captcha images to generate
-        :count => 500,
-        :destination => File.expand_path(
-          (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/" : '') +
-          "public/images/captchas"
-        ),
-        :dimensions => {
-          # canvas height (px)
-          :height => 31,
-          # canvas width (px)
-          :width => 90
-        },
-        :generate_every => 24 * 60 * 60,
-        # http://www.imagemagick.org/RMagick/doc/image2.html#implode
-        :implode => 0.2,
-        :letters => {
-          # text baseline (px)
-          :baseline => 24,
-          # number of letters in captcha
-          :count => 6,
-          :ignore => ['a','e','i','o','u','l','j','q'],
-          # font size (pts)
-          :points => 34,
-          # width of a character (used to decrease or increase space between characters) (px)
-          :width => 14
-        },
-        :ttf => File.expand_path("#{File.dirname(__FILE__)}/../../resources/captcha.ttf"),
-        # http://www.imagemagick.org/RMagick/doc/image3.html#wave
-        :wave => {
-          # range is used for randomness (px)
-          :wavelength => (20..70),
-          # distance between peak and valley of sin wave (px)
-          :amplitude => 3
-        }
-      }.merge(options)
+      @@options.merge!(options)
     end
     
     def self.captchas_ordered_by_modified

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-captcha
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Winton Welsh

data/resources/captchas.rb

@@ -1,24 +0,0 @@
-{
-  :count => 100,    # number of captcha images to generate
-  :width => 90,     # canvas width (px)
-  :height => 31,    # canvas height (px)
-  :colors => {
-    :background => '#1B1C20',
-    :font => '#7385C5'
-  },
-  :letters => {
-    :baseline => 24,# text baseline (px)
-    :count => 6,    # number of letters in captcha
-    :ignore => ['a','e','i','o','u','l','j','q'],
-    :points => 34,  # font size (pts)
-    :width => 14,   # width of a character (used to decrease or increase space between characters) (px)
-  },
-  :implode => 0.2,  # http://www.imagemagick.org/RMagick/doc/image2.html#implode
-  :wave => {        # http://www.imagemagick.org/RMagick/doc/image3.html#wave
-    :wavelength => (20..70), # range is used for randomness (px)
-    :amplitude => 3          # distance between peak and valley of sin wave (px)
-  },
-  :generate_on_startup => RAILS_ENV == 'production',
-  :destination => 'tmp/captchas',
-  :ttf => 'vendor/plugins/captcha/resources/captcha.ttf'
-}

data/tasks/captcha.rake

@@ -1,55 +0,0 @@
-require File.expand_path('../lib/captcha/captcha.rb', File.dirname(__FILE__))
-
-desc 'Updates config/captcha.rb'
-task :captcha => 'captcha:config'
-
-namespace :captcha do
-  
-  desc 'Updates config/captcha.rb'
-  task :config => 'captcha:config:to_app'
-  
-  desc 'Generates captchas'
-  task :generate do
-    Captchas.new
-  end
-  
-  namespace :config do
-    desc 'Copies plugin resources to app'
-    task :to_app do
-      captcha_resource 'captchas.rb', 'config/captchas.rb'
-    end
-
-    desc 'Copies app resources to plugin'
-    task :to_plugin do
-      captcha_resource 'captchas.rb', 'config/captchas.rb', true
-    end
-    
-    desc 'Removes plugin resources from app'
-    task :remove do
-      rm_rf 'config/captchas.rb'
-    end
-  end
-  
-  def captcha_resource(type, to, reverse=false, overwrite=true)
-    from = "#{File.dirname(__FILE__)}/../resources/#{type}"
-    from, to = to, from if reverse
-    puts "=> Removing old #{type}..."
-    puts to
-    return if File.exists?(to) && !overwrite
-    if File.directory?(from)
-      FileUtils.remove_dir(to, true) if File.exists?(to)
-      FileUtils.mkdir_p to
-    else
-      File.unlink(to) if File.exists?(to)
-    end
-    puts "=> Copying #{type}..."
-    (File.directory?(from) ? Dir["#{from}/*"] : [from]).each do |f|
-      if File.directory? f
-        FileUtils.mkdir_p "#{to}/#{File.basename(f)}"
-        FileUtils.cp_r f, to
-      else
-        FileUtils.cp f, to
-      end
-    end if File.exists?(from)
-  end
-end