ruby-recaptcha 1.0.0 → 1.0.2

data/History.txt

@@ -1,117 +1,291 @@
-changeset:   49:201f032ce586
-user:        m@loonsoft.com
-date:        Tue Sep 02 10:59:53 2008 -0500
-summary:     removed test code which seems to cause trouble with the masses
-
-changeset:   48:297ed7ad0790
-user:        m@loonsoft.com
-date:        Fri May 30 09:04:24 2008 -0500
-summary:     fix for loopback addr requests
-
-changeset:   47:143671e3abb0
-user:        m@loonsoft.com
-date:        Mon Apr 07 23:24:24 2008 -0500
-summary:     fix for kim griggs
-
-changeset:   46:52e0ff173f56
-user:        m@loonsoft.com
-date:        Wed Mar 05 20:27:58 2008 -0600
-summary:     fixed bug when nil challenge string
-
-changeset:   45:f63d820d97f9
-user:        m@loonsoft.com
-date:        Sat Mar 01 08:40:33 2008 -0600
-summary:     integrated more patches from pv
-
-changeset:   44:4964962ea7be
-user:        m@loonsoft.com
-date:        Sun Feb 24 13:59:27 2008 -0600
-summary:     reapplied missing patch
-
-changeset:   43:299402495d48
-user:        m@loonsoft.com
-date:        Sun Feb 24 08:25:04 2008 -0600
-summary:     patch from peter vandenberk
-
-changeset:   40:e55d02f563e4
-user:        m@loonsoft.com
-date:        Sat Jan 12 11:33:35 2008 -0600
-summary:     proxy support
-
-changeset:   34:24e4ed5017bc
-user:        m@loonsoft.com
-date:        Thu Aug 23 15:01:14 2007 -0500
-summary:     fix from joey geiger
-
-changeset:   33:310e75fbd650
-user:        m@loonsoft.com
-date:        Sat Jun 09 08:10:38 2007 -0500
-summary:     error parameter no longer included when the error is blank or nil
-
-changeset:   31:ed21f08b6331
-parent:      27:5a6746ce03f7
-user:        m@loonsoft.com
-date:        Wed Jun 06 22:36:58 2007 -0500
-summary:     Backed out changeset 5a6746ce03f73d0dd02db155816500870088bf6e
-
-changeset:   27:5a6746ce03f7
-parent:      25:d614a6a28630
-user:        m@loonsoft.com
-date:        Wed Jun 06 22:02:37 2007 -0500
-summary:     Backed out changeset d614a6a28630eb4dba913739518dbdc6d3aaa410
-
-changeset:   25:d614a6a28630
-user:        m@loonsoft.com
-date:        Wed May 30 14:28:25 2007 -0500
-summary:     patch from victor cosby
-
-changeset:   24:d1dc394b249b
-user:        m@loonsoft.com
-date:        Tue May 29 09:57:04 2007 -0500
-summary:     Backed out changeset 1086e6e6217f85433cc539e6d687880adc421c2f
-
-changeset:   23:1086e6e6217f
-user:        m@loonsoft.com
-date:        Tue May 29 09:47:38 2007 -0500
-summary:     reworked error handling
-
-changeset:   22:5497521e6a01
-user:        m@loonsoft.com
-date:        Sun May 27 17:21:16 2007 -0500
-summary:     removed bogon method stub
-
-changeset:   19:943383442ab0
-user:        m@loonsoft.com
-date:        Sun May 27 15:21:27 2007 -0500
-summary:     mailhide supported
-
-changeset:   16:a9f834ef0ffb
-user:        m@loonsoft.com
-date:        Fri May 25 19:22:49 2007 -0500
-summary:     added cgi module, some tests
-
-changeset:   11:d7dcf24bb808
-user:        m@loonsoft.com
-date:        Fri May 25 11:58:27 2007 -0500
-summary:     changed license
-
-changeset:   9:8047f6e7eceb
-user:        m@loonsoft.com
-date:        Fri May 25 11:46:12 2007 -0500
-summary:     turned off ssl
-
-changeset:   4:d28f38ac7cde
-user:        m@loonsoft.com
-date:        Fri May 25 11:18:07 2007 -0500
-summary:     updated
-
-changeset:   1:146d97cc2e51
-user:        m@loonsoft.com
-date:        Fri May 25 10:41:52 2007 -0500
-summary:     fixed license
-
-changeset:   0:1f1ba6ed3ef1
-user:        m@loonsoft.com
-date:        Fri May 25 10:41:35 2007 -0500
-summary:     initial
+2009-07-24  mml  <mml>
+
+	* Rakefile, lib/ruby-recaptcha.rb, test/test_recaptcha.rb:
+	fixed some randomly failing tests
+	[31a822ec2421] [tip]
+
+2009-02-15  m  <m@loonsoft.com>
+
+	* .hgtags:
+	Added tag 1.0.0 release for changeset 19f9c037e388
+	[d4de467a907f]
+
+	* lib/ruby-recaptcha.rb:
+	fixed require line
+	[19f9c037e388] [1.0.0 release]
+
+2009-02-13  m  <m@loonsoft.com>
+
+	* Manifest.txt, README.txt, Rakefile, lib/recaptcha.rb,
+	lib/recaptcha/version.rb, lib/ruby-recaptcha.rb, script/console,
+	script/destroy, script/generate, test/test_helper.rb,
+	website/index.txt, website/javascripts/rounded_corners_lite.inc.js,
+	website/stylesheets/screen.css, website/template.rhtml:
+	updated to new version of newgem
+	[de8078de5372]
+
+2008-12-08  m  <m@loonsoft.com>
+
+	* website/index.txt, website/template.rhtml:
+	fixed js
+	[3cb43baa75ef]
+
+	* website/index.txt:
+	updated site
+	[353af929586d]
+
+	* Rakefile:
+	fix uploaded perms
+	[1bfdbd7dbf58]
+
+	* Rakefile, website/index.txt:
+	updated deploy script & site template
+	[0ed40a3c44bc]
+
+2008-12-05  m  <m@loonsoft.com>
+
+	* website/index.txt, website/template.rhtml:
+	updated website
+	[cb2384317947]
+
+2008-09-02  m  <m@loonsoft.com>
+
+	* README.txt, lib/recaptcha.rb, test/test_recaptcha.rb:
+	removed test code which seems to cause trouble with the masses
+	[201f032ce586]
+
+2008-05-30  m  <m@loonsoft.com>
+
+	* README.txt, lib/recaptcha.rb:
+	fix for loopback addr requests
+	[297ed7ad0790]
+
+2008-04-07  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	fix for kim griggs
+	[143671e3abb0]
+
+2008-03-05  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb:
+	fixed bug when nil challenge string
+	[52e0ff173f56]
+
+2008-03-01  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	integrated more patches from pv
+	[f63d820d97f9]
+
+2008-02-24  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, website/index.txt:
+	reapplied missing patch
+	[4964962ea7be]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	patch from peter vandenberk
+	[299402495d48]
+
+2008-01-12  m  <m@loonsoft.com>
+
+	* website/index.txt:
+	website formatting
+	[0c065e76a6a8]
+
+	* website/index.txt:
+	website formatting
+	[79fe86cded6a]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	proxy support
+	[e55d02f563e4]
+
+2007-12-30  m  <m@loonsoft.com>
+
+	* scripts/txt2html, website/index.txt:
+	updated website
+	[aa2897a0b6fd]
+
+	* website/index.txt:
+	Backed out changeset 0cc68aefef09
+	[770296229d47]
+
+	* website/index.txt:
+	fixed uri
+	[0cc68aefef09]
+
+2007-12-26  m  <m@loonsoft.com>
+
+	* Rakefile, website/index.txt:
+	bleh
+	[62edd6a24d72]
+
+2007-10-08  m  <m@loonsoft.com>
+
+	* website/template.rhtml:
+	modified coda
+	[d0102db1ece1]
+
+2007-08-23  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb:
+	fix from joey geiger
+	[24e4ed5017bc]
+
+2007-06-09  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb:
+	error parameter no longer included when the error is blank or nil
+	[310e75fbd650]
+
+2007-06-06  m  <m@loonsoft.com>
+
+	* website/index.txt:
+	merge
+	[13de70beb380]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	Backed out changeset 5a6746ce03f73d0dd02db155816500870088bf6e
+	backout of the backout, cosby patch back in
+	[ed21f08b6331]
+
+	* website/index.txt:
+	further clarification
+	[db3308cd9f2b]
+
+	* lib/recaptcha/version.rb, website/index.txt:
+	clarification to doc
+	[0ce238b954ed]
+
+	* website/index.txt:
+	updated site
+	[b798dbd756f5]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	Backed out changeset d614a6a28630eb4dba913739518dbdc6d3aaa410
+
+	seems to be causing issues
+	[5a6746ce03f7]
+
+	* website/index.txt:
+	clarification
+	[9d2ff1293a4e]
+
+2007-05-30  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	patch from victor cosby
+	[d614a6a28630]
+
+2007-05-29  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	Backed out changeset 1086e6e6217f85433cc539e6d687880adc421c2f
+	[d1dc394b249b]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb, website/index.txt:
+	reworked error handling
+	[1086e6e6217f]
+
+2007-05-27  m  <m@loonsoft.com>
+
+	* lib/recaptcha.rb:
+	removed bogon method stub
+	[5497521e6a01]
+
+	* website/index.txt:
+	fixup page
+	[99665cb4b9a1]
+
+	* website/index.txt:
+	mailhide supported
+	[4a0b9f72eede]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb:
+	mailhide supported
+	[943383442ab0]
+
+2007-05-25  m  <m@loonsoft.com>
+
+	* website/index.txt:
+	pointer to code
+	[848e1a4c0b17]
+
+	* website/template.rhtml:
+	urchin
+	[e2b1d5e77f97]
+
+	* lib/recaptcha.rb, test/test_recaptcha.rb:
+	added cgi module, some tests
+	[a9f834ef0ffb]
+
+	* Rakefile, website/index.txt:
+	updates
+	[5f41c4ec54b2]
+
+	* Rakefile, lib/recaptcha/version.rb, scripts/txt2html:
+	updates
+	[ef9516789992]
+
+	* .hgignore, History.txt, Rakefile:
+	updates
+	[976727776d37]
+
+	* website/index.txt:
+	changed license
+	[63e4d638cbea]
+
+	* lib/recaptcha.rb, website/index.txt:
+	changed license
+	[d7dcf24bb808]
+
+	* lib/recaptcha/version.rb:
+	turned off ssl
+	[5ae4c8024402]
+
+	* lib/recaptcha.rb:
+	turned off ssl
+	[8047f6e7eceb]
+
+	* .hgtags:
+	Added tag release 1.1.2 for changeset cd3bd3392418
+	[844ac63dfb5a]
+
+	* Rakefile, scripts/txt2html:
+	update
+	[cd3bd3392418] [release 1.1.2]
+
+	* .hgignore, Rakefile, website/index.txt:
+	update
+	[3d15d7d8ff91]
+
+	* Rakefile, website/index.html, website/index.txt:
+	update
+	[6af50b34c9fa]
+
+	* lib/recaptcha.rb, lib/recaptcha/version.rb:
+	updated
+	[d28f38ac7cde]
+
+	* .hgignore:
+	ignore packages
+	[1c4ea4c672d2]
+
+	* .hgignore:
+	hgignore
+	[57e762617a54]
+
+	* lib/recaptcha.rb:
+	fixed license
+	[146d97cc2e51]
+
+	* History.txt, Manifest.txt, README.txt, Rakefile, lib/recaptcha.rb,
+	lib/recaptcha/version.rb, scripts/txt2html, setup.rb,
+	test/test_helper.rb, test/test_recaptcha.rb, website/index.html,
+	website/index.txt, website/javascripts/rounded_corners_lite.inc.js,
+	website/stylesheets/screen.css, website/template.rhtml:
+	initial
+	[1f1ba6ed3ef1]
 

