dalli_captcha 0.0.2 → 0.0.3

data/lib/dalli_captcha/key_handler.rb

@@ -1,41 +1,41 @@
-module DalliCaptcha
-  class KeyHandler
-    def initialize(captcha_key)
-      @dalli = DalliCaptcha.dalli
-      @captcha_key = captcha_key
-      @options = DalliCaptcha.options
-
-      @string_key = "#{@options[:dalli_scope]}:#{@captcha_key}:string"
-      @locked_times_key = "#{@options[:dalli_scope]}:#{@captcha_key}:locked_times"
-    end
-
-    #set string in memcache
-    def set(string)
-      string = @options[:case_sensitive] ? string : string.downcase
-      @dalli.set(@string_key,string,@options[:expired_time])
-
-      #locked_times = @dalli.get(@locked_times_key).to_i
-      #@dalli.incrby(@locked_times_key, 1)
-      #@dalli.expire(@locked_times_key, @options[:locked_time]) if locked_times == 0
-    end
-
-    def delete
-      @dalli.delete(@string_key)
-      #@dalli.del(@locked_times_key)
-    end
-
-    def locked?
-      locked_times = @dalli.get(@locked_times_key).to_i
-      @captcha_key.blank? || (locked_times >= @options[:locked_times])
-    end
-
-    def valid?(captcha)
-      string = @dalli.get(@string_key)
-      if captcha.blank? || string.blank?
-        return false
-      else
-        string == (@options[:case_sensitive] ? captcha : captcha.downcase)
-      end
-    end
-  end
-end
+module DalliCaptcha
+  class KeyHandler
+    def initialize(captcha_key)
+      @dalli = DalliCaptcha.dalli
+      @captcha_key = captcha_key
+      @options = DalliCaptcha.options
+
+      @string_key = "#{@options[:dalli_scope]}:#{@captcha_key}:string"
+      #@locked_times_key = "#{@options[:dalli_scope]}:#{@captcha_key}:locked_times"
+    end
+
+    #set string in memcache
+    def set(string)
+      string = @options[:case_sensitive] ? string : string.downcase
+      @dalli.set(@string_key,string,@options[:expired_time])
+
+      #locked_times = @dalli.get(@locked_times_key).to_i
+      #@dalli.incrby(@locked_times_key, 1)
+      #@dalli.expire(@locked_times_key, @options[:locked_time]) if locked_times == 0
+    end
+
+    def delete
+      @dalli.delete(@string_key)
+      #@dalli.del(@locked_times_key)
+    end
+
+    def locked?
+      locked_times = @dalli.get(@locked_times_key).to_i
+      @captcha_key.blank? || (locked_times >= @options[:locked_times])
+    end
+
+    def valid?(captcha)
+      string = @dalli.get(@string_key)
+      if captcha.blank? || string.blank?
+        return false
+      else
+        string == (@options[:case_sensitive] ? captcha : captcha.downcase)
+      end
+    end
+  end
+end

data/lib/dalli_captcha/model.rb

@@ -1,45 +1,45 @@
-module DalliCaptcha
-  module Model
-    extend ActiveSupport::Concern
-
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.send :validate, :check_captcha
-      base.send :after_save, :delete_captcha
-      base.send :attr_accessor, :captcha, :captcha_key
-    end
-
-    module ClassMethods
-    end
-
-    def key_handler
-      @key_handler ||= DalliCaptcha::KeyHandler.new(captcha_key)
-    end
-
-    def check_captcha
-      if without_captcha?
-        @skip_captcha = false
-      else
-        errors.add(:captcha, DalliCaptcha::options[:error_message]) unless key_handler.valid?(captcha)
-      end
-    end
-
-    def delete_captcha
-      key_handler.delete
-    end
-
-    def without_captcha?
-      !!@skip_captcha
-    end
-
-    def valid_without_captcha?
-      @skip_captcha = true
-      self.valid?
-    end
-
-    def save_without_captcha
-      @skip_captcha = true
-      self.save
-    end
-  end
-end
+module DalliCaptcha
+  module Model
+    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.send :validate, :check_captcha
+      base.send :after_save, :delete_captcha
+      base.send :attr_accessor, :captcha, :captcha_key
+    end
+
+    module ClassMethods
+    end
+
+    def key_handler
+      @key_handler ||= DalliCaptcha::KeyHandler.new(captcha_key)
+    end
+
+    def check_captcha
+      if without_captcha?
+        @skip_captcha = false
+      else
+        errors.add(:captcha, DalliCaptcha::options[:error_message]) unless key_handler.valid?(captcha)
+      end
+    end
+
+    def delete_captcha
+      key_handler.delete
+    end
+
+    def without_captcha?
+      !!@skip_captcha
+    end
+
+    def valid_without_captcha?
+      @skip_captcha = true
+      self.valid?
+    end
+
+    def save_without_captcha
+      @skip_captcha = true
+      self.save
+    end
+  end
+end

