glebtv-simple_captcha 0.2.1 → 0.3.1

data/README.rdoc

@@ -1,6 +1,9 @@
 =SimpleCaptcha
 
-SimpleCaptcha is the simplest and a robust captcha plugin. Its implementation requires
+This is a fork of wolcanus's fork of SimpleCaptcha to support Mongoid 3 and new formtastic.
+
+This is a fork of galetahub SimpleCaptcha to support Mongoid.
+Its implementation requires
 adding up a single line in views and in controllers/models.
 SimpleCaptcha is available to be used with Rails 3 or above and also it provides the
 backward compatibility with previous versions of Rails.
@@ -17,15 +20,18 @@ backward compatibility with previous versions of Rails.
 
 ==Requirements
 
-* {Ruby}[http://ruby-lang.org/] >= 1.9
+* {Ruby}[http://ruby-lang.org/] >= 1.8.7
 * {Rails}[http://github.com/rails/rails] >= 3
 * ImageMagick should be installed on your machine to use this plugin.
   visit http://www.imagemagick.org/script/index.php for more details.
-* AR or mongoid
 
 ==Installation
 
-  gem "glebtv-simple_captcha", "~> 0.2.0", require: "simple_captcha"
+  gem "glebtv-simple_captcha", :require => "simple_captcha"
+
+or
+
+  gem 'glebtv-simple_captcha', :require => 'simple_captcha', :git => 'git://github.com/glebtv/simple-captcha.git'
 
 ==Setup
 
@@ -34,8 +40,6 @@ on the version of rails your application is using.
 
   rails generate simple_captcha
 
-  rake db:migrate
-
 ==Usage
 
 ===Controller Based
@@ -163,13 +167,6 @@ You can provide the path where image_magick is installed as well:
     sc.image_magick_path = '/usr/bin' # you can check this from console by running: which convert
   end
 
-You can provide the path where should be stored tmp files.
-It's usefull when you dont have acces to /tmp (default directory)
-
-  SimpleCaptcha.setup do |sc|
-    sc.tmp_path = '/tmp' # or somewhere in project eg. Rails.root.join('tmp/simple_captcha').to_s, make shure directory exists
-  end
-
 
 ===How to change the CSS for SimpleCaptcha DOM elements?
 You can change the CSS of the SimpleCaptcha DOM elements as per your need in this file.
@@ -209,7 +206,7 @@ You can change the CSS of the SimpleCaptcha DOM elements as per your need in thi
       default: "Secret Code did not match with the Image"
       user: "The secret Image and code were different"
 
-==Who's who?
+==The Original Author
 
 Enjoy the simplest captcha implementation.
 
@@ -223,4 +220,4 @@ Plugin Homepage: http://expressica.com/simple_captcha
 
 Plugin update for rails 3: http://github.com/galetahub
 
-Any feedback/comment/issue/donation is welcome!
+Any feedback/comment/issue/donation is welcome!

data/Rakefile

@@ -1,22 +1 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the simple_captcha plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the simple_captcha plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SimpleCaptcha'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/lib/generators/USAGE

@@ -1,4 +1,4 @@
-SimplaCaptcha
+SimpleCaptcha
 =============
 # Generate migration and copy view partial
   rails generate simple_captcha

data/lib/generators/simple_captcha_generator.rb

@@ -6,16 +6,17 @@ class SimpleCaptchaGenerator < Rails::Generators::Base
   def self.source_root
     @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates/'))
   end
-
-  def self.next_migration_number(dirname)
-    Time.now.strftime("%Y%m%d%H%M%S")
-  end
   
   def create_partial
     template "partial.erb", File.join('app/views', 'simple_captcha', "_simple_captcha.erb")
   end
-  
-  def create_migration
-    migration_template "migration.rb", File.join('db/migrate', "create_simple_captcha_data.rb")
+
+  unless defined?(Mongoid)
+    def self.next_migration_number(dirname)
+      Time.now.strftime("%Y%m%d%H%M%S")
+    end
+    def create_migration
+      migration_template "migration.rb", File.join('db/migrate', "create_simple_captcha_data.rb")
+    end
   end
 end

data/lib/generators/templates/migration.rb

@@ -1,15 +1,15 @@
-class CreateSimpleCaptchaData < ActiveRecord::Migration
-  def self.up
-    create_table :simple_captcha_data do |t|
-      t.string :key, :limit => 40
-      t.string :value, :limit => 6
-      t.timestamps
-    end
-    
-    add_index :simple_captcha_data, :key, :name => "idx_key"
-  end
-
-  def self.down
-    drop_table :simple_captcha_data
-  end
-end
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+  def self.up
+    create_table :simple_captcha_data do |t|
+      t.string :key, :limit => 40
+      t.string :value, :limit => 6
+      t.timestamps
+    end
+
+    add_index :simple_captcha_data, :key, :name => "idx_key"
+  end
+
+  def self.down
+    drop_table :simple_captcha_data
+  end
+end

data/lib/simple_captcha.rb

@@ -7,17 +7,23 @@ module SimpleCaptcha
   autoload :ViewHelper,        'simple_captcha/view'
   autoload :ControllerHelpers, 'simple_captcha/controller'
 
-  autoload :FormBuilder,       'simple_captcha/form_builder'
-  autoload :CustomFormBuilder, 'simple_captcha/formtastic'
-  
-  if defined?(Mongoid)
-    require 'simple_captcha/mongoid'
-    autoload :ModelHelpers,      'simple_captcha/mongoid'
-    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data_mongoid'
+  autoload :FormBuilder,       'simple_captcha/hooks/form_builder'
+
+  if Object.const_defined?("Formtastic")
+    require "simple_captcha/hooks/formtastic"
+  end
+
+  if Object.const_defined?("SimpleForm")
+    require "simple_captcha/hooks/simple_form"
+  end
+
+  if Object.const_defined?("Mongoid")
+    autoload :SimpleCaptchaData, 'simple_captcha/storage/mongoid'
   else
+    autoload :SimpleCaptchaData, 'simple_captcha/storage/active_record'
     autoload :ModelHelpers,      'simple_captcha/active_record'
-    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data_ar'
   end
+
   autoload :Middleware,        'simple_captcha/middleware'
 
   mattr_accessor :image_size
@@ -26,8 +32,20 @@ module SimpleCaptcha
   mattr_accessor :length
   @@length = 5
 
+  # 'embosed_silver',
+  # 'simply_red',
+  # 'simply_green',
+  # 'simply_blue',
+  # 'distorted_black',
+  # 'all_black',
+  # 'charcoal_grey',
+  # 'almost_invisible'
+  # 'random'
+  mattr_accessor :image_style
+  @@image_style = 'simply_blue'
+
   mattr_accessor :image_color
-  @@image_color = '#0089d1'
+  @@image_color = nil
 
   # 'low', 'medium', 'high', 'random'
   mattr_accessor :distortion
@@ -41,6 +59,13 @@ module SimpleCaptcha
   mattr_accessor :tmp_path
   @@tmp_path = nil
 
+  mattr_accessor :pointsize
+  @@pointsize = 30
+
+  def self.add_image_style(name, params = [])
+    SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
+  end
+
   def self.setup
     yield self
   end

data/lib/simple_captcha/active_record.rb

@@ -54,14 +54,12 @@ module SimpleCaptcha #:nodoc
       end
       
       def is_captcha_valid?
-        return true if Rails.env.test?
-
         if captcha && captcha.upcase.delete(" ") == SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
           SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)
           return true
         else
           message = simple_captcha_options[:message] || I18n.t(self.class.model_name.downcase, :scope => [:simple_captcha, :message], :default => :default)
-          simple_captcha_options[:add_to_base] ? errors.add(:base, message) : errors.add(:captcha, message)
+          simple_captcha_options[:add_to_base] ? errors.add_to_base(message) : errors.add(:captcha, message)
           return false
         end
       end

data/lib/simple_captcha/controller.rb

@@ -17,7 +17,7 @@ module SimpleCaptcha #:nodoc
       return true if Rails.env.test?
       
       if params[:captcha]
-        data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
+        data = SimpleCaptcha::Utils::simple_captcha_value(session[:captcha])
         result = data == params[:captcha].delete(" ").upcase
         SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
         return result

data/lib/simple_captcha/engine.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
+
 require 'rails'
 require 'simple_captcha'
 
 module SimpleCaptcha
   class Engine < ::Rails::Engine
-    config.before_initialize do
-      unless defined?(Mongoid)
+    unless Object.const_defined?("Mongoid")
+      config.before_initialize do
         ActiveSupport.on_load :active_record do
           ActiveRecord::Base.send(:include, SimpleCaptcha::ModelHelpers)
         end
@@ -15,10 +16,6 @@ module SimpleCaptcha
     config.after_initialize do
       ActionView::Base.send(:include, SimpleCaptcha::ViewHelper)
       ActionView::Helpers::FormBuilder.send(:include, SimpleCaptcha::FormBuilder)
-
-      if Object.const_defined?("Formtastic") && Formtastic.const_defined?("Inputs")
-        require "simple_captcha/formtastic"
-      end
     end
 
     config.app_middleware.use SimpleCaptcha::Middleware

data/lib/simple_captcha/{formtastic.rb → hooks/formtastic.rb}

@@ -3,12 +3,11 @@ require "formtastic"
 class SimpleCaptchaInput
   include ::Formtastic::Inputs::Base
   include ::Formtastic::Inputs::Base::Stringish
-  
+
   def to_html
     input_wrapping do
       input_html_options.update :object => method
       label_html << builder.show_simple_captcha(input_html_options)
-      # label_html << builder.text_field(method, input_html_options)
     end
   end
 end

data/lib/simple_captcha/hooks/simple_form.rb

@@ -0,0 +1,11 @@
+require 'simple_form'
+
+module SimpleCaptcha::SimpleForm
+  class CkeditorInput < ::SimpleForm::Inputs::Base
+    def input
+      @builder.simple_captcha(input_html_options)
+    end
+  end
+end
+
+::SimpleForm::FormBuilder.map_type :simple_captcha, :to => SimpleCaptcha::SimpleForm::CkeditorInput

data/lib/simple_captcha/image.rb

@@ -2,11 +2,37 @@ require 'tempfile'
 module SimpleCaptcha #:nodoc
   module ImageHelpers #:nodoc
 
+    mattr_accessor :image_styles
+    @@image_styles = {
+      'embosed_silver'  => ['-fill darkblue', '-shade 20x60', '-background white'],
+      'simply_red'      => ['-fill darkred', '-background white'],
+      'simply_green'    => ['-fill darkgreen', '-background white'],
+      'simply_blue'     => ['-fill darkblue', '-background white'],
+      'distorted_black' => ['-fill darkblue', '-edge 10', '-background white'],
+      'all_black'       => ['-fill darkblue', '-edge 2', '-background white'],
+      'charcoal_grey'   => ['-fill darkblue', '-charcoal 5', '-background white'],
+      'almost_invisible' => ['-fill red', '-solarize 50', '-background white']
+    }
+
     DISTORTIONS = ['low', 'medium', 'high']
 
     class << self
 
-      def image_params(color = '#0089d1')
+      def image_params(key = 'simply_blue')
+        image_keys = @@image_styles.keys
+
+        style = begin
+          if key == 'random'
+            image_keys[rand(image_keys.length)]
+          else
+            image_keys.include?(key) ? key : 'simply_blue'
+          end
+        end
+
+        @@image_styles[style]
+      end
+
+      def image_params_from_color(color)
         ["-alpha set -background none -fill \"#{color}\""]
       end
 
@@ -38,11 +64,16 @@ module SimpleCaptcha #:nodoc
       def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         amplitude, frequency = ImageHelpers.distortion(SimpleCaptcha.distortion)
         text = Utils::simple_captcha_new_value(simple_captcha_key)
-        params = ImageHelpers.image_params(SimpleCaptcha.image_color).dup
+        if SimpleCaptcha.image_color.nil?
+          params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
+        else
+          params = ImageHelpers.image_params_from_color(SimpleCaptcha.image_color).dup
+        end
+
         params << "-size #{SimpleCaptcha.image_size} xc:transparent"
         params << "-gravity \"Center\""
         if params.join(' ').index('-pointsize').nil?
-          params << "-pointsize 35"
+          params << "-pointsize #{SimpleCaptcha.pointsize}"
         end
         dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.png' : ['simple_captcha', '.png'], SimpleCaptcha.tmp_path)
         dst.binmode
@@ -58,13 +89,13 @@ module SimpleCaptcha #:nodoc
         end
 
         params << "\"#{File.expand_path(dst.path)}\""
-        # puts "convert " +  params.join(' ')
+        # puts "convert " + params.join(' ')
         SimpleCaptcha::Utils::run("convert", params.join(' '))
 
         dst.close
 
         File.expand_path(dst.path)
-        #dst
+                                                            #dst
       end
   end
 end

data/lib/simple_captcha/middleware.rb

@@ -26,8 +26,14 @@ module SimpleCaptcha
         request = Rack::Request.new(env)
         code = request.params["code"]
         body = []
+        
         if !code.blank? && Utils::simple_captcha_value(code)
-          return send_file(generate_simple_captcha_image(code), :type => 'image/png', :disposition => 'inline', :filename =>  'simple_captcha.png')
+          #status, headers, body = @app.call(env)
+          #status = 200
+          #body = generate_simple_captcha_image(code)
+          #headers['Content-Type'] = 'image/jpeg'
+          
+          return send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
         end
         
         [status, headers, body]
@@ -44,9 +50,9 @@ module SimpleCaptcha
 
         status = options[:status] || 200
         headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
-        response_body = File.open(path, 'rb').read
-        File.unlink(path)
-        [status, headers, [response_body]]
+        response_body = File.open(path, "rb")
+        
+        [status, headers, response_body]
       end
   end
 end

data/lib/simple_captcha/{simple_captcha_data_ar.rb → storage/active_record.rb}

@@ -1,33 +1,23 @@
-module SimpleCaptcha
-  class SimpleCaptchaData < ::ActiveRecord::Base
-    def self.rails3?
-      ::ActiveRecord::VERSION::MAJOR == 3
-    end
-
-    if rails3?
-      # Fixes deprecation warning in Rails 3.2:
-      # DEPRECATION WARNING: Calling set_table_name is deprecated. Please use `self.table_name = 'the_name'` instead.
-      self.table_name = "simple_captcha_data"
-    else
-      set_table_name "simple_captcha_data"
-    end
-    
-    attr_accessible :key, :value
-    
-    class << self
-      def get_data(key)
-        data = find_by_key(key) || new(:key => key)
-      end
-      
-      def remove_data(key)
-        delete_all(["#{connection.quote_column_name(:key)} = ?", key])
-        clear_old_data(1.hour.ago)
-      end
-      
-      def clear_old_data(time = 1.hour.ago)
-        return unless Time === time
-        delete_all(["#{connection.quote_column_name(:updated_at)} < ?", time])
-      end
-    end
-  end
-end
+module SimpleCaptcha
+  class SimpleCaptchaData < ::ActiveRecord::Base
+    self.table_name = "simple_captcha_data"
+
+    attr_accessible :key, :value
+
+    class << self
+      def get_data(key)
+        data = find_by_key(key) || new(:key => key)
+      end
+
+      def remove_data(key)
+        delete_all(["#{connection.quote_column_name(:key)} = ?", key])
+        clear_old_data(1.hour.ago)
+      end
+
+      def clear_old_data(time = 1.hour.ago)
+        return unless Time === time
+        delete_all(["#{connection.quote_column_name(:updated_at)} < ?", time])
+      end
+    end
+  end
+end

data/lib/simple_captcha/{simple_captcha_data_mongoid.rb → storage/mongoid.rb}

@@ -1,14 +1,14 @@
 module SimpleCaptcha
   class SimpleCaptchaData
     include Mongoid::Document
+    include Mongoid::Timestamps
     
     field :key, :type => String
     field :value, :type => String
-    field :created_at, :type => Time, default: -> { Time.now }
     
     class << self
       def get_data(key)
-        data = SimpleCaptchaData.where(:key => key).first || new(:key => key)
+        SimpleCaptchaData.where(:key => key).first || new(:key => key)
       end
       
       def remove_data(key)

data/lib/simple_captcha/utils.rb

@@ -23,12 +23,13 @@ module SimpleCaptcha #:nodoc
     def self.simple_captcha_value(key) #:nodoc
       SimpleCaptchaData.get_data(key).value rescue nil
     end
-    
+
     def self.simple_captcha_new_value(key) #:nodoc
       begin
         # very unsafe to display same code over and over
         value = ''
         # SimpleCaptcha.length.times{value << (48 + rand(10)).chr}
+
         SimpleCaptcha.length.times{value << (65 + rand(26)).chr}
         d = SimpleCaptchaData.get_data(key)
         d.value = value
@@ -38,7 +39,6 @@ module SimpleCaptcha #:nodoc
         nil
       end
     end
-    
 
     def self.simple_captcha_passed!(key) #:nodoc
       SimpleCaptchaData.remove_data(key)

data/lib/simple_captcha/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SimpleCaptcha
-  VERSION = "0.2.1".freeze
+  VERSION = "0.3.1".freeze
 end

data/lib/simple_captcha/view.rb

@@ -57,12 +57,12 @@ module SimpleCaptcha #:nodoc
 
     private
 
-      def simple_captcha_image(ckey, options = {})
+      def simple_captcha_image(simple_captcha_key, options = {})
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
         
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "/simple_captcha?code=#{ckey}&#{query}"
+        url = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
         
         "<img src='#{url}' alt='captcha' />".html_safe
       end
@@ -72,8 +72,7 @@ module SimpleCaptcha #:nodoc
           text_field(options[:object], :captcha, :value => '', :autocomplete => 'off') +
           hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
         else
-          text_field_tag(:captcha, nil, :autocomplete => 'off') +
-          hidden_field_tag(:captcha_key, options[:field_value])
+          text_field_tag(:captcha, nil, :autocomplete => 'off')
         end
       end
 

metadata

@@ -1,43 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
-- Pavlo Galeta
-- Igor Galeta
+- GlebTv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies: []
-description: SimpleCaptcha is available to be used with Rails 3 or above and also
-  it provides the backward compatibility with previous versions of Rails.
-email: galeta.igor@gmail.com
+description: .
+email: i@gleb.tv
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- lib/simple_captcha.rb
+- lib/generators/simple_captcha_generator.rb
 - lib/generators/templates/partial.erb
 - lib/generators/templates/migration.rb
-- lib/generators/simple_captcha_generator.rb
 - lib/generators/USAGE
-- lib/simple_captcha/active_record.rb
-- lib/simple_captcha/version.rb
-- lib/simple_captcha/view.rb
-- lib/simple_captcha/utils.rb
 - lib/simple_captcha/controller.rb
-- lib/simple_captcha/formtastic.rb
-- lib/simple_captcha/mongoid.rb
-- lib/simple_captcha/simple_captcha_data_ar.rb
-- lib/simple_captcha/engine.rb
-- lib/simple_captcha/form_builder.rb
+- lib/simple_captcha/storage/mongoid.rb
+- lib/simple_captcha/storage/active_record.rb
+- lib/simple_captcha/view.rb
+- lib/simple_captcha/hooks/form_builder.rb
+- lib/simple_captcha/hooks/formtastic.rb
+- lib/simple_captcha/hooks/simple_form.rb
 - lib/simple_captcha/middleware.rb
-- lib/simple_captcha/simple_captcha_data_mongoid.rb
+- lib/simple_captcha/engine.rb
 - lib/simple_captcha/image.rb
-- lib/simple_captcha.rb
+- lib/simple_captcha/utils.rb
+- lib/simple_captcha/active_record.rb
+- lib/simple_captcha/version.rb
 - Rakefile
 - README.rdoc
 - test/simple_captcha_test.rb
@@ -60,11 +58,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: glebtv-simple_captcha
+rubyforge_project: 
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: SimpleCaptcha is the simplest and a robust captcha plugin.
+summary: A fork of a fork of a fork of simple_captcha.
 test_files:
 - test/simple_captcha_test.rb
 has_rdoc: 

data/lib/simple_captcha/mongoid.rb

@@ -1,75 +0,0 @@
-module SimpleCaptcha #:nodoc
-  module ModelHelpers #:nodoc
-    def self.included(base)
-      base.extend(SingletonMethods)
-    end
-
-    # To implement model based simple captcha use this method in the model as...
-    #
-    #  class User
-    #    include Mongoid::Document
-    #    include Mongoid::SimpleCaptcha
-    #    apply_simple_captcha :message => "my customized message"
-    #
-    #  end
-    #
-    # Customize the error message by using :message, the default message is "Captcha did not match".
-    # As in the applications captcha is needed with a very few cases like signing up the new user, but
-    # not every time you need to authenticate the captcha with @user.save. So as to maintain simplicity
-    # here we have the explicit method to save the instace with captcha validation as...
-    #
-    # * to validate the instance
-    #
-    #  @user.valid_with_captcha?  # whene captcha validation is required.
-    #
-    #  @user.valid?               # when captcha validation is not required.
-    #
-    # * to save the instance
-    #
-    #  @user.save_with_captcha   # whene captcha validation is required.
-    #
-    #  @user.save                # when captcha validation is not required.
-    module SingletonMethods
-      def apply_simple_captcha(options = {})
-        options = { :add_to_base => false }.merge(options)
-
-        class_attribute :simple_captcha_options
-        self.simple_captcha_options = options
-
-        unless self.is_a?(ClassMethods)
-          include InstanceMethods
-          extend ClassMethods
-
-          attr_accessor :captcha, :captcha_key
-        end
-      end
-    end
-
-    module ClassMethods
-    end
-
-    module InstanceMethods
-
-      def valid_with_captcha?
-        [valid?, is_captcha_valid?].all?
-      end
-
-      def is_captcha_valid?
-        return true if Rails.env.test?
-
-        if captcha && captcha.upcase.delete(" ") == SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
-          SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)
-          return true
-        else
-          message = simple_captcha_options[:message] || I18n.t(self.class.model_name.downcase, :scope => [:simple_captcha, :message], :default => :default)
-          simple_captcha_options[:add_to_base] ? errors.add(:base, message) : errors.add(:captcha, message)
-          return false
-        end
-      end
-
-      def save_with_captcha
-        valid_with_captcha? && save(:validate => false)
-      end
-    end
-  end
-end