data/README.txt

@@ -1,21 +1,21 @@
 = ruby-recaptcha
 
-h2. What
+* http://www.bitbucket.org/mml/ruby-recaptcha
 
-h2. Installing
+== Installing
 
 <pre>
   gem install recaptcha
 </pre>
 
-h2. The basics
+== The basics
 
 The ReCaptchaClient abstracts the ReCaptcha API for use in Rails Applications
 
 
-h2. Demonstration of usage
+== Demonstration of usage
 
-h3. reCAPTCHA
+=== reCAPTCHA
 
 First, create an account at "ReCaptcha.net":http://www.recaptcha.net.
 
@@ -64,14 +64,14 @@ To customize theme and tabindex of the widget, you can include an options hash:
 
 See the "reCAPTCHA API Documentation":http://recaptcha.net/apidocs/captcha/ under "Look and Feel Customization" for more information.
 
-h3. Proxy support
+=== Proxy support
 
 If your rails application requires the use of a proxy, set proxy_host into your environment:
 <pre>
   ENV['proxy_host']='foo.example.com:8080'
 </pre>
 
-h3. Mail Hide
+=== Mail Hide
 
 When you mix in ViewHelper as above, you also get <pre> mail_hide(address, contents)</pre>, which you can call in your view thusly:
 
