@@ -45,10 +45,11 @@ module Ambethia end # Helpers module Controller - # Your private API key must be specified in the environment variable +RECAPTCHA_PRIVATE_KEY+ + # Your private API can be specified in the +options+ hash or preferably the environment + # variable +RECAPTCHA_PUBLIC_KEY+. def verify_recaptcha(options = {}) return true if SKIP_VERIFY_ENV.include? ENV['RAILS_ENV'] - private_key = options[:private_key] ||= ENV['RECAPTCHA_PRIVATE_KEY'] + private_key = options[:private_key] ||= ENV['RECAPTCHA_PRIVATE_KEY'] raise ReCaptchaError, "No private key specified." unless private_key begin recaptcha = Net::HTTP.post_form URI.parse("http://#{RECAPTCHA_VERIFY_SERVER}/verify"), { @@ -78,4 +79,4 @@ module Ambethia class ReCaptchaError < StandardError; end end # ReCaptcha -end # Ambethia \ No newline at end of file +end # Ambethia lib/recaptcha.rb @@ -56,6 +56,16 @@ class VerifyReCaptchaTest < Test::Unit::TestCase assert !@controller.verify_recaptcha(:model => model) assert_equal "bad-news", @controller.session[:recaptcha_error] end + + def test_returns_true_on_success_with_optional_key + @controller.session[:recaptcha_error] = "previous error that should be cleared" + # reset private key + @expected_post_data[:privatekey] = 'ADIFFERENTPRIVATEKEYXXXXXXXXXXXXXX' + expect_http_post(response_with_body("true\n")) + + assert @controller.verify_recaptcha(:private_key => 'ADIFFERENTPRIVATEKEYXXXXXXXXXXXXXX') + assert_nil @controller.session[:recaptcha_error] + end private test/verify_recaptcha_test.rb 931694f3b3a0b82d4a54a065ec19b615af82e9a5 Jason L Perry jasper@ambethia.com http://github.com/ambethia/recaptcha/commit/ce693e7f967b95bc2559509301c7783857f52af4 ce693e7f967b95bc2559509301c7783857f52af4 2008-12-31T15:58:59-08:00 2008-12-31T15:58:59-08:00 Resolving conflicts in autodata's test 113a65d19aefa52ceeff6d27a451ca8e5140eed9 Jason L Perry jasper@ambethia.com