validates_captcha 0.9.2 → 0.9.3

data/test/cases/provider/image_test.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+
+IMAGE = ValidatesCaptcha::Provider::Image
+
+class ImageTest < ValidatesCaptcha::TestCase
+  test "defines a class level #string_generator method" do
+    assert_respond_to IMAGE, :string_generator
+  end
+  
+  test "defines a class level #string_generator= method" do
+    assert_respond_to IMAGE, :string_generator=
+  end
+  
+  test "#string_generator method's return value should equal the value set using the #string_generator= method" do
+    old_string_generator = IMAGE.string_generator
+    
+    IMAGE.string_generator = 'abc'
+    assert_equal 'abc', IMAGE.string_generator
+    
+    IMAGE.string_generator = old_string_generator
+  end
+  
+  test "defines a class level #reversible_encrypter method" do
+    assert_respond_to IMAGE, :reversible_encrypter
+  end
+  
+  test "defines a class level #reversible_encrypter= method" do
+    assert_respond_to IMAGE, :reversible_encrypter=
+  end
+  
+  test "#reversible_encrypter method's return value should equal the value set using the #reversible_encrypter= method" do
+    old_reversible_encrypter = IMAGE.reversible_encrypter
+    
+    IMAGE.reversible_encrypter = 'abc'
+    assert_equal 'abc', IMAGE.reversible_encrypter
+    
+    IMAGE.reversible_encrypter = old_reversible_encrypter
+  end
+  
+  test "defines a class level #image_generator method" do
+    assert_respond_to IMAGE, :image_generator
+  end
+  
+  test "defines a class level #image_generator= method" do
+    assert_respond_to IMAGE, :image_generator=
+  end
+  
+  test "#image_generator method's return value should equal the value set using the #image_generator= method" do
+    old_image_generator = IMAGE.image_generator
+    
+    IMAGE.image_generator = 'abc'
+    assert_equal 'abc', IMAGE.image_generator
+    
+    IMAGE.image_generator = old_image_generator
+  end
+  
+  test "calling #call with unrecognized path should have response status 404" do
+    result = IMAGE.new.call 'PATH_INFO' => '/unrecognized'
+    
+    assert_equal 404, result.first
+  end
+  
+  test "calling #call with recognized path should not have response status 404" do
+    result = IMAGE.new.call 'PATH_INFO' => IMAGE.new.send(:image_path, 'abc123')
+    
+    assert_not_equal 404, result.first
+  end
+  
+  test "calling #call with valid encrypted captcha code should have response status 200" do
+    encrypted_code = IMAGE.new.generate_challenge
+    result = IMAGE.new.call 'PATH_INFO' => "/captchas/#{encrypted_code}"
+    
+    assert_equal 200, result.first
+  end
+  
+  test "calling #call with valid encrypted captcha code should have expected content type response header" do
+    encrypted_code = IMAGE.new.generate_challenge
+    result = IMAGE.new.call 'PATH_INFO' => "/captchas/#{encrypted_code}"
+    
+    assert result.second.key?('Content-Type')
+    assert_equal IMAGE.image_generator.mime_type, result.second['Content-Type']
+  end
+  
+  test "calling #call with invalid encrypted captcha code should have response status 422" do
+    encrypted_code = IMAGE.new.generate_challenge.reverse
+    result = IMAGE.new.call 'PATH_INFO' => "/captchas/#{encrypted_code}"
+    
+    assert_equal 422, result.first
+  end
+  
+  test "calling #call with regenerate path should have response status 200" do
+    result = IMAGE.new.call 'PATH_INFO' => IMAGE.new.send(:regenerate_path)
+    
+    assert_equal 200, result.first
+  end
+  
+  test "calling #call with regenerate path should have content type response header set to application/json" do
+    result = IMAGE.new.call 'PATH_INFO' => IMAGE.new.send(:regenerate_path)
+    
+    assert result.second.key?('Content-Type')
+    assert_equal 'application/json', result.second['Content-Type']
+  end
+end

data/test/cases/provider/question_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+QUESTION = ValidatesCaptcha::Provider::Question
+
+class QuestionTest < ValidatesCaptcha::TestCase
+  test "defines a class level #questions_and_answers method" do
+    assert_respond_to QUESTION, :questions_and_answers
+  end
+  
+  test "defines a class level #questions_and_answers= method" do
+    assert_respond_to QUESTION, :questions_and_answers=
+  end
+  
+  test "#questions_and_answers method's return value should equal the value set using the #questions_and_answers= method" do
+    old_questions_and_answers = QUESTION.questions_and_answers
+    
+    QUESTION.questions_and_answers = 'abc'
+    assert_equal 'abc', QUESTION.questions_and_answers
+    
+    QUESTION.questions_and_answers = old_questions_and_answers
+  end
+  
+  test "calling #call with unrecognized path should have response status 404" do
+    result = QUESTION.new.call 'PATH_INFO' => '/unrecognized'
+    
+    assert_equal 404, result.first
+  end
+  
+  test "calling #call with regenerate path should have response status 200" do
+    result = QUESTION.new.call 'PATH_INFO' => QUESTION.new.send(:regenerate_path)
+    
+    assert_equal 200, result.first
+  end
+  
+  test "calling #call with regenerate path should have content type response header set to application/json" do
+    result = QUESTION.new.call 'PATH_INFO' => QUESTION.new.send(:regenerate_path)
+    
+    assert result.second.key?('Content-Type')
+    assert_equal 'application/json', result.second['Content-Type']
+  end
+end

data/test/cases/{reversible_encrypter_test.rb → reversible_encrypter/simple_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
-
+ 
 RE = ValidatesCaptcha::ReversibleEncrypter::Simple
-
+ 
 class ReversibleEncrypterTest < ValidatesCaptcha::TestCase
   test "defines an instance level #encrypt method" do
     assert_respond_to RE.new, :encrypt
@@ -25,3 +25,4 @@ class ReversibleEncrypterTest < ValidatesCaptcha::TestCase
     end
   end
 end
+

data/test/cases/{string_generator_test.rb → string_generator/simple_test.rb}

@@ -112,3 +112,4 @@ class StringGeneratorTest < ValidatesCaptcha::TestCase
     SG.alphabet = old_alphabet    
   end
 end
+

data/test/cases/validates_captcha_test.rb

@@ -7,129 +7,22 @@ class ValidatesCaptchaTest < ValidatesCaptcha::TestCase
   
   test "class level #version method returns a valid version" do
     assert_match /^\d+\.\d+\.\w+$/, ValidatesCaptcha.version
-  end  
-  
-  test "defines a class level #image_generator method" do
-    assert_respond_to ValidatesCaptcha, :image_generator
-  end
-  
-  test "defines a class level #image_generator= method" do
-    assert_respond_to ValidatesCaptcha, :image_generator=
-  end  
-  
-  test "defines a class level #string_generator method" do
-    assert_respond_to ValidatesCaptcha, :string_generator
-  end
-  
-  test "defines a class level #string_generator= method" do
-    assert_respond_to ValidatesCaptcha, :string_generator=
-  end  
-  
-  test "defines a class level #reversible_encrypter method" do
-    assert_respond_to ValidatesCaptcha, :reversible_encrypter
-  end
-  
-  test "defines a class level #reversible_encrypter= method" do
-    assert_respond_to ValidatesCaptcha, :reversible_encrypter=
-  end  
-  
-  test "defines a class level #middleware method" do
-    assert_respond_to ValidatesCaptcha, :middleware
-  end
-  
-  test "defines a class level #middleware= method" do
-    assert_respond_to ValidatesCaptcha, :middleware=
-  end  
-  
-  test "defines a class level #generate_captcha_code method" do
-    assert_respond_to ValidatesCaptcha, :generate_captcha_code
-  end
-  
-  test "class level #generate_captcha_code returns a string" do
-    assert_kind_of String, ValidatesCaptcha.generate_captcha_code
-  end  
-  
-  test "defines a class level #generate_captcha_image method" do
-    assert_respond_to ValidatesCaptcha, :generate_captcha_image
-  end
-  
-  test "defines a class level #captcha_image_file_extension method" do
-    assert_respond_to ValidatesCaptcha, :captcha_image_file_extension
-  end
-  
-  test "result of #captcha_image_file_extension should equal result of #image_generator.image_file_extension" do
-    result1 = ValidatesCaptcha.captcha_image_file_extension
-    result2 = ValidatesCaptcha.image_generator.image_file_extension
-    
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
-  end
-  
-  test "defines a class level #captcha_image_mime_type method" do
-    assert_respond_to ValidatesCaptcha, :captcha_image_mime_type
-  end
-  
-  test "result of #captcha_image_mime_type should equal result of #image_generator.image_mime_type" do
-    result1 = ValidatesCaptcha.captcha_image_mime_type
-    result2 = ValidatesCaptcha.image_generator.image_mime_type
-    
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
   end
   
-  test "defines a class level #encrypt_captcha_code method" do
-    assert_respond_to ValidatesCaptcha, :encrypt_captcha_code
+  test "defines a class level #provider method" do
+    assert_respond_to ValidatesCaptcha, :provider
   end
   
-  test "given the same argument, result of #encrypt_captcha_code should equal result of #reversible_encrypter.encrypt" do
-    result1 = ValidatesCaptcha.encrypt_captcha_code('123456')
-    result2 = ValidatesCaptcha.reversible_encrypter.encrypt('123456')
-    
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
-  end  
-  
-  test "defines a class level #decrypt_captcha_code method" do
-    assert_respond_to ValidatesCaptcha, :decrypt_captcha_code
+  test "defines a class level #provider= method" do
+    assert_respond_to ValidatesCaptcha, :provider=
   end
   
-  test "given the same argument, result of #decrypt_captcha_code should equal result of #reversible_encrypter.decrypt" do
-    encrypted_code = ValidatesCaptcha.encrypt_captcha_code('123456')
-    
-    result1 = ValidatesCaptcha.decrypt_captcha_code(encrypted_code)
-    result2 = ValidatesCaptcha.reversible_encrypter.decrypt(encrypted_code)
+  test "#provider method's return value should equal the value set using the #provider= method" do
+    old_provider = ValidatesCaptcha.provider
     
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
-  end
-  
-  test "defines a class level #captcha_image_path method" do
-    assert_respond_to ValidatesCaptcha, :captcha_image_path
-  end
-  
-  test "given the same argument, result of #captcha_image_path should equal result of #middleware.image_path" do
-    result1 = ValidatesCaptcha.captcha_image_path('123456')
-    result2 = ValidatesCaptcha.middleware.image_path('123456')
-    
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
-  end
-  
-  test "defines a class level #regenerate_captcha_path method" do
-    assert_respond_to ValidatesCaptcha, :regenerate_captcha_path
-  end
-  
-  test "result of #regenerate_captcha_path should equal result of #middleware.regenerate_path" do
-    result1 = ValidatesCaptcha.regenerate_captcha_path
-    result2 = ValidatesCaptcha.middleware.regenerate_path
+    ValidatesCaptcha.provider = 'abc'
+    assert_equal 'abc', ValidatesCaptcha.provider
     
-    assert_not_nil result1
-    assert_not_nil result2
-    assert_equal result1, result2
+    ValidatesCaptcha.provider = old_provider
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_captcha
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Martin Andert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +02:00
+date: 2009-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.2
     version: 
-description: "An image captcha verification approach for Rails apps, directly integrated into ActiveRecord\xE2\x80\x99s validation mechanism and providing helpers for ActionController and ActionView."
+description: "A captcha verification approach for Rails apps, directly integrated into ActiveRecord\xE2\x80\x99s validation mechanism and providing helpers for ActionController and ActionView."
 email: martin@mehringen.de
 executables: []
 
@@ -52,19 +52,21 @@ files:
 - lib/validates_captcha/form_builder.rb
 - lib/validates_captcha/form_helper.rb
 - lib/validates_captcha/image_generator/simple.rb
-- lib/validates_captcha/middleware/simple.rb
 - lib/validates_captcha/model_validation.rb
+- lib/validates_captcha/provider/image.rb
+- lib/validates_captcha/provider/question.rb
 - lib/validates_captcha/reversible_encrypter/simple.rb
 - lib/validates_captcha/string_generator/simple.rb
 - lib/validates_captcha/test_case.rb
 - lib/validates_captcha/version.rb
 - rails/init.rb
 - test/cases/controller_validation_test.rb
-- test/cases/image_generator_test.rb
-- test/cases/middleware_test.rb
+- test/cases/image_generator/simple_test.rb
 - test/cases/model_validation_test.rb
-- test/cases/reversible_encrypter_test.rb
-- test/cases/string_generator_test.rb
+- test/cases/provider/image_test.rb
+- test/cases/provider/question_test.rb
+- test/cases/reversible_encrypter/simple_test.rb
+- test/cases/string_generator/simple_test.rb
 - test/cases/validates_captcha_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -74,7 +76,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Validates Captcha 0.9.2
+- Validates Captcha 0.9.3
 - --main
 - README.rdoc
 - --line-numbers
@@ -101,13 +103,14 @@ rubyforge_project: validatecaptcha
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Image captcha verification for Rails using ActiveRecord's validation mechanism
+summary: Captcha verification for Rails using ActiveRecord's validation mechanism
 test_files: 
 - test/cases/controller_validation_test.rb
-- test/cases/image_generator_test.rb
-- test/cases/middleware_test.rb
+- test/cases/image_generator/simple_test.rb
 - test/cases/model_validation_test.rb
-- test/cases/reversible_encrypter_test.rb
-- test/cases/string_generator_test.rb
+- test/cases/provider/image_test.rb
+- test/cases/provider/question_test.rb
+- test/cases/reversible_encrypter/simple_test.rb
+- test/cases/string_generator/simple_test.rb
 - test/cases/validates_captcha_test.rb
 - test/test_helper.rb

data/lib/validates_captcha/middleware/simple.rb

@@ -1,108 +0,0 @@
-require 'active_support/core_ext/string/bytesize'
-
-module ValidatesCaptcha
-  module Middleware
-    # This class acts as the Rack middleware that serves the captcha images.
-    #
-    # You can implement your own middleware by creating a 
-    # class that conforms to the method definitions of the example below and 
-    # assign an instance of it to ValidatesCaptcha#middleware=.
-    #
-    # Example for a custom middleware:
-    #
-    #  class MyMiddleware
-    #    def image_path(encrypted_code)
-    #      '/captchas/image/' + encrypted_code + ValidatesCaptcha.captcha_image_file_extension
-    #    end
-    #
-    #    def regenerate_path
-    #      '/captchas/regenerate'
-    #    end
-    #
-    #    def call(env)
-    #      if env['PATH_INFO'] =~ /^\/captchas\/image\/([^\.]+)/
-    #        decrypted_code = ValidatesCaptcha.decrypt_captcha_code($1)
-    #    
-    #        if decrypted_code.nil?
-    #          [422, { 'Content-Type' => 'text/html' }, ['Unprocessable Entity']]
-    #        else
-    #          image_data = ValidatesCaptcha.generate_captcha_image(decrypted_code)
-    #        
-    #          headers = {
-    #            'Content-Length'            => image_data.bytesize.to_s,
-    #            'Content-Type'              => ValidatesCaptcha.captcha_image_mime_type,
-    #            'Content-Disposition'       => 'inline',
-    #            'Content-Transfer-Encoding' => 'binary'
-    #          }
-    #        
-    #          [200, headers, [image_data]]
-    #        end
-    #      elsif env['PATH_INFO'] == regenerate_path
-    #        encrypted_code = ValidatesCaptcha.encrypt_captcha_code(ValidatesCaptcha.generate_captcha_code)
-    #        xml = { :encrypted_captcha_code => encrypted_code, :captcha_image_path => image_path(encrypted_code) }.to_xml
-    #
-    #        [200, { 'Content-Type' => 'application/xml' }, [xml]]
-    #      else
-    #        [404, { 'Content-Type' => 'text/html' }, ['Not Found']]
-    #      end
-    #    end
-    #  end
-    #
-    #  ValidatesCaptcha.middleware = MyMiddleware.new
-    #    
-    class Simple      
-      # Returns the captcha image path for a given encrypted code. 
-      #
-      # This is used by the +captcha_image+ form helper.
-      def image_path(encrypted_code)
-        "/captchas/#{encrypted_code}#{ValidatesCaptcha.captcha_image_file_extension}"
-      end
-      
-      # Returns the path that is used when requesting the regeneration 
-      # of a captcha image. Defaults to '/captchas/regenerate'.
-      #
-      # This is used by the +regenerate_captcha_link+ form helper.
-      def regenerate_path
-        '/captchas/regenerate'
-      end
-      
-      # This method is the one called by Rack.
-      # 
-      # It returns HTTP status 404 if the path is not recognized. If the path is 
-      # recognized, it returns HTTP status 200 and delivers the image if it could 
-      # successfully decrypt the captcha code, otherwise HTTP status 422.
-      #
-      # Please take a look at the source code if you want to learn more.
-      def call(env)
-        if env['PATH_INFO'] =~ /^\/captchas\/([^\.]+)/
-          if $1 == 'regenerate'
-            encrypted_code = ValidatesCaptcha.encrypt_captcha_code(ValidatesCaptcha.generate_captcha_code)
-            json = { :encrypted_captcha_code => encrypted_code, :captcha_image_path => image_path(encrypted_code) }.to_json
-            
-            [200, { 'Content-Type' => 'application/json' }, [json]]
-          else
-            decrypted_code = ValidatesCaptcha.decrypt_captcha_code($1)
-          
-            if decrypted_code.nil?
-              [422, { 'Content-Type' => 'text/html' }, ['Unprocessable Entity']]
-            else
-              image_data = ValidatesCaptcha.generate_captcha_image(decrypted_code)
-              
-              response_headers = {
-                'Content-Length'            => image_data.bytesize.to_s,
-                'Content-Type'              => ValidatesCaptcha.captcha_image_mime_type,
-                'Content-Disposition'       => 'inline',
-                'Content-Transfer-Encoding' => 'binary',
-                'Cache-Control'             => 'private'
-              }
-              
-              [200, response_headers, [image_data]]
-            end
-          end
-        else
-          [404, { 'Content-Type' => 'text/html' }, ['Not Found']]
-        end
-      end
-    end
-  end
-end