@@ -82,11 +82,11 @@ When you mix in ViewHelper as above, you also get <pre> mail_hide(address, conte
 
 Contents defaults to the first few characters of the email address.
 
-h2. Bugs
+== Bugs
 
 http://www.bitbucket.org/mml/ruby-recaptcha/issues
 
-h2. Code
+== Code
 
 Get it "here":http://www.bitbucket.org/mml/ruby-recaptcha
 
@@ -94,15 +94,15 @@ Note the wiki & forum & such there...
 
 
 
-h2. License
+== License
 
 This code is free to use under the terms of the MIT License.
 
-h2. Contact
+== Contact
 
 Comments are welcome. Send an email to "McClain Looney":mailto:mlooney@gmail.com.
 
-h2. Contributors:
+== Contributors:
 
 Victor Cosby (test cleanup, additional code to style widget)
 <br>

data/lib/recaptcha.rb

@@ -1,4 +1,4 @@
-#Copyright (c) 2007, 2008, 2009 McClain Looney
+#Copyright (c) 2007, 2008, 2009, 2010 McClain Looney
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -17,23 +17,44 @@
 #LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
+
 require 'openssl'
 require 'base64'
 require 'cgi'
 require 'net/http'
 require 'net/https'
+
 module ReCaptcha
+  # Some simple view helpers. Include this module in your own helper to pull in macros to spit out view code.
+  #   include Recaptcha
   module ViewHelper
+    # Call this to generate the actual ReCaptcha script into your template.
+    # Options can include
+    # [rcc_pub] public recaptcha key (defaults to RCC_PUB constant)
+    # [rcc_priv] privte recaptcha key (defaults to RCC_PRIV constant)
+    # [ssl] generate ssl-based output, defaults to false
+    #
+    # This method also sets :rcc_err into the session.
+    # Example (rcc_pub and rcc_private not required if RCC_PUB & RCC_PRIV constants are used):
+    #       = get_captcha(:rcc_pub => 'foobar', :rcc_priv => 'blegga', :ssl => true)
+    #
     def get_captcha(options={})
-      k = ReCaptcha::Client.new(options[:rcc_pub] || RCC_PUB, options[:rcc_priv] || RCC_PRIV, options[:ssl] || false)
+      k = ReCaptcha::Client.new((options[:rcc_pub] || RCC_PUB), (options[:rcc_priv] || RCC_PRIV), (options[:ssl] || false))
       r = k.get_challenge(session[:rcc_err] || '', options)
       session[:rcc_err]=''
       r
     end
+
+    # Call this to generate the MailHide view code.
+    #
+    # Note: doesn't currently support ssl for some reason.
+    # [address] the email address you want to hide
+    # [contents] optional string to display as the text of the mailhide link 
+    #
     def mail_hide(address, contents=nil)
       contents = truncate(address,10) if contents.nil?
-      k = ReCaptcha::MHClient.new(MH_PUB, MH_PRIV)
-      enciphered = k.encrypt(address)
+      k = ReCaptcha::MHClient.new(MH_PUB, MH_PRIV, address)
+      enciphered = k.crypted_address
       uri = "http://mailhide.recaptcha.net/d?k=#{MH_PUB}&c=#{enciphered}"
       t =<<-EOF
       <a href="#{uri}"
@@ -42,22 +63,40 @@ module ReCaptcha
     end
 
   end
+
+  # This module provides a simple helper for use in your controller
+  # to determine whether the ReCaptcha challenge was completed successfully.
+  # Simply include this module in your controller class
   module  AppHelper
-    private
+    # 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 = {})
       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)
       session[:rcc_err]=rcc.last_error
