ruby-recaptcha 1.0.3 → 1.0.4

data/History.txt

@@ -1,4 +1,3 @@
-=== 1.0.3 
-New history file, new Google urls
-=== 1.0.1 
-Lost History file
+=== 1.0.4 / 2011-11-12
+
+* 1 merged patch for ruby 1.8/1.9 support

data/lib/recaptcha.rb

@@ -68,14 +68,19 @@ module ReCaptcha
   # to determine whether the ReCaptcha challenge was completed successfully.
   # Simply include this module in your controller class
   module  AppHelper
+    DEFAULT_CAPTCHA_FAILURE_MESSAGE = 'Captcha failed.'
+    
     # Validate recaptcha  from passed in params. Sets errors into the errors hash.
     #
     # [p] request parameters. Requires :recaptcha_challenge_field and :recaptcha_response_field
     # [errors] errors hash-like thing. Usually ActiveRecord::Base.errors
     # [options] Options hash. currently only uses :rcc_pub and :rcc_priv options for passing in ReCaptcha keys.
-    def validate_recap(p, errors, options = {})
+    def validate_recap(p, errors, options = {:msg => DEFAULT_CAPTCHA_FAILURE_MESSAGE})
+      unless options.has_key?(:msg)
+        options[:msg] = DEFAULT_CAPTCHA_FAILURE_MESSAGE
+      end
       rcc=ReCaptcha::Client.new(options[:rcc_pub] || RCC_PUB, options[:rcc_priv] || RCC_PRIV)
-      res = rcc.validate(request.remote_ip, p[:recaptcha_challenge_field], p[:recaptcha_response_field], errors)
+      res = rcc.validate(request.remote_ip, p[:recaptcha_challenge_field], p[:recaptcha_response_field], errors, options[:msg])
       session[:rcc_err]=rcc.last_error
       res
     end
@@ -154,7 +159,7 @@ module ReCaptcha
         s << "\n</script>\n"
       end
       errslug = (error.empty?||error==nil||error=="success") ? '' :  "&error=#{CGI.escape(error)}"
-      s <<<<-EOF
+      s << %{
       <script type="text/javascript" src="#{@proto}://#{@host}/recaptcha/api/challenge?k=#{CGI.escape(@pubkey)}#{errslug}"> </script>
       <noscript>
       <iframe src="#{@proto}://#{@host}/recaptcha/api/noscript?k=#{CGI.escape(@pubkey)}#{errslug}"
@@ -164,7 +169,7 @@ module ReCaptcha
       <input type="hidden" name="recaptcha_response_field" 
       value="manual_challenge">
       </noscript>
-      EOF
+      }
     end
 
     # Validate request. Note that this function actually makes a network request.
@@ -172,8 +177,7 @@ module ReCaptcha
     # [challenge] reCaptcha challenge
     # [response] reCaptcha response
     # [errors] errors hash-likethingy (usually from ActiveRecord::Base.errors)
-    def validate(remoteip, challenge, response, errors)
-      msg = "Captcha failed."
+    def validate(remoteip, challenge, response, errors, msg)
       unless response and challenge
         errors.add_to_base(msg)
         return false
@@ -183,8 +187,8 @@ module ReCaptcha
       http = Net::HTTP::Proxy(proxy_host, proxy_port).start(@vhost)
       path='/recaptcha/api/verify'
       data = "privatekey=#{CGI.escape(@privkey)}&remoteip=#{CGI.escape(remoteip)}&challenge=#{CGI.escape(challenge)}&response=#{CGI.escape(response)}"
-      resp, data = http.post(path, data, {'Content-Type'=>'application/x-www-form-urlencoded'})
-      response = data.split
+      resp = http.post(path, data, {'Content-Type'=>'application/x-www-form-urlencoded'})
+      response = resp.body.split
       result = response[0].chomp
       @last_error=response[1].chomp
       errors.add_to_base(msg) if  result != 'true'

data/lib/ruby-recaptcha.rb

@@ -1,4 +1,4 @@
 require 'recaptcha'
 module RubyRecaptcha
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/test_recaptcha.rb

@@ -82,8 +82,7 @@ class TestRecaptcha < Test::Unit::TestCase
   def test_nil_challenge
     client = new_client
     estub = stub_everything('errors')
-    client.validate('abc', nil, 'foo', estub)
-
+    client.validate('abc', nil, 'foo', estub, 'Captcha failed.')
   end
 
   def test_constructor
