validates_captcha 0.9.2 → 0.9.3

data/lib/validates_captcha/string_generator/simple.rb

@@ -10,7 +10,7 @@ module ValidatesCaptcha
     #
     # You can implement your own string generator by creating a 
     # class that conforms to the method definitions of the example below and 
-    # assign an instance of it to ValidatesCaptcha#string_generator=.
+    # assign an instance of it to ValidatesCaptcha::Provider::Image#string_generator=.
     #
     # Example for a custom string generator:
     #
@@ -22,7 +22,8 @@ module ValidatesCaptcha
     #    end
     #  end
     #
-    #  ValidatesCaptcha.string_generator = DictionaryGenerator.new
+    #  ValidatesCaptcha::Provider::Image.string_generator = DictionaryGenerator.new
+    #  ValidatesCaptcha.provider = ValidatesCaptcha::Provider::Image.new
     #    
     class Simple
       @@alphabet = 'abdefghjkmnqrtABDEFGHJKLMNQRT234678923467892346789'

data/lib/validates_captcha/version.rb

@@ -2,7 +2,7 @@ module ValidatesCaptcha #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY = 2
+    TINY = 3
  
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails/init.rb

@@ -16,7 +16,7 @@ module ::ValidatesCaptcha
     end
     
     def call(env)
-      result = ValidatesCaptcha.middleware.call(env)
+      result = ValidatesCaptcha.provider.call(env)
       
       return @app.call(env) unless RECOGNIZED_RESPONSE_STATUS_CODES.include?(result.first)
       

data/test/cases/controller_validation_test.rb

@@ -33,11 +33,8 @@ class WidgetsController < ActionController::Base
   end
   
   def save
-    encrypted = ValidatesCaptcha.encrypt_captcha_code('take this')
-    decrypted = ValidatesCaptcha.decrypt_captcha_code(encrypted)
-    
     begin
-      Widget.create! :captcha => decrypted, :encrypted_captcha => encrypted
+      Widget.create! params['widget']
     rescue ActiveRecord::RecordInvalid
       @invalid = true
     end
@@ -46,11 +43,8 @@ class WidgetsController < ActionController::Base
   end
   
   def store
-    encrypted = ValidatesCaptcha.encrypt_captcha_code('take this')
-    decrypted = ValidatesCaptcha.decrypt_captcha_code(encrypted) + 'ha!'
-    
     begin
-      Widget.create! :captcha => decrypted, :encrypted_captcha => encrypted
+      Widget.create! params['widget']
     rescue ActiveRecord::RecordInvalid
       @invalid = true
     end
@@ -59,11 +53,8 @@ class WidgetsController < ActionController::Base
   end
   
   def persist
-    encrypted = ValidatesCaptcha.encrypt_captcha_code('take this')
-    decrypted = ValidatesCaptcha.decrypt_captcha_code(encrypted) + 'ha!'
-    
     begin
-      Widget.create! :captcha => decrypted, :encrypted_captcha => encrypted
+      Widget.create! params['widget']
     rescue ActiveRecord::RecordInvalid
       @invalid = true
     end
@@ -85,6 +76,20 @@ end
 class ControllerValidationTest < ActionController::TestCase
   tests WidgetsController
   
+  def with_image_provider(&block)
+    old_provider = ValidatesCaptcha.provider
+    provider = ValidatesCaptcha.provider = ValidatesCaptcha::Provider::Image.new
+    yield provider
+    ValidatesCaptcha.provider = old_provider
+  end
+  
+  def with_question_provider(&block)
+    old_provider = ValidatesCaptcha.provider
+    provider = ValidatesCaptcha.provider = ValidatesCaptcha::Provider::Question.new
+    yield provider
+    ValidatesCaptcha.provider = old_provider
+  end
+  
   test "defines a class level #validates_captcha method" do
     assert_respond_to WidgetsController, :validates_captcha
   end
@@ -104,22 +109,74 @@ class ControllerValidationTest < ActionController::TestCase
   end
   
   test "calling #save method of controller should not assign @invalid" do
-    post :save
-    assert_nil assigns(:invalid)
+    with_image_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = provider.send(:decrypt, challenge)
+      
+      post :save, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_nil assigns(:invalid)
+    end
+    
+    with_question_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = provider.send(:solve, challenge)
+      
+      post :save, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_nil assigns(:invalid)
+    end
   end
   