-
       res
     end
   end
+
+  # Mail hide client. Provides interfaceto ReCaptcha MailHide API
   class MHClient
-    def initialize(pubkey, privkey)
+    # [pubkey] MailHide public key
+    # [privkey] MailHide private key
+    # [address] the address you want to hide.
+    def initialize(pubkey, privkey, address)
       @pubkey=pubkey
       @privkey=privkey
+      @address = address
       @host='mailhide.recaptcha.net'
     end
+    #The encrypted address
+    def crypted_address
+      encrypt(@address)
+    end
+    private
     def encrypt(string)
       padded = pad(string)
       iv="\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00"
@@ -80,8 +119,16 @@ module ReCaptcha
       str
     end
   end
-  class Client
 
+  # This class implements a client object capable of communicating ReCaptcha validation requests to the
+  # ReCaptcha service.
+  #
+  class Client
+    #last recaptcha error
+    attr_reader :last_error
+    # [pubkey]  public ReCaptcha key
+    # [privkey] private ReCaptcha key (keep this a secret!)
+    # [ssl?] use https for requests when set. defaults to false.
     def initialize(pubkey, privkey, ssl=false)
       @pubkey = pubkey
       @privkey=privkey
@@ -92,6 +139,10 @@ module ReCaptcha
       @last_error=nil
     end
 