@@ -109,6 +108,16 @@ class TestRecaptcha < Test::Unit::TestCase
     client = new_client
     assert_match(/theme \: \"white\"/, client.get_challenge('somerror', :options => {:theme => 'white', :tabindex => 10}))
   end
+  
+  class ResponseMock    
+    def initialize(response)
+      @response = response
+    end
+    
+    def body
+      @response[1]
+    end
+  end
 
   def test_validate_fails
     badwords_resp="false\r\n360 incorrect-captcha-sol"
@@ -117,10 +126,10 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_proxy=mock('proxy')
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
-    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(['foo', badwords_resp])
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', badwords_resp]))
     Net::HTTP.expects(:Proxy).returns(stub_proxy)
     client = new_client
-    assert !client.validate('localhost', 'abc', 'def', err_stub)
+    assert !client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
   end
   def test_validate_good
     goodwords_resp="true\r\nsuccess"
@@ -128,10 +137,10 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_proxy=mock('proxy')
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
-    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(['foo', goodwords_resp])
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
     Net::HTTP.expects(:Proxy).with(nil, nil).returns(stub_proxy)
     client = new_client
-    assert client.validate('localhost', 'abc', 'def', err_stub)
+    assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
   end
   def test_validate_good_proxy
     ENV['proxy_host']='fubar:8080'
@@ -140,19 +149,19 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_proxy=mock('proxy')
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
-    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(['foo', goodwords_resp])
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
     Net::HTTP.expects(:Proxy).with('fubar', '8080').returns(stub_proxy)
     client = new_client
-    assert client.validate('localhost', 'abc', 'def', err_stub)
+    assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
     ENV['proxy_host']='fubar'
     err_stub=mock()
     stub_proxy=mock('proxy')
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
-    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(['foo', goodwords_resp])
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
     Net::HTTP.expects(:Proxy).with('fubar', nil).returns(stub_proxy)
     client = new_client
-    assert client.validate('localhost', 'abc', 'def', err_stub)
+    assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
   end
 
   #
@@ -275,7 +284,7 @@ class TestRecaptcha < Test::Unit::TestCase
   def test_validate_recap_succeeds_without_key_constants_but_with_options
     mock = mock('client')
     ReCaptcha::Client.expects(:new).returns(mock)
-    mock.expects(:validate).with('0.0.0.0', nil, nil, {}).returns(true)
+    mock.expects(:validate).with('0.0.0.0', nil, nil, {}, 'Captcha failed.').returns(true)
     mock.expects(:last_error)
     assert !ReCaptcha::AppHelper.const_defined?(:RCC_PUB)
     assert !ReCaptcha::AppHelper.const_defined?(:RCC_PRIV)
@@ -286,7 +295,7 @@ class TestRecaptcha < Test::Unit::TestCase
     e = mock('errors')
     mock = mock('client')
     ReCaptcha::Client.expects(:new).returns(mock).times(2)
-    mock.expects(:validate).with('0.0.0.0', nil,  nil, {}).returns(true)
+    mock.expects(:validate).with('0.0.0.0', nil,  nil, {}, 'Captcha failed.').returns(true)
     mock.expects(:last_error).times(2)
     ReCaptcha::AppHelper.define_public_key  # 'foo'
     ReCaptcha::AppHelper.define_private_key # 'bar'
@@ -294,9 +303,25 @@ class TestRecaptcha < Test::Unit::TestCase
     ReCaptcha::AppHelper.undefine_public_key
     ReCaptcha::AppHelper.undefine_private_key
     # next, with options
-    mock.expects(:validate).with('0.0.0.0', nil,  nil, e).returns(true)
+    mock.expects(:validate).with('0.0.0.0', nil,  nil, e, 'Captcha failed.').returns(true)
     assert @cf.validate_recap({}, e, {:rcc_pub => 'foobar', :rcc_priv => 'blegga'})
   end
+  def test_validate_recap_is_correct_with_constants_and_with_options_and_non_default_msg
+    # first, with constants
+    e = mock('errors')
+    mock = mock('client')
+    ReCaptcha::Client.expects(:new).returns(mock).times(2)
+    mock.expects(:validate).with('0.0.0.0', nil,  nil, {}, 'Captcha failed.').returns(true)
+    mock.expects(:last_error).times(2)
+    ReCaptcha::AppHelper.define_public_key  # 'foo'
+    ReCaptcha::AppHelper.define_private_key # 'bar'
+    assert @cf.validate_recap({}, {})
+    ReCaptcha::AppHelper.undefine_public_key
+    ReCaptcha::AppHelper.undefine_private_key
+    # next, with options
+    mock.expects(:validate).with('0.0.0.0', nil,  nil, e, 'CAPTCHA failed.').returns(true)
+    assert @cf.validate_recap({}, e, {:rcc_pub => 'foobar', :rcc_priv => 'blegga', :msg => 'CAPTCHA failed.'})
+  end
 
   #
   # unit tests for HTTP/HTTPS-variants of get_captcha() method

metadata

@@ -1,108 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-recaptcha
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - McClain Looney
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-27 00:00:00 -05:00
+date: 2011-11-12 00:00:00.000000000 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9701860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *9701860
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &9700580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 9
-        - 4
-        version: 2.9.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id002
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *9700580
+description: ''
+email:
 - m@loonsoft.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - README.txt
-files: 
+files:
 - History.txt
 - README.txt
 - lib/recaptcha.rb
 - lib/ruby-recaptcha.rb
-- test/test_helper.rb
 - test/test_recaptcha.rb
+- test/test_helper.rb
 - .gemtest
 has_rdoc: true
 homepage: http://www.bitbucket.org/mml/ruby-recaptcha
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby-recaptcha
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- test/test_helper.rb
+summary: ''
+test_files:
 - test/test_recaptcha.rb
+- test/test_helper.rb