galetahub-simple_captcha 0.1.3 → 0.1.4

data/README.rdoc

@@ -28,7 +28,7 @@ backward compatibility with previous versions of Rails.
 
 or
 
-  gem 'galetahub-simple_captcha', :require => 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
+  gem 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
 
 ==Setup
 
@@ -69,7 +69,7 @@ In the view file within the form tags write this code
 
 and in the model class add this code
 
-  class User < ActiveRecord::Basse
+  class User < ActiveRecord::Base
     apply_simple_captcha
   end
 
@@ -166,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.

data/lib/simple_captcha.rb

@@ -6,12 +6,18 @@ module SimpleCaptcha
   autoload :ImageHelpers,      'simple_captcha/image'
   autoload :ViewHelper,        'simple_captcha/view'
   autoload :ControllerHelpers, 'simple_captcha/controller'
-  autoload :ModelHelpers,      'simple_captcha/active_record'
 
   autoload :FormBuilder,       'simple_captcha/form_builder'
   autoload :CustomFormBuilder, 'simple_captcha/formtastic'
 
-  autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
+  if defined?(ActiveRecord)
+    autoload :ModelHelpers,      'simple_captcha/active_record'
+    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
+  else
+    autoload :SimpleCaptchaData,      'simple_captcha/simple_captcha_data_mongoid.rb'
+  end
+
+
   autoload :Middleware,        'simple_captcha/middleware'
 
   mattr_accessor :image_size
@@ -40,6 +46,10 @@ module SimpleCaptcha
   mattr_accessor :image_magick_path
   @@image_magick_path = ''
 
+  # tmp directory
+  mattr_accessor :tmp_path
+  @@tmp_path = nil
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end

data/lib/simple_captcha/active_record.rb

@@ -40,6 +40,7 @@ module SimpleCaptcha #:nodoc
           extend ClassMethods
           
           attr_accessor :captcha, :captcha_key
+          attr_accessible :captcha, :captcha_key
         end
       end
     end
@@ -54,12 +55,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/form_builder.rb

@@ -3,6 +3,9 @@ module SimpleCaptcha
     def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
+      base.send(:include, ActionView::Helpers)
+      base.send(:include, Sprockets::Helpers::RailsHelper)
+      base.send(:include, Sprockets::Helpers::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end
@@ -26,7 +29,11 @@ module SimpleCaptcha
         end
         
         def simple_captcha_field(options={})
-          text_field(:captcha, :value => '', :autocomplete => 'off') +
+          html = {:autocomplete => 'off', :required => 'required', :value => ''}
+          html.merge!(options[:input_html] || {})
+          html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
+          
+          text_field(:captcha, html) +
           hidden_field(:captcha_key, {:value => options[:field_value]})
         end
     end

data/lib/simple_captcha/formtastic.rb

@@ -1,5 +1,5 @@
 module SimpleCaptcha
-  class CustomFormBuilder < Formtastic::SemanticFormBuilder
+  class CustomFormBuilder < Formtastic::FormBuilder
 
     private
 

data/lib/simple_captcha/image.rb

@@ -64,14 +64,16 @@ module SimpleCaptcha #:nodoc
         params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
         params << "-size #{SimpleCaptcha.image_size}"
         params << "-wave #{amplitude}x#{frequency}"
-        params << "-gravity 'Center'"
+        #params << "-gravity 'Center'"
+        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 = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.jpg' : ['simple_captcha', '.jpg'], SimpleCaptcha.tmp_path)
         dst.binmode
 
-        params << "label:#{text} '#{File.expand_path(dst.path)}'"
+        #params << "label:#{text} '#{File.expand_path(dst.path)}'"
+        params << "label:#{text} \"#{File.expand_path(dst.path)}\""
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))
 

data/lib/simple_captcha/simple_captcha_data.rb

@@ -1,6 +1,16 @@
 module SimpleCaptcha
   class SimpleCaptchaData < ::ActiveRecord::Base
-    set_table_name "simple_captcha_data"
+    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
     

data/lib/simple_captcha/simple_captcha_data_mongoid.rb

@@ -0,0 +1,25 @@
+module SimpleCaptcha
+  class SimpleCaptchaData
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :key, type: String
+    field :value, type: String
+
+    class << self
+      def get_data(key)
+        data = where(:key => key).first || new(:key => key)
+      end
+      
+      def remove_data(key)
+        where(:key => key).delete_all
+        clear_old_data(1.hour.ago)
+      end
+      
+      def clear_old_data(time = 1.hour.ago)
+        return unless Time === time
+        where(:updated_at.lte => time).delete_all
+      end
+    end
+  end
+end

data/lib/simple_captcha/version.rb

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

data/lib/simple_captcha/view.rb

@@ -62,17 +62,22 @@ module SimpleCaptcha #:nodoc
         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 = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
         
-        "<img src='#{url}' alt='captcha' />".html_safe
+        tag('img', :src => url, :alt => 'captcha')
       end
       
       def simple_captcha_field(options={})
+        html = {:autocomplete => 'off', :required => 'required'}
+        html.merge!(options[:input_html] || {})
+        html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
+          
         if options[:object]
-          text_field(options[:object], :captcha, :value => '', :autocomplete => 'off') +
+          text_field(options[:object], :captcha, html.merge(:value => '')) +
           hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
         else
-          text_field_tag(:captcha, nil, :autocomplete => 'off')
+          text_field_tag(:captcha, nil, html) +
+          hidden_field_tag(:captcha_key, options[:field_value])
         end
       end
 

metadata

@@ -1,84 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: galetahub-simple_captcha
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Pavlo Galeta
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-20 00:00:00 Z
+date: 2013-04-08 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.
+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: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- lib/generators/simple_captcha_generator.rb
-- lib/generators/templates/migration.rb
-- lib/generators/templates/partial.erb
-- lib/generators/USAGE
+files:
 - lib/simple_captcha.rb
-- lib/simple_captcha/engine.rb
-- lib/simple_captcha/utils.rb
-- lib/simple_captcha/controller.rb
-- lib/simple_captcha/view.rb
-- lib/simple_captcha/formtastic.rb
 - lib/simple_captcha/form_builder.rb
+- lib/simple_captcha/controller.rb
+- lib/simple_captcha/image.rb
 - lib/simple_captcha/simple_captcha_data.rb
-- lib/simple_captcha/middleware.rb
-- lib/simple_captcha/version.rb
 - lib/simple_captcha/active_record.rb
-- lib/simple_captcha/image.rb
+- lib/simple_captcha/version.rb
+- lib/simple_captcha/engine.rb
+- lib/simple_captcha/simple_captcha_data_mongoid.rb
+- lib/simple_captcha/formtastic.rb
+- lib/simple_captcha/middleware.rb
+- lib/simple_captcha/utils.rb
+- lib/simple_captcha/view.rb
+- lib/generators/templates/partial.erb
+- lib/generators/templates/migration.rb
+- lib/generators/simple_captcha_generator.rb
+- lib/generators/USAGE
 - Rakefile
 - README.rdoc
 - test/simple_captcha_test.rb
-homepage: http://github.com/galetahub/simple-captcha
+homepage: http://github.com/izzm/simple-captcha
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: galetahub-simple_captcha
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: SimpleCaptcha is the simplest and a robust captcha plugin.
-test_files: 
+test_files:
 - test/simple_captcha_test.rb