+    # get ReCaptcha challenge text, optionally setting the error message displayed on failure.
+    # [error] error message to be displayed on error
+    # [options] options hash. This is translated into a javascript hash and sent along to the ReCaptcha service as RecaptchaOptions
+    #   
     def get_challenge(error='', options={})
       s=''
       if options[:options]
@@ -117,9 +168,11 @@ module ReCaptcha
       EOF
     end
 
-    def last_error
-      @last_error
-    end
+    # Validate request. Note that this function actually makes a network request.
+    # [remoteip] request remote ip address
+    # [challenge] reCaptcha challenge
+    # [response] reCaptcha response
+    # [errors] errors hash-likethingy (usually from ActiveRecord::Base.errors)
     def validate(remoteip, challenge, response, errors)
       msg = "Captcha failed."
       unless response and challenge

data/lib/ruby-recaptcha.rb

@@ -1,7 +1,4 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'recaptcha'
 module RubyRecaptcha
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+$:<< File.dirname(__FILE__)+'/../lib'
 require 'stringio'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/ruby-recaptcha'

data/test/test_recaptcha.rb

@@ -67,17 +67,16 @@ class TestRecaptcha < Test::Unit::TestCase
   end
 
   def test_encrypt
-    mhc = ReCaptcha::MHClient.new('01S1TOX9aibKxfC9oJlp8IeA==', 'deadbeefdeadbeefdeadbeefdeadbeef')
-    z =mhc.encrypt('x@example.com')
+    mhc = ReCaptcha::MHClient.new('01S1TOX9aibKxfC9oJlp8IeA==', 'deadbeefdeadbeefdeadbeefdeadbeef', 'x@example.com')
+    z =mhc.crypted_address
     assert_equal 'wBG7nOgntKqWeDpF9ucVNQ==', z
-    z =mhc.encrypt('johndoe@example.com')
-    assert_equal 'whWIqk0r4urZ-3S7y7uSceC9_ECd3hpAGy71E2o0HpI=', z
   end
   def test_encrypt_long