data/lib/dalli_captcha/version.rb

@@ -1,3 +1,3 @@
-module DalliCaptcha
-  VERSION = "0.0.2"
-end
+module DalliCaptcha
+  VERSION = "0.0.3"
+end

data/lib/generators/install_generator.rb

@@ -1,21 +1,21 @@
-
-require 'rails/generators'
-
-module DalliCaptcha
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
-
-      desc "Copy DalliCaptcha default files"
-
-      def copy_initializer
-        copy_file "redis_captcha.rb", "config/initializers/redis_captcha.rb"
-      end
-
-      def show_readme
-          readme "README"
-      end
-
-    end
-  end
-end
+
+require 'rails/generators'
+
+module DalliCaptcha
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc "Copy DalliCaptcha default files"
+
+      def copy_initializer
+        copy_file "dalli_captcha.rb", "config/initializers/dalli_captcha.rb"
+      end
+
+      def show_readme
+          readme "README"
+      end
+
+    end
+  end
+end

data/lib/generators/templates/README

@@ -1,29 +1,29 @@
-===============================================================================
-
-1. Setup "config/initializers/dalli_captcha.rb"
-
-2. Mount RedisCaptcha::Engine in your router.rb
-
-   mount RedisCaptcha::Engine => '/captcha', :as => :captcha
-
-3. Add to your controller
-
-   before_filter :generate_captcha_key
-
-4. Add to your model
-
-   include RedisCaptcha::Model
-
-5. If you set "config.active_record.whitelist_attributes = true" in "config/application.rb", remember to add attr_accessible to your model
-
-   attr_accessible :captcha, :captcha_key
-
-6. Add to your view
-
-<%= image_tag(captcha_path(:timestamp => Time.now.to_i), :alt => "captcha") %>
-<%= f.text_field :captcha %>
-<%= f.hidden_field :captcha_key, :value => session[:captcha_key] %>
-
-Enjoy it :)
-
-===============================================================================
+===============================================================================
+
+1. Setup "config/initializers/dalli_captcha.rb"
+
+2. Mount DalliCaptcha::Engine in your router.rb
+
+   mount DalliCaptcha::Engine => '/captcha', :as => :captcha
+
+3. Add to your controller
+
+   before_filter :generate_captcha_key
+
+4. Add to your model
+
+   include DalliCaptcha::Model
+
+5. If you set "config.active_record.whitelist_attributes = true" in "config/application.rb", remember to add attr_accessible to your model
+
+   attr_accessible :captcha, :captcha_key
+
+6. Add to your view
+
+<%= image_tag(captcha_path(:timestamp => Time.now.to_i), :alt => "captcha") %>
+<%= f.text_field :captcha %>
+<%= f.hidden_field :captcha_key, :value => session[:captcha_key] %>
+
+Enjoy it :)
+
+===============================================================================

data/lib/generators/templates/dalli_captcha.rb

@@ -1,73 +1,73 @@
-DalliCaptcha.setup do |config|
-
-  # ==> Dalli configuration
-  config.dalli_config = {
-    :host => "localhost:11211",
-    :compress => true,
-    :namespace => "captcha"
-  }
-
-  # ==> Dalli scope configuration
-  config.dalli_scope = "DalliCaptcha"
-
-  # ==> Dalli key expired time
-  config.expired_time = 1800
-
-  # ==> Dalli locked times and locked time
-  config.locked_times = 30
-  config.locked_time = 600
-
-  # ==> ImageMagick path
-  config.image_magick_path = ""
-
-  # ==> Tempfile path
-  config.tempfile_path = "/tmp"
-
-  # ==> Tempfile name
-  config.tempfile_name = "dalli_captcha"
-
-  # ==> Tempfile type and content type
-  config.tempfile_type = ".png"
-  config.content_type = "image/png"
-
-  # ==> Image width and height
-  config.width = 120
-  config.height = 30
-
-  # ==> Char set
-  # You can add/remove char you want
-  config.chars = %w(2 3 4 5 6 7 9 a c d e f g h j k m n p q r s t w x y z A C D E F G H J K L M N P Q R S T X Y Z)
-
-  # ==> String length
-  # You can set the same value if you don't want it to be random length
-  config.string_length = {
-    :max => 6,
-    :min => 4
-  }
-
-  # ==> Image font color and background
-  config.font_color = "gray"
-  config.background = "white"
-
-  # ==> Lines on your captcha
-  # You can set 0, 0 if you don't want to draw any line on your captcha
-  config.line = {
-    :max => 4,
-    :min => 2
-  }
-  config.line_color = "gary"
-
-  # ==> Swirl
-  # http://www.imagemagick.org/Usage/warping/#swirl
-  config.swirl_range = {
-    :max => 20,
-    :min => -20
-  }
-
-  # ==> Case sensitive
-  config.case_sensitive = false
-
-  # ==> Error message
-  # if you want to use I18n in your model, you can set it to be nil
-  config.error_message = "is invalid"
-end
+DalliCaptcha.setup do |config|
+
+  # ==> Dalli configuration
+  config.dalli_config = {
+    :host => "localhost:11211",
+    :compress => true,
+    :namespace => "captcha"
+  }
+
+  # ==> Dalli scope configuration
+  config.dalli_scope = "DalliCaptcha"
+
+  # ==> Dalli key expired time
+  config.expired_time = 1800
+
+  # ==> Dalli locked times and locked time
+  config.locked_times = 30
+  config.locked_time = 600
+
+  # ==> ImageMagick path
+  config.image_magick_path = ""
+
+  # ==> Tempfile path
+  config.tempfile_path = "/tmp"
+
+  # ==> Tempfile name
+  config.tempfile_name = "dalli_captcha"
+
+  # ==> Tempfile type and content type
+  config.tempfile_type = ".png"
+  config.content_type = "image/png"
+
+  # ==> Image width and height
+  config.width = 120
+  config.height = 30
+
+  # ==> Char set
+  # You can add/remove char you want
+  config.chars = %w(2 3 4 5 6 7 9 a c d e f g h j k m n p q r s t w x y z A C D E F G H J K L M N P Q R S T X Y Z)
+
+  # ==> String length
+  # You can set the same value if you don't want it to be random length
+  config.string_length = {
+    :max => 6,
+    :min => 4
+  }
+
+  # ==> Image font color and background
+  config.font_color = "gray"
+  config.background = "white"
+
+  # ==> Lines on your captcha
+  # You can set 0, 0 if you don't want to draw any line on your captcha
+  config.line = {
+    :max => 4,
+    :min => 2
+  }
+  config.line_color = "gary"
+
+  # ==> Swirl
+  # http://www.imagemagick.org/Usage/warping/#swirl
+  config.swirl_range = {
+    :max => 20,
+    :min => -20
+  }
+
+  # ==> Case sensitive
+  config.case_sensitive = false
+
+  # ==> Error message
+  # if you want to use I18n in your model, you can set it to be nil
+  config.error_message = "is invalid"
+end

data/lib/tasks/dalli_captcha_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :dalli_captcha do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :dalli_captcha do
+#   # Task goes here
+# end

data/test/dalli_captcha_test.rb

@@ -1,7 +1,7 @@
-require 'test_helper'
-
-class DalliCaptchaTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, DalliCaptcha
-  end
-end
+require 'test_helper'
+
+class DalliCaptchaTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, DalliCaptcha
+  end
+end