-  test "calling #store method of controller should should assign @invalid" do
-    post :store
-    assert_not_nil assigns(:invalid)
+  test "calling #store method of controller should assign @invalid" do
+    with_image_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = provider.send(:decrypt, challenge).reverse
+      
+      post :store, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_not_nil assigns(:invalid)
+    end
+    
+    with_question_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = '---'
+      
+      post :store, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_not_nil assigns(:invalid)
+    end
   end
   
-  test "calling #persist method of controller should should assign @invalid" do
-    post :persist
-    assert_not_nil assigns(:invalid)
+  test "calling #persist method of controller should assign @invalid" do
+    with_image_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = provider.send(:decrypt, challenge).reverse
+      
+      post :persist, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_not_nil assigns(:invalid)
+    end
+    
+    with_question_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = '---'
+      
+      post :persist, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_not_nil assigns(:invalid)
+    end
   end
   
   test "calling #bingo method of controller should not assign @invalid" do
-    post :bingo
-    assert_nil assigns(:invalid)
+    with_image_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = provider.send(:decrypt, challenge).reverse
+      
+      post :bingo, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_nil assigns(:invalid)
+    end
+    
+    with_question_provider do |provider|
+      challenge = provider.generate_challenge
+      solution = '---'
+      
+      post :bingo, { 'widget' => { 'captcha_challenge' => challenge, 'captcha_solution' => solution } }
+      assert_nil assigns(:invalid)
+    end
   end
 end

data/test/cases/{image_generator_test.rb → image_generator/simple_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
-
+ 
 IG = ValidatesCaptcha::ImageGenerator::Simple
-
+ 
 class ImageGeneratorTest < ValidatesCaptcha::TestCase
   test "defines an instance level #generate method" do
     assert_respond_to IG.new, :generate
@@ -15,19 +15,20 @@ class ImageGeneratorTest < ValidatesCaptcha::TestCase
     assert_kind_of String, IG.new.generate('abc')
   end
   
-  test "defines an instance level #image_file_extension method" do
-    assert_respond_to IG.new, :image_file_extension
+  test "defines an instance level #file_extension method" do
+    assert_respond_to IG.new, :file_extension
   end
   
-  test "instance level #image_file_extension method returns a string" do
-    assert_kind_of String, IG.new.image_file_extension
+  test "instance level #file_extension method returns a string" do
+    assert_kind_of String, IG.new.file_extension
   end
   
-  test "defines an instance level #image_mime_type method" do
-    assert_respond_to IG.new, :image_mime_type
+  test "defines an instance level #mime_type method" do
+    assert_respond_to IG.new, :mime_type
   end
   
-  test "instance level #image_mime_type method returns a string" do
-    assert_kind_of String, IG.new.image_mime_type
+  test "instance level #mime_type method returns a string" do
+    assert_kind_of String, IG.new.mime_type
   end
 end
+

data/test/cases/model_validation_test.rb

@@ -1,42 +1,56 @@
 require 'test_helper'
 
 class ModelValidationTest < ValidatesCaptcha::TestCase
-  test "defines an accessible attribute named +captcha+" do
-    assert Widget.accessible_attributes.include?('captcha')
+  def with_image_provider(&block)
+    old_provider = ValidatesCaptcha.provider
+    provider = ValidatesCaptcha.provider = ValidatesCaptcha::Provider::Image.new
+    yield provider
+    ValidatesCaptcha.provider = old_provider
   end
   
-  test "defines an instance level #captcha method" do
-    assert_respond_to Widget.new, :captcha
+  def with_question_provider(&block)
+    old_provider = ValidatesCaptcha.provider
+    provider = ValidatesCaptcha.provider = ValidatesCaptcha::Provider::Question.new
+    yield provider
+    ValidatesCaptcha.provider = old_provider
   end
   
-  test "defines a instance level #captcha= method" do
-    assert_respond_to Widget.new, :captcha=
+  test "defines an accessible attribute named +captcha_solution+" do
+    assert Widget.accessible_attributes.include?('captcha_solution')
   end
   
-  test "assigned value to #captcha= should equal return value of #captcha" do
+  test "defines an instance level #captcha_solution method" do
+    assert_respond_to Widget.new, :captcha_solution
+  end
+  
+  test "defines a instance level #captcha_solution= method" do
+    assert_respond_to Widget.new, :captcha_solution=
+  end
+  
+  test "assigned value to #captcha_solution= should equal return value of #captcha_solution" do
     widget = Widget.new
-    widget.captcha = 'abc123'
+    widget.captcha_solution = 'abc123'
     
-    assert_equal 'abc123', widget.captcha
+    assert_equal 'abc123', widget.captcha_solution
   end
   
-  test "defines an accessible attribute named +encrypted_captcha+" do
-    assert Widget.accessible_attributes.include?('encrypted_captcha')
+  test "defines an accessible attribute named +captcha_challenge+" do
+    assert Widget.accessible_attributes.include?('captcha_challenge')
   end
   
-  test "defines an instance level #encrypted_captcha method" do
-    assert_respond_to Widget.new, :encrypted_captcha
+  test "defines an instance level #captcha_challenge method" do
+    assert_respond_to Widget.new, :captcha_challenge
   end
   
-  test "defines an instance level #encrypted_captcha= method" do
-    assert_respond_to Widget.new, :encrypted_captcha=
+  test "defines an instance level #captcha_challenge= method" do
+    assert_respond_to Widget.new, :captcha_challenge=
   end
   
-  test "value assigned to #encrypted_captcha= should equal return value of #encrypted_captcha" do
+  test "value assigned to #captcha_challenge= should equal return value of #captcha_challenge" do
     widget = Widget.new
-    widget.encrypted_captcha = 'asdfghjk3456789'
+    widget.captcha_challenge = 'asdfghjk3456789'
     
-    assert_equal 'asdfghjk3456789', widget.encrypted_captcha
+    assert_equal 'asdfghjk3456789', widget.captcha_challenge
   end
   
   test "defines #validate_captcha method callback of kind +validate+" do
@@ -47,84 +61,143 @@ class ModelValidationTest < ValidatesCaptcha::TestCase
     assert_respond_to Widget, :with_captcha_validation
   end
   
-  test "not within a #with_captcha_validation block, calling valid? should return true if no captcha is set" do
+  test "not within a #with_captcha_validation block, calling valid? should return true if no captcha_solution is set" do
     widget = Widget.new
+    widget.captcha_solution = nil
     
     assert widget.valid?
   end
   
-  test "not within a #with_captcha_validation block, calling valid? should return true if an empty captcha is set" do
+  test "not within a #with_captcha_validation block, calling valid? should return true if an empty captcha_solution is set" do
     widget = Widget.new
-    widget.captcha = '   '
+    widget.captcha_solution = '   '
     
     assert widget.valid?
   end
   
-  test "not within a #with_captcha_validation block, calling valid? should return true if an invalid captcha is set" do
-    widget = Widget.new
-    widget.captcha = 'J§$%ZT&/ÖGHJ'
+  test "not within a #with_captcha_validation block, calling valid? should return true if an invalid captcha_solution is set" do
+    with_image_provider do |provider|
+      widget = Widget.new
+      widget.captcha_solution = provider.send(:decrypt, widget.captcha_challenge).reverse
+      
+      assert widget.valid?
+    end
     
-    assert widget.valid?
+    with_question_provider do |provider|
+      widget = Widget.new
+      widget.captcha_solution = '---'
+      
+      assert widget.valid?
+    end
   end
   
-  test "not within a #with_captcha_validation block, calling valid? should return true if a valid captcha is set" do
-    widget = Widget.new
-    widget.captcha = ValidatesCaptcha.decrypt_captcha_code(widget.encrypted_captcha)
+  test "not within a #with_captcha_validation block, calling valid? should return true if a valid captcha_solution is set" do
+    with_image_provider do |provider|
+      widget = Widget.new
+      widget.captcha_solution = provider.send(:decrypt, widget.captcha_challenge)
+      
+      assert widget.valid?
+    end
     
-    assert widget.valid?
-  end
-  
-  test "within a #with_captcha_validation block, calling valid? should return false if no captcha is set" do
-    Widget.with_captcha_validation do
+    with_question_provider do |provider|
       widget = Widget.new
+      widget.captcha_solution = provider.send(:solve, widget.captcha_challenge)
       
-      assert !widget.valid?
-      assert_equal 1, Array.wrap(widget.errors[:captcha]).size
-      assert Array.wrap(widget.errors[:captcha]).first.include?('blank')
+      assert widget.valid?
     end
   end
   
-  test "within a #with_captcha_validation block, calling valid? should return false if an empty captcha is set" do
+  test "within a #with_captcha_validation block, calling valid? should return false if no captcha_solution is set" do
     Widget.with_captcha_validation do
       widget = Widget.new
-      widget.captcha = '   '
+      widget.captcha_solution = nil
       
       assert !widget.valid?
-      assert_equal 1, Array.wrap(widget.errors[:captcha]).size
-      assert Array.wrap(widget.errors[:captcha]).first.include?('blank')
+      assert_equal 1, Array.wrap(widget.errors[:captcha_solution]).size
+      assert Array.wrap(widget.errors[:captcha_solution]).first.include?('blank')
     end
   end
   
-  test "within a #with_captcha_validation block, calling valid? should return false if an invalid captcha is set" do
+  test "within a #with_captcha_validation block, calling valid? should return false if an empty captcha_solution is set" do
     Widget.with_captcha_validation do
       widget = Widget.new
-      widget.captcha = 'J§$%ZT&/ÖGHJ'
+      widget.captcha_solution = '   '
       
       assert !widget.valid?
-      assert_equal 1, Array.wrap(widget.errors[:captcha]).size
-      assert Array.wrap(widget.errors[:captcha]).first.include?('invalid')
+      assert_equal 1, Array.wrap(widget.errors[:captcha_solution]).size
+      assert Array.wrap(widget.errors[:captcha_solution]).first.include?('blank')
     end
   end
   
-  test "within a #with_captcha_validation block, calling valid? should return true if a valid captcha is set" do
-    Widget.with_captcha_validation do
-      widget = Widget.new
-      widget.captcha = ValidatesCaptcha.decrypt_captcha_code(widget.encrypted_captcha)
-      
-      assert widget.valid?
+  test "within a #with_captcha_validation block, calling valid? should return false if an invalid captcha_solution is set" do
+    with_image_provider do |provider|
+      Widget.with_captcha_validation do
+        widget = Widget.new
+        widget.captcha_solution = provider.send(:decrypt, widget.captcha_challenge).reverse
+        
+        assert !widget.valid?
+        assert_equal 1, Array.wrap(widget.errors[:captcha_solution]).size
+        assert Array.wrap(widget.errors[:captcha_solution]).first.include?('invalid')
+      end
+    end
+    
+    with_question_provider do |provider|
+      Widget.with_captcha_validation do
+        widget = Widget.new
+        widget.captcha_solution = '---'
+        
+        assert !widget.valid?
+        assert_equal 1, Array.wrap(widget.errors[:captcha_solution]).size
+        assert Array.wrap(widget.errors[:captcha_solution]).first.include?('invalid')
+      end
     end
   end
   
-  test "with #with_captcha_validation block, calling valid? before and after the block should return true if valid? returned false within block" do
-    widget = Widget.new
-    widget.captcha = 'J§$%ZT&/ÖGHJ'
-    
-    assert widget.valid?
+  test "within a #with_captcha_validation block, calling valid? should return true if a valid captcha_solution is set" do
+    with_image_provider do |provider|
+      Widget.with_captcha_validation do
+        widget = Widget.new
+        widget.captcha_solution = provider.send(:decrypt, widget.captcha_challenge)
+        
+        assert widget.valid?
+      end
+    end
     
-    Widget.with_captcha_validation do
-      assert !widget.valid?
+    with_question_provider do |provider|
+      Widget.with_captcha_validation do
+        widget = Widget.new
+        widget.captcha_solution = provider.send(:solve, widget.captcha_challenge)
+        
+        assert widget.valid?
+      end
+    end
+  end
+  
+  test "with #with_captcha_validation block, calling valid? before and after the block should return true if valid? returned false within block" do
+    with_image_provider do |provider|
+      widget = Widget.new
+      widget.captcha_solution = provider.send(:decrypt, widget.captcha_challenge).reverse
+      
+      assert widget.valid?
+      
+      Widget.with_captcha_validation do
+        assert !widget.valid?
+      end
+      
+      assert widget.valid?
     end
     
-    assert widget.valid?
+    with_question_provider do |provider|
+      widget = Widget.new
+      widget.captcha_solution = '---'
+      
+      assert widget.valid?
+      
+      Widget.with_captcha_validation do
+        assert !widget.valid?
+      end
+      
+      assert widget.valid?
+    end
   end
 end