-    mhc = ReCaptcha::MHClient.new('01S1TOX9aibKxfC9oJlp8IeA==', 'deadbeefdeadbeefdeadbeefdeadbeef')
-    z =mhc.encrypt('averylongemailaddressofmorethan32cdharactersx@example.com')
+    mhc = ReCaptcha::MHClient.new('01S1TOX9aibKxfC9oJlp8IeA==', 'deadbeefdeadbeefdeadbeefdeadbeef', 'averylongemailaddressofmorethan32cdharactersx@example.com')
+    z =mhc.crypted_address
     assert_equal "q-0LLVT2bIxWbFpfLfpNhJAGadkfWXVk4hAxSlVaLrdnXrsB1NKNubavS5N-7PBued3K531vifN6NB3iz3W7qQ==",z
-    z =mhc.encrypt('johndoe@example.com')
+    mhc = ReCaptcha::MHClient.new('01S1TOX9aibKxfC9oJlp8IeA==', 'deadbeefdeadbeefdeadbeefdeadbeef', 'johndoe@example.com')
+    z = mhc.crypted_address
     assert_equal 'whWIqk0r4urZ-3S7y7uSceC9_ECd3hpAGy71E2o0HpI=', z
   end
 
@@ -109,10 +108,7 @@ class TestRecaptcha < Test::Unit::TestCase
   def test_constructor_with_recaptcha_options
     # "Look and Feel Customization" per http://recaptcha.net/apidocs/captcha/
     client = new_client
-    expected= <<-EOF
-    <script type=\"text/javascript\">\nvar RecaptchaOptions = { theme : \"white\", tabindex : 10};\n</script>\n      <script type=\"text/javascript\" src=\"http://api.recaptcha.net/challenge?k=abc&error=somerror\"> </script>\n      <noscript>\n      <iframe src=\"http://api.recaptcha.net/noscript?k=abc&error=somerror\"\n      height=\"300\" width=\"500\" frameborder=\"0\"></iframe><br>\n      <textarea name=\"recaptcha_challenge_field\" rows=\"3\" cols=\"40\">\n      </textarea>\n      <input type=\"hidden\" name=\"recaptcha_response_field\" \n      value=\"manual_challenge\">\n      </noscript>
-    EOF
-    assert_equal expected.strip, client.get_challenge('somerror', :options => {:theme => 'white', :tabindex => 10}).strip
+    assert_match(/theme \: \"white\"/, client.get_challenge('somerror', :options => {:theme => 'white', :tabindex => 10}))
   end
 
   def test_validate_fails
@@ -222,12 +218,12 @@ class TestRecaptcha < Test::Unit::TestCase
     ReCaptcha::ViewHelper.define_public_key  # 'foo'
     ReCaptcha::ViewHelper.define_private_key # 'bar'
     actual = @vf.get_captcha
-    assert_equal(((expected % ['foo', 'foo']).strip), actual.strip)
+    assert_match(/k=foo/, actual)
     ReCaptcha::ViewHelper.undefine_public_key
     ReCaptcha::ViewHelper.undefine_private_key
     # next, with options
     actual = @vf.get_captcha(:rcc_pub => 'foobar', :rcc_priv => 'blegga')
-    assert_equal(((expected % ['foobar', 'foobar']).strip), actual.strip)
+    assert_match(/k=foobar/, actual)
   end
 
   #
@@ -241,6 +237,7 @@ class TestRecaptcha < Test::Unit::TestCase
       @cf.validate_recap({}, {})
     end
   end
+
   def test_validate_recap_fails_without_public_key_constant
     assert !ReCaptcha::AppHelper.const_defined?(:RCC_PUB)
     assert !ReCaptcha::AppHelper.const_defined?(:RCC_PRIV)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-recaptcha
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors: 
 - McClain Looney
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 -06:00
+date: 2010-02-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: hoe
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 2.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.5.0
     version: 
 description: ""
 email: 
@@ -48,7 +48,9 @@ files:
 - lib/recaptcha.rb
 - lib/ruby-recaptcha.rb
 has_rdoc: true
-homepage: h2. What
+homepage: http://www.bitbucket.org/mml/ruby-recaptcha
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -70,9 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-recaptcha
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ""
 test_files: 
 - test/test_helper.rb