glebtv-simple_captcha 0.1.6 → 0.2.0

data/README.rdoc

@@ -1,7 +1,6 @@
 =SimpleCaptcha
-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
+
+SimpleCaptcha is the simplest and a robust captcha plugin. 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.
@@ -25,11 +24,11 @@ backward compatibility with previous versions of Rails.
 
 ==Installation
 
-  gem "glebtv-simple_captcha", :require => "simple_captcha"
+  gem "galetahub-simple_captcha", :require => "simple_captcha"
 
 or
 
-  gem 'glebtv-simple_captcha', :require => 'simple_captcha', :git => 'git://github.com/glebtv/simple-captcha.git'
+  gem 'galetahub-simple_captcha', :require => 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
 
 ==Setup
 
@@ -38,6 +37,8 @@ on the version of rails your application is using.
 
   rails generate simple_captcha
 
+  rake db:migrate
+
 ==Usage
 
 ===Controller Based
@@ -165,6 +166,13 @@ 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.
@@ -204,7 +212,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"
 
-==The Original Author
+==Who's who?
 
 Enjoy the simplest captcha implementation.
 
@@ -218,4 +226,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,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/lib/generators/USAGE

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

data/lib/generators/simple_captcha_generator.rb

@@ -6,9 +6,16 @@ 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")
+  end
 end

data/lib/generators/templates/migration.rb

@@ -0,0 +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

data/lib/simple_captcha.rb

@@ -10,8 +10,12 @@ module SimpleCaptcha
 
   autoload :FormBuilder,       'simple_captcha/form_builder'
   autoload :CustomFormBuilder, 'simple_captcha/formtastic'
-
-  autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
+  
+  if defined?(Mongoid)
+    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data_mongoid'
+  else
+    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data_ar'
+  end
   autoload :Middleware,        'simple_captcha/middleware'
 
   mattr_accessor :image_size
@@ -20,17 +24,8 @@ 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'
 
   # 'low', 'medium', 'high', 'random'
   mattr_accessor :distortion
@@ -40,9 +35,9 @@ module SimpleCaptcha
   mattr_accessor :image_magick_path
   @@image_magick_path = ''
 
-  def self.add_image_style(name, params = [])
-    SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
-  end
+  # tmp directory
+  mattr_accessor :tmp_path
+  @@tmp_path = nil
 
   def self.setup
     yield self

data/lib/simple_captcha/active_record.rb

@@ -54,12 +54,14 @@ 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_to_base(message) : errors.add(:captcha, message)
+          simple_captcha_options[:add_to_base] ? errors.add(: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(session[:captcha])
+        data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
         result = data == params[:captcha].delete(" ").upcase
         SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
         return result

data/lib/simple_captcha/formtastic.rb

@@ -3,7 +3,7 @@ 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

data/lib/simple_captcha/image.rb

@@ -2,34 +2,12 @@ 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(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]
+      def image_params(color = '#0089d1')
+        ["-alpha set -background none -fill \"#{color}\""]
       end
 
       def distortion(key='low')
@@ -59,20 +37,28 @@ module SimpleCaptcha #:nodoc
 
       def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         amplitude, frequency = ImageHelpers.distortion(SimpleCaptcha.distortion)
-        text = Utils::simple_captcha_value(simple_captcha_key)
+        text = Utils::simple_captcha_new_value(simple_captcha_key)
+        params = ImageHelpers.image_params(SimpleCaptcha.image_color).dup
+        params << "-size #{SimpleCaptcha.image_size} xc:transparent"
+        params << "-gravity \"Center\""
+        if params.join(' ').index('-pointsize').nil?
+          params << "-pointsize 35"
+        end
+        dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.png' : ['simple_captcha', '.png'], SimpleCaptcha.tmp_path)
+        dst.binmode
+        text.split(//).each_with_index do |letter, index|
+          i = -60 + (index*25) + rand(-6..6)
+          params << "-draw \"translate #{i},#{rand(-6..6)} skewX #{rand(-15..15)} gravity center text 0,0 '#{letter}'\" "
+        end
 
-        params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
-        params << "-size #{SimpleCaptcha.image_size}"
         params << "-wave #{amplitude}x#{frequency}"
-        params << "-gravity 'Center'"
-        params << "-pointsize 22"
-        params << "-implode 0.2"
 
-        dst = RUBY_VERSION < '1.9' ? Tempfile.new('simple_captcha.jpg') : Tempfile.new(['simple_captcha', '.jpg'])
-        dst.binmode
-
-        params << "label:#{text} '#{File.expand_path(dst.path)}'"
+        (1..10).each do |i|
+          params << "-draw \"polyline #{rand(160)},#{rand(61)} #{rand(160)},#{rand(62)}\""
+        end
 
+        params << "\"#{File.expand_path(dst.path)}\""
+        # puts "convert " +  params.join(' ')
         SimpleCaptcha::Utils::run("convert", params.join(' '))
 
         dst.close

data/lib/simple_captcha/middleware.rb

@@ -26,14 +26,8 @@ module SimpleCaptcha
         request = Rack::Request.new(env)
         code = request.params["code"]
         body = []
-        
         if !code.blank? && Utils::simple_captcha_value(code)
-          #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')
+          return send_file(generate_simple_captcha_image(code), :type => 'image/png', :disposition => 'inline', :filename =>  'simple_captcha.png')
         end
         
         [status, headers, body]
@@ -50,9 +44,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")
-        
-        [status, headers, response_body]
+        response_body = File.open(path, 'rb').read
+        File.unlink(path)
+        [status, headers, [response_body]]
       end
   end
 end

data/lib/simple_captcha/simple_captcha_data_ar.rb

@@ -0,0 +1,33 @@
+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

data/lib/simple_captcha/utils.rb

@@ -23,6 +23,22 @@ 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
+        d.save!
+        value
+      rescue
+        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.1.6".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/simple_captcha/view.rb

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

metadata

@@ -1,40 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
-- Weverton do Couto Timoteo
+- Pavlo Galeta
+- Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-description: .
-email: weverton@wolcan.us
+date: 2012-12-01 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
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
 - 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
@@ -43,11 +30,12 @@ files:
 - lib/simple_captcha/utils.rb
 - lib/simple_captcha/controller.rb
 - lib/simple_captcha/formtastic.rb
+- lib/simple_captcha/simple_captcha_data_ar.rb
 - lib/simple_captcha/engine.rb
 - lib/simple_captcha/form_builder.rb
 - lib/simple_captcha/middleware.rb
+- lib/simple_captcha/simple_captcha_data_mongoid.rb
 - lib/simple_captcha/image.rb
-- lib/simple_captcha/simple_captcha_data.rb
 - lib/simple_captcha.rb
 - Rakefile
 - README.rdoc
@@ -71,11 +59,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: glebtv-simple_captcha
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: A fork of a wolcanus fork of galetahub SimpleCaptcha for mongoid support.
+summary: SimpleCaptcha is the simplest and a robust captcha plugin.
 test_files:
 - test/simple_captcha_test.rb
 has_rdoc: