validates_captcha 0.9.7 → 0.9.8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.9.8 (December 3, 2010)
+
+* "reload captcha" works with jquery too. In the render_regenerate_challenge_link you should pass parameter :jquery => true
+
+
 == 0.9.7 (June 1, 2010)
 
 * Allow an individual secret to be set for SymmetricEncryptor::Simple.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Validates Captcha
 
-A captcha verification approach for Rails apps, directly integrated into 
+A captcha verification approach for Rails 2.3 apps, directly integrated into 
 ActiveRecord's validation mechanism and providing helpers for ActionController 
 and ActionView.
 
@@ -122,7 +122,8 @@ new challenge and updates the question/image after the request is complete.
 
 +regenerate_captcha_challenge_link+ internally calls Rails' +link_to_remote+
 helper method. So it relies on the Prototype javascript framework to be 
-available on the page.
+available on the page. As of version 0.9.8 you can pass <tt>:jquery => true</tt>
+as an option to render Javascript that's based on jQuery.
 
 The anchor's text defaults to 'New question' (question challenge) and 
 'Regenerate Captcha' (image challenge) respectively. You can set this to 

data/lib/validates_captcha/provider/dynamic_image.rb

@@ -186,15 +186,20 @@ module ValidatesCaptcha
       #
       # Internally calls Rails' +link_to_remote+ helper method, passing the +options+ and
       # +html_options+ arguments. So it relies on the Prototype javascript framework
-      # to be available on the web page.
+      # to be available on the web page. As of version 0.9.8 you can pass <tt>:jquery => true</tt>
+      # as an option to render Javascript that's based on jQuery.
       #
       # The anchor text defaults to 'Regenerate Captcha'. You can set this to a custom value
       # providing a +:text+ key in the +options+ hash.
       def render_regenerate_challenge_link(sanitized_object_name, object, options = {}, html_options = {})
         text = options.delete(:text) || 'Regenerate Captcha'
-        success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_image').src = result.captcha_image_path; $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
-
-        link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        if options.delete(:jquery)
+          onclick = "jQuery.getJSON('#{regenerate_path}', function(result){jQuery('##{sanitized_object_name}_captcha_image').attr('src',result.captcha_image_path); jQuery('##{sanitized_object_name}_captcha_challenge').val(result.captcha_challenge); jQuery('##{sanitized_object_name}_captcha_solution').val('');});return false;"
+          link_to text, "#", options.reverse_merge(:onclick => onclick), html_options
+        else
+          success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_image').src = result.captcha_image_path; $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
+          link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        end
       end
 
       private

data/lib/validates_captcha/provider/question.rb

@@ -17,7 +17,7 @@ module ValidatesCaptcha
         "Bread, ham or milk: which is something to drink?" => "milk",
         "What day is today, if yesterday was Friday?" => "Saturday",
         "What day is today, if tomorrow is Tuesday?" => "Monday",
-        "What is the 2nd letter of the the third word in this question?" => "h",
+        "What is the 2nd letter of the third word in this question?" => "h",
         "What color is the sky on a sunny day?" => "blue" }.freeze
 
       @@questions_and_answers = DEFAULT_QUESTIONS_AND_ANSWERS
@@ -81,15 +81,20 @@ module ValidatesCaptcha
       #
       # Internally calls Rails' +link_to_remote+ helper method, passing the +options+ and
       # +html_options+ arguments. So it relies on the Prototype javascript framework
-      # to be available on the web page.
+      # to be available on the web page. As of version 0.9.8 you can pass <tt>:jquery => true</tt>
+      # as an option to render Javascript that's based on jQuery.
       #
       # The anchor text defaults to 'New question'. You can set this to a custom value
       # providing a +:text+ key in the +options+ hash.
       def render_regenerate_challenge_link(sanitized_object_name, object, options = {}, html_options = {})
         text = options.delete(:text) || 'New question'
-        success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_question').update(result.captcha_challenge); $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
-
-        link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        if options.delete(:jquery)
+          onclick = "jQuery.getJSON('#{regenerate_path}', function(result){jQuery('##{sanitized_object_name}_captcha_question').text(result.captcha_challenge); jQuery('##{sanitized_object_name}_captcha_challenge').val(result.captcha_challenge); jQuery('##{sanitized_object_name}_captcha_solution').val('');});return false;"
+          link_to text, "#", options.reverse_merge(:onclick => onclick), html_options
+        else
+          success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_question').update = result.captcha_challenge; $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
+          link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        end
       end
 
       private

data/lib/validates_captcha/provider/static_image.rb

@@ -178,15 +178,20 @@ module ValidatesCaptcha
       #
       # Internally calls Rails' +link_to_remote+ helper method, passing the +options+ and
       # +html_options+ arguments. So it relies on the Prototype javascript framework
-      # to be available on the web page.
+      # to be available on the web page. As of version 0.9.8 you can pass <tt>:jquery => true</tt>
+      # as an option to render Javascript that's based on jQuery.
       #
       # The anchor text defaults to 'Regenerate Captcha'. You can set this to a custom value
       # providing a +:text+ key in the +options+ hash.
       def render_regenerate_challenge_link(sanitized_object_name, object, options = {}, html_options = {})
         text = options.delete(:text) || 'Regenerate Captcha'
-        success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_image').src = result.captcha_image_path; $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
-
-        link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        if options.delete(:jquery)
+          onclick = "jQuery.getJSON('#{regenerate_path}', function(result){jQuery('##{sanitized_object_name}_captcha_image').attr('src',result.captcha_image_path); jQuery('##{sanitized_object_name}_captcha_challenge').val(result.captcha_challenge); jQuery('##{sanitized_object_name}_captcha_solution').val('');});return false;"
+          link_to text, "#", options.reverse_merge(:onclick => onclick), html_options
+        else
+          success = "var result = request.responseJSON; $('#{sanitized_object_name}_captcha_image').src = result.captcha_image_path; $('#{sanitized_object_name}_captcha_challenge').value = result.captcha_challenge; $('#{sanitized_object_name}_captcha_solution').value = '';"
+          link_to_remote text, options.reverse_merge(:url => regenerate_path, :method => :get, :success => success), html_options
+        end
       end
 
       private

data/lib/validates_captcha/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validates_captcha
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Martin Andert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +02:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -97,7 +97,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Validates Captcha 0.9.7
+- Validates Captcha 0.9.8
 - --main
 - README.rdoc
 - --line-numbers