Adding recaptcha to comments and article suggestion

(ActionItem2075)

Adding recaptcha to comments and article suggestion
(ActionItem2075)
Caio SBA · Joenio Costa
1 parent fd5c2e61
Showing 65 changed files with 792 additions and 452 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/contact_controller.rb
app/controllers/public/content_viewer_controller.rb
app/models/comment.rb
app/models/suggest_article.rb
app/views/account/_signup_form.rhtml
app/views/cms/suggest_an_article.rhtml
app/views/contact/new.rhtml
app/views/content_viewer/_comment_form.rhtml
app/views/profile_editor/edit.rhtml
config/initializers/recaptcha.rb
features/comment.feature
features/comment_reply.feature
features/step_definitions/noosfero_steps.rb
features/step_definitions/selenium_steps.rb
features/suggest_article.feature
public/javascripts/application.js
public/stylesheets/application.css
test/functional/account_controller_test.rb
@@ -285,7 +285,7 @@ class CmsController &lt; MyProfileController
     @task = SuggestArticle.new(params[:task])
     if request.post?
        @task.target = profile
-      if @task.save
+      if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
       end
@@ -2,8 +2,6 @@ class AccountController &lt; ApplicationController
  
   no_design_blocks
  
-  inverse_captcha :field => 'e_mail'
-
   require_ssl :except => [ :login_popup, :logout_popup, :profile_details ]
  
   before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
@@ -69,7 +67,7 @@ class AccountController &lt; ApplicationController
       @user.person_data = params[:profile_data]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
-      if request.post? && params[self.icaptcha_field].blank?
+      if request.post?
         @user.signup!
         owner_role = Role.find_by_name('owner')
         @user.person.affiliate(@user.person, [owner_role]) if owner_role
@@ -4,10 +4,9 @@ class ContactController &lt; PublicController
  
   needs_profile
  
-  inverse_captcha :field => 'e_mail'
   def new
     @contact
-    if request.post? && params[self.icaptcha_field].blank? && params[:confirm] == 'true'
+    if request.post? && params[:confirm] == 'true'
       @contact = user.build_contact(profile, params[:contact])
       @contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : nil
       @contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : nil
@@ -2,8 +2,6 @@ class ContentViewerController &lt; ApplicationController
  
   needs_profile
  
-  inverse_captcha :field => 'e_mail'
-
   helper ProfileHelper
   helper TagsHelper
  
@@ -76,7 +74,7 @@ class ContentViewerController &lt; ApplicationController
  
     @form_div = params[:form]
  
-    if params[:comment] && params[self.icaptcha_field].blank? && params[:confirm] == 'true'
+    if params[:comment] && params[:confirm] == 'true'
       @comment = Comment.new(params[:comment])
       if request.post? && @page.accept_comments?
         add_comment
@@ -121,7 +119,7 @@ class ContentViewerController &lt; ApplicationController
   def add_comment
     @comment.author = user if logged_in?
     @comment.article = @page
-    if @comment.save
+    if (@comment.reply_of_id || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
       @page.touch
       @comment = nil # clear the comment form
       redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
 class Comment < ActiveRecord::Base
  
-  has_captcha
-
   track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
  
   validates_presence_of :title, :body
 class SuggestArticle < Task
  
-  has_captcha  
-
   validates_presence_of :target_id, :article_name, :email, :name, :article_body
  
   settings_items :email, :type => String
@@ -7,8 +7,7 @@
 </div>
 <% end %>
  
-<% labelled_form_for :user, @user do |f| %>
-<%= icaptcha_field() %>
+<% labelled_form_for :user, @user, :html => { :multipart => true } do |f| %>
  
 <%= hidden_field_tag :invitation_code, @invitation_code %>
  
@@ -18,13 +18,10 @@
  
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
  
-  <div id="captcha">
-    <%= labelled_form_field(_("What is the result of '%s = ?'") % @task.captcha.task, text_field(:task, 'captcha_solution')) %>
-    <%= hidden_field :task, :captcha_secret %>
-    <br style="clear: both;">
-  </div>
-
   <%= hidden_field_tag('back_to', @back_to) %>
+
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
+
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= button :cancel, _('Cancel'), @back_to %>
@@ -4,7 +4,6 @@
  
  
 <% labelled_form_for :contact, @contact do |f| %>
-  <%= icaptcha_field() %>
   <%= hidden_field_tag(:confirm, 'false') %>
  
   <%= required_fields_message %>
@@ -20,7 +20,6 @@
 </h4>
  
 <% form_tag( url_for(@page.view_url.merge({:only_path => true})), { :class => 'comment_form' } ) do %>
-  <%= icaptcha_field() %>
   <%= hidden_field_tag(:confirm, 'false') %>
  
   <%= required_fields_message %>
@@ -29,7 +28,6 @@
  
     <%= required labelled_form_field(_('Name'), text_field(:comment, :name)) %>
     <%= required labelled_form_field(_('e-mail'), text_field(:comment, :email)) %>
-
     <p>
     <%= _('If you are a registered user, you can login and be automatically recognized.') %>
     </p>
@@ -39,8 +37,7 @@
   <%= required labelled_form_field(_('Title'), text_field(:comment, :title)) %>
   <%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
  
-  <%= required labelled_form_field(_("What is the result of '%s = ?'") % @comment.captcha.task, text_field(:comment, :captcha_solution)) %>
-  <%= hidden_field(:comment, :captcha_secret) %>
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
  
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "this.form.confirm.value = 'true'; this.disabled = true; this.form.submit(); return true;") %>
@@ -13,7 +13,6 @@
     <% end %>
   </div>
  
-
   <h2><%= _('Privacy options') %></h2>
  
   <% if profile.person? %>
@@ -0,0 +1,4 @@
+Recaptcha.configure do |config|
+  config.public_key  = '6LdLTsgSAAAAACYr0rHdF2sVqt3sMaoz_h6uN4k7'
+  config.private_key = '6LdLTsgSAAAAADM9Mxg-EFjXc4tCe6zpKiPOEMs8'
+end
@@ -82,11 +82,6 @@ Feature: comment
     And I should be exactly on /booking/article-with-comment
     And I should be moved to anchor "comment_form"
  
-  Scenario: ask captcha question
-    Given I am on /booking/article-with-comment
-    When I follow "Post a comment" within ".post-comment-button"
-    Then I should see "What is the result of "
-
   @selenium
   Scenario: keep comments field filled while trying to do a comment
     Given I am on /booking/article-with-comment
@@ -64,8 +64,7 @@ Feature: comment
  
   @selenium
   Scenario: reply a comment
-    Given skip comments captcha
-    And I go to /booking/another-article
+    Given I go to /booking/another-article
     And I follow "Reply" within ".comment-balloon"
     And I fill in "Name" within "comment-balloon" with "Joey"
     And I fill in "e-mail" within "comment-balloon" with "joey@ramones.com"
@@ -368,7 +368,6 @@ Given /^the articles of &quot;(.+)&quot; are moderated$/ do |organization|
 end
  
 Given /^the following comments?$/ do |table|
-  Comment.skip_captcha!
   table.hashes.each do |item|
     data = item.dup
     article = Article.find_by_name(data.delete("article"))
@@ -388,7 +387,6 @@ Given /^the community &quot;(.+)&quot; is closed$/ do |community|
 end
  
 Given /^someone suggested the following article to be published$/ do |table|
-  SuggestArticle.skip_captcha!
   table.hashes.map{|item| item.dup}.each do |item|
     target = Community[item.delete('target')]
     task = SuggestArticle.create!(:target => target, :data => item)
@@ -422,10 +420,6 @@ Given /^the environment domain is &quot;([^\&quot;]*)&quot;$/ do |domain|
   d.save(false)
 end
  
-Given /^skip comments captcha$/ do
-  Comment.any_instance.stubs(:skip_captcha?).returns(true)
-end
-
 When /^([^\']*)'s account is activated$/ do |person|
   Person.find_by_name(person).user.activate
 end
@@ -93,12 +93,6 @@ When /^I type &quot;([^\&quot;]*)&quot; in TinyMCE field &quot;([^\&quot;]*)&quot;$/ do |value, field_id|
   response.selenium.type("dom=document.getElementById('#{field_id}_ifr').contentDocument.body", value)
 end
  
-When /^I answer the captcha$/ do
-  question = response.selenium.get_text("//label[@for='task_captcha_solution']").match(/What is the result of '(.+) = \?'/)[1]
-  answer = eval(question)
-  response.selenium.type("id=task_captcha_solution", answer)
-end
-
 When /^I refresh the page$/ do
   response.selenium.refresh
 end
@@ -31,7 +31,6 @@ Feature: suggest article
     And I fill in "Email" with "someguy@somewhere.com"
     And I type "This is my suggestion's lead" in TinyMCE field "task_article_abstract"
     And I type "I like free software" in TinyMCE field "task_article_body"
-    And I answer the captcha
     And I press "Save"
     And I am logged in as "joaosilva"
     And I go to Sample Community's control panel
@@ -662,6 +662,7 @@ function add_comment_reply_form(button, comment_id) {
   var f = container.find('.comment_form');
   if (f.length == 0) {
     f = jQuery('#page-comment-form .comment_form').clone();
+    f.find('#dynamic_recaptcha').remove();
     f.find('.fieldWithErrors').map(function() { jQuery(this).replaceWith(jQuery(this).contents()); });
     f.prepend('<input type="hidden" name="comment[reply_of_id]" value="' + comment_id + '" />');
     container.append(f);
@@ -6136,3 +6136,30 @@ h1#agenda-title {
 #user a#pending-tasks-count {
   color: #FFFFFF;
 }
+
+/* Captcha */
+
+.comment_reply #recaptcha_area {
+  margin-bottom: 3px !important;
+}
+
+.comment_reply .recaptchatable tr td + td + td {
+  display: none !important;
+}
+
+.comment_reply .recaptcha-container {
+  width: 100%;
+  overflow: hidden;
+}
+
+.comment_reply .recaptcha-container:hover {
+  overflow: visible;
+}
+
+.comment_reply .recaptcha-container tr:hover td {
+  background: transparent;
+}
+
+.comment_reply .recaptcha_image_cell {
+  background: transparent !important;
+}
@@ -571,17 +571,6 @@ class AccountControllerTest &lt; Test::Unit::TestCase
  
 # end of enterprise activation tests
  
-  should 'not be able to signup while inverse captcha field filled' do
-    assert_no_difference User, :count do
-      new_user({}, @controller.icaptcha_field => 'bli@bla.email.foo')
-    end
-  end
-
-  should 'render inverse captcha field' do
-    get :signup
-    assert_tag :tag => 'input', :attributes => { :type => 'text', :name => @controller.icaptcha_field }
-  end
-
   should 'use the current environment for the template of user' do
     template = create_user('test_template', :email => 'test@bli.com', :password => 'pass', :password_confirmation => 'pass').person
     template.boxes.destroy_all
@@ -1320,7 +1320,6 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   should 'create a task suggest task to a profile' do
     c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
  
-    SuggestArticle.any_instance.stubs(:skip_captcha?).returns(true)
     assert_difference SuggestArticle, :count do
       post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article_name => 'some name', :article_body => 'some body', :email => 'some@localhost.com', :name => 'some name'}
     end
@@ -74,13 +74,6 @@ class ContactControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'select', :attributes => {:name => 'state'}
   end
  
-  should 'not be able to post contact while inverse captcha field filled' do
-    post :new, :profile => enterprise.identifier, @controller.icaptcha_field => 'filled', :contact => {:subject => 'Hi', :message => 'Hi, all', :state => '', :city => ''}
-
-    assert_response :success
-    assert_template 'new'
-  end
-
   should 'not allow if not logged' do
     logout
     get :new, :profile => profile.identifier
@@ -93,12 +86,6 @@ class ContactControllerTest &lt; Test::Unit::TestCase
     assert_equal Person['contact_test_user'], assigns(:contact).sender
   end
  
-  should 'send contact while inverse captcha field not filled' do
-    post :new, :profile => enterprise.identifier, :contact => {:subject => 'Hi', :message => 'Hi, all', :state => '', :city => ''}, :confirm => 'true'
-    assert_response :redirect
-    assert_redirected_to :action => 'new'
-  end
-
   should 'deliver contact if subject and message are filled' do
     post :new, :profile => enterprise.identifier, :contact => {:subject => 'Hi', :message => 'Hi, all'}, :confirm => 'true'
     assert_response :redirect
@@ -15,7 +15,6 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
  
     @profile = create_user('testinguser').person
     @environment = @profile.environment
-    Comment.skip_captcha!
   end
   attr_reader :profile, :environment
  
@@ -188,17 +187,6 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     end
   end
  
-  should 'not be able to post comment while inverse captcha field filled' do
-    profile = create_user('popstar').person
-    page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
-    page.save!
-    profile.home_page = page; profile.save!
-
-    assert_no_difference Comment, :count do
-      post :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], @controller.icaptcha_field => 'filled', :comment => { :title => 'crap!', :body => 'I think that this article is crap', :name => 'Anonymous coward', :email => 'coward@anonymous.com' }
-    end
-  end
-
   should 'be able to remove comments if is moderator' do
     commenter = create_user('commenter_user').person
     community = Community.create!(:name => 'Community test', :identifier => 'community-test')
@@ -212,15 +200,6 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     end
   end
  
-  should 'render inverse captcha field' do
-    profile = create_user('popstar').person
-    page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
-    page.save!
-    profile.home_page = page; profile.save!
-    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
-    assert_tag :tag => 'input', :attributes => { :type => 'text', :name => @controller.icaptcha_field }
-  end
-
   should 'filter html content from body' do
     login_as @profile.identifier
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
@@ -17,7 +17,6 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     domain.save!
  
     @product_category = fast_create(ProductCategory)
-    Comment.skip_captcha!
   end
  
   def create_article_with_optional_category(name, profile, category = nil)
@@ -238,7 +238,6 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     c = fast_create(Community)
     c.add_admin profile
     @controller.stubs(:profile).returns(c)
-    SuggestArticle.skip_captcha!
     t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
  
     get :index
@@ -251,7 +250,6 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     c = fast_create(Community)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     @controller.stubs(:profile).returns(c)
-    SuggestArticle.skip_captcha!
     t = SuggestArticle.create!(:article_name => 'test name', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
  
     post :close, :tasks => {t.id => { :task => {}, :decision => "finish"}}
@@ -263,7 +261,6 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     c = fast_create(Community)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     @controller.stubs(:profile).returns(c)
-    SuggestArticle.skip_captcha!
     t = SuggestArticle.new
     t.article_name = 'test name' 
     t.article_body = 'test body'
@@ -6,7 +6,6 @@ class ArticleTest &lt; Test::Unit::TestCase
  
   def setup
     @profile = create_user('testing').person
-    Comment.skip_captcha!
   end
   attr_reader :profile
  
@@ -7,7 +7,6 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     @finder = CategoryFinder.new(@category)
     @product_category = fast_create(ProductCategory, :name => 'Products')
  
-    Comment.skip_captcha!
   end
  
   should 'search for articles in a specific category' do
@@ -5,7 +5,6 @@ class CategoryTest &lt; Test::Unit::TestCase
  
   def setup
     @env = fast_create(Environment)
-    Comment.skip_captcha!
   end
  
   def test_mandatory_field_name
@@ -10,7 +10,6 @@ class CommentNotifierTest &lt; Test::Unit::TestCase
     ActionMailer::Base.deliveries = []
     @profile = create_user('user_comment_test').person
     @article = fast_create(Article, :name => 'Article test', :profile_id => @profile.id, :notify_comments => true)
-    Comment.skip_captcha!
   end
  
   should 'deliver mail after make aarticle commment' do
@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class CommentTest < Test::Unit::TestCase
  
   def setup
-    Comment.skip_captcha!
   end
  
   should 'have a name and require it' do
@@ -331,12 +330,4 @@ class CommentTest &lt; Test::Unit::TestCase
     assert_nil Comment.new(:email => 'my@email.com').author_url
   end
  
-  should 'have the captcha_solution be solved' do
-    Comment.dont_skip_captcha!
-    c = Comment.new
-    assert !c.valid? && c.errors.invalid?(:captcha_solution)
-    c.skip_captcha!
-    assert !c.valid? && !c.errors.invalid?(:captcha_solution)
-  end
-
 end
@@ -4,7 +4,6 @@ class CommunityTest &lt; Test::Unit::TestCase
  
   def setup
     @person = fast_create(Person)
-    Comment.skip_captcha!
   end
  
   attr_reader :person
@@ -12,7 +12,6 @@ class ForumHelperTest &lt; Test::Unit::TestCase
     @environment = Environment.default
     @profile = create_user('forum_helper_test').person
     @forum = fast_create(Forum, :profile_id => profile.id, :name => 'Forum test')
-    Comment.skip_captcha!
   end
  
   attr :profile
@@ -45,18 +45,6 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert t.errors.invalid?(:target_id)
   end
  
-  should 'have the captcha_solution be solved' do
-    t = SuggestArticle.new
-    assert !t.errors.invalid?(:captcha_solution)
-    t.valid?
-    assert t.errors.invalid?(:captcha_solution)
-
-    t.skip_captcha!
-    assert t.skip_captcha?
-    t.valid?
-    assert !t.errors.invalid?(:captcha_solution)
-  end
-
   should 'have the article_abstract' do
     t = SuggestArticle.new
     assert t.respond_to?(:article_abstract)
@@ -1,29 +0,0 @@
-InverseCaptcha
-==============
-
-Implement simple Anti-Comment-Spam Technique.
-
-Basic Usage
-===========
-
-Add method inverse_captcha on controller:
-
-ps.: dont use this method more than once time on same controller.
-
-  inverse_captcha :field => 'e-mail'[, class => 'ghost']
-
-Add the field in view form:
-
-  <%= icaptcha_field() %>
-
-Check if field is blank in your controller:
-
-  if params[controller.icaptcha_field].blank?
-    do...
-  else
-    dont...
-  end
-
----
-Joenio Costa <joenio@colivre.coop.br>
-Qui Mar 27 15:48:12 BRT 2008
@@ -1,3 +0,0 @@
-ActionController::Base.extend(InverseCaptcha::ClassMethods)
-ActionController::Base.send(:include, InverseCaptcha::InstanceMethods)
-ActionView::Base.send(:include, InverseCaptchaHelper)
@@ -1,18 +0,0 @@
-module InverseCaptcha
-
-  module ClassMethods
-    def inverse_captcha(opt = {})
-      InverseCaptcha.const_set("ICAPTCHA_FIELD", opt[:field]) unless InverseCaptcha.const_defined? "ICAPTCHA_FIELD"
-      InverseCaptcha.const_set("ICAPTCHA_LABEL", opt[:label] || N_("Don't fill this field")) unless InverseCaptcha.const_defined? "ICAPTCHA_LABEL"
-      InverseCaptcha.const_set("ICAPTCHA_STYLECLASS", opt[:class] || 'ghost') unless InverseCaptcha.const_defined? "ICAPTCHA_STYLECLASS"
-      self.send(:include, InverseCaptcha)
-    end
-  end
-
-  module InstanceMethods 
-    def icaptcha_field
-      ICAPTCHA_FIELD
-    end
-  end
-
-end
@@ -1,11 +0,0 @@
-module InverseCaptchaHelper
-
-  def icaptcha_field(opt = {})
-    label = controller.class::ICAPTCHA_LABEL
-    field = controller.class::ICAPTCHA_FIELD
-    opt.merge!({:class => controller.class::ICAPTCHA_STYLECLASS})
-    stylesheet = "<style type='text/css'> span.#{opt[:class]} { display: none; } </style>"
-    stylesheet + content_tag('span', labelled_form_field(_(label), text_field_tag(field, nil)), opt)
-  end
-
-end
@@ -1,20 +0,0 @@
-Copyright (c) 2007 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
@@ -1,45 +0,0 @@
-MathCaptcha
-===========
-
-TODO: Create form helpers
-
-Validates your Model to be saved by a human (or very clever script) by asking
-the user to solve a very basic mathematical equation.
-
-It does not use the session to store the secret, but uses AES from EzCrypto.
-
-
-Requirements
-============
- * gem ezcrypto
- * users who can calculate
-
-Usage
-=====
-
-In your Model < ActiveRecord::Base
-
-      has_captcha
-
-
-In your form view:
-
-      <%= @model.captcha.task %> = ?
-      <%= form.text_field :captcha_solution %>
-      <%= form.hidden_field :captcha_secret %>
-
-
-If you want to skip the validation (in tests/specs), you can 
-
-      Model.skip_captcha!   # or
-      @model.skip_captcha!
-
-and turn that off by
-
-      Model.dont_skip_captcha!   # or
-      @model.dont_skip_captcha!
-    
-
-
-Copyright (c) 2007 Pat Nakajima, released under the MIT license
-Copyright (c) 2009 Niklas Hofer, released under the MIT license
@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the math_captcha plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the math_captcha plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'MathCaptcha'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
@@ -1 +0,0 @@
-require 'math_captcha'
 \ No newline at end of file
@@ -1 +0,0 @@
-# Install hook code here
@@ -1,2 +0,0 @@
-require 'math_captcha/captcha'
-require 'math_captcha/has_captcha'
@@ -1,68 +0,0 @@
-require 'rubygems'
-require 'ezcrypto'
-class Captcha
-  NUMBERS   = (1..9).to_a
-  OPERATORS = [:+, :-, :*]
-
-  attr_reader :x, :y, :operator
-
-  def initialize(x=nil, y=nil, operator=nil)
-    @x = x || NUMBERS.sort_by{rand}.first
-    @y = y || NUMBERS.sort_by{rand}.first
-    @operator = operator || OPERATORS.sort_by{rand}.first
-  end
-
-  # Only the #to_secret is shared with the client.
-  # It can be reused here to create the Captcha again
-  def self.from_secret(secret)
-    yml = cipher.decrypt64 secret
-    args = YAML.load(yml)
-    new(args[:x], args[:y], args[:operator])
-  end
-
-  def self.cipher
-    EzCrypto::Key.with_password key, 'bad_fixed_salt'
-  end
-
-  def self.key
-    'ultrasecret'
-  end
-
-  
-  def check(answer)
-    answer == solution
-  end
-  
-  def task
-    "#{@x} #{@operator.to_s} #{@y}"
-  end
-  def task_with_questionmark
-    "#{@x} #{@operator.to_s} #{@y} = ?"
-  end
-  alias_method :to_s, :task
-
-  def solution
-    @x.send @operator, @y
-  end
-
-  def to_secret
-    cipher.encrypt64(to_yaml)
-  end
-
-  def to_yaml
-    YAML::dump({
-      :x => x,
-      :y => y,
-      :operator => operator
-    })
-  end
-
-  private
-  def cipher
-    @cipher ||= self.class.cipher
-  end
-  def reset_cipher
-    @cipher = nil
-  end
-
-end
@@ -1,54 +0,0 @@
-module MathCaptcha
-  module HasCaptcha
-    module InstanceMethods
-      def must_solve_captcha
-        self.errors.add(:captcha_solution, "wrong answer.") unless self.captcha.check(self.captcha_solution.to_i)
-      end
-      def skip_captcha!
-        self.class.skip_captcha!
-      end
-      def skip_captcha?
-        self.class.skip_captcha?
-      end
-      def captcha
-        @captcha ||= Captcha.new
-      end
-      def captcha_secret=(secret)
-        @captcha = Captcha.from_secret(secret)
-      end
-      def captcha_secret
-        captcha.to_secret
-      end
-    end
-    
-    module ClassMethods
-      def has_captcha
-        include InstanceMethods
-        attr_accessor :captcha_solution
-        dont_skip_captcha!
-        validates_presence_of :captcha_solution, 
-          :on => :create, :message => "can't be blank", 
-          :unless => Proc.new {|record| record.skip_captcha? }
-        validate_on_create :must_solve_captcha,
-          :unless => Proc.new {|record| record.skip_captcha? }
-      end
-      def skip_captcha!
-        @@skip_captcha = true
-      end
-      def dont_skip_captcha!
-        @@skip_captcha = false
-      end
-      def skip_captcha?
-        @@skip_captcha
-      end
-      def skipping_captcha(&block)
-        skipping_before = skip_captcha?
-        skip_captcha!
-        yield
-        dont_skip_captcha! if skipping_before
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:extend, MathCaptcha::HasCaptcha::ClassMethods)
@@ -1,49 +0,0 @@
-require 'lib/math_captcha/captcha'
-require 'base64'
-
-describe Captcha do
-  describe "with a random task" do
-    before(:each) do
-      @captcha = Captcha.new
-    end
-    it "should have arguments and an operator" do
-      @captcha.x.should_not be_nil
-      @captcha.y.should_not be_nil
-      @captcha.operator.should_not be_nil
-    end
-    it "should use numbers bigger than zero" do
-      @captcha.x.should > 0
-      @captcha.y.should > 0
-    end
-    it "should offer a human readable task" do
-      @captcha.task.should =~ /^\d+\s*[\+\-\*]\s*\d+$/
-    end
-    it "should have a secret to use in forms" do
-      @captcha.to_secret.should_not be_nil
-      @captcha.to_secret.should_not be_empty
-    end
-
-    it "should re-use its cipher" do
-      @captcha.send(:cipher).should == @captcha.send(:cipher)
-    end
-
-    it "should have a base64 encoded secret" do
-      lambda { Base64.decode64(@captcha.to_secret).should_not be_nil }.should_not raise_error
-    end
-
-    describe "re-creating another from secret" do
-      before(:each) do
-        @secret = @captcha.to_secret
-        @new_captcha = Captcha.from_secret(@secret)
-      end
-      it "should have the same arguments and operator" do
-        @new_captcha.x.should == @captcha.x
-        @new_captcha.y.should == @captcha.y
-        @new_captcha.operator.should == @captcha.operator
-      end
-      it "should have the same string" do
-        @new_captcha.task.should == @captcha.task
-      end
-    end
-  end
-end
@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse
@@ -0,0 +1,23 @@
+== 0.2.2 / 2009-09-14
+
+* Add a timeout to the validator
+* Give the documentation some love
+
+== 0.2.1 / 2009-09-14
+
+* Removed Ambethia namespace, and restructured classes a bit
+* Added an example rails app in the example-rails branch
+
+== 0.2.0 / 2009-09-12
+
+* RecaptchaOptions AJAX API Fix
+* Added 'cucumber' as a test environment to skip
+* Ruby 1.9 compat fixes
+* Added option :message => 'Custom error message' to verify_recaptcha
+* Removed dependency on ActiveRecord constant
+* Add I18n
+
+== 0.1.0 / 2008-2-8
+
+* 1 major enhancement
+	* Initial Gem Release
 \ No newline at end of file
@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec
@@ -0,0 +1,19 @@
+Copyright (c) 2007 Jason L Perry
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
 \ No newline at end of file
@@ -0,0 +1,150 @@
+= reCAPTCHA
+
+Author::    Jason L Perry (http://ambethia.com)
+Copyright:: Copyright (c) 2007 Jason L Perry
+License::   {MIT}[http://creativecommons.org/licenses/MIT/]
+Info::      http://ambethia.com/recaptcha
+Git::       http://github.com/ambethia/recaptcha/tree/master
+Bugs::      http://github.com/ambethia/recaptcha/issues
+
+This plugin adds helpers for the {reCAPTCHA API}[http://recaptcha.net]. In your
+views you can use the +recaptcha_tags+ method to embed the needed javascript,
+and you can validate in your controllers with +verify_recaptcha+.
+
+Beforehand you need to configure Recaptcha with your custom private and public
+key. You may find detailed examples below. Exceptions will be raised if you
+call these methods and the keys can't be found.
+
+== About this fork
+
+This fork tries to introduces a more convenient way to configure recaptcha's
+settings. The API will be inspired by {Thoughtbot's
+Hoptoad}[http://robots.thoughtbot.com/post/344833329/mygem-configure-block].
+
+== Rails Installation
+
+reCAPTCHA for Rails, add this to your Gemfile:
+
+  gem "recaptcha", :require => "recaptcha/rails"
+
+Or, it can be installed as a gem:
+
+  config.gem "recaptcha", :lib => "recaptcha/rails"
+
+Or, as a standard rails plugin:
+
+  script/plugin install git://github.com/ambethia/recaptcha.git
+
+== Merb Installation
+
+reCAPTCHA can also be used in a Merb application when installed as a gem:
+
+  dependency "alm-recaptcha", ">=0.2.2.1", :require_as => "recaptcha/merb"
+
+Initial Merb compatability funded by ALM Labs.
+
+== Setting up your API Keys
+
+There are multiple ways to setup your reCAPTCHA API key once you
+{obtain}[http://recaptcha.net/whyrecaptcha.html] a pair.
+
+=== Recaptcha.configure
+
+You may use the block style configuration. The following code could be placed
+into a +config/initializers/recaptcha.rb+ when used in a Rails project.
+
+  Recaptcha.configure do |config|
+    config.public_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+    config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+    config.proxy = 'http://myrpoxy.com.au:8080'
+  end
+
+This way, you may also set additional options to fit recaptcha into your
+deployment environment.
+
+== Recaptcha#with_configuration
+
+If you want to temporarily overwrite the configuration you set with `Recaptcha.configure` (when testing, for example), you can use a `Recaptcha#with_configuration` block:
+
+  Recaptcha.configure(:public_key => '12345') do
+    # Do stuff with the overwritten public_key.
+  end
+
+=== Shell environment
+
+Or, you can keep your keys out of your code base by exporting the following
+environment variables. You might do this in the .profile/rc, or equivalent for
+the user running your application:
+
+  export RECAPTCHA_PUBLIC_KEY  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+  export RECAPTCHA_PRIVATE_KEY = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+
+=== Per call
+
+You can also pass in your keys as options at runtime, for example:
+
+  recaptcha_tags :public_key => '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+
+and later,
+
+  verify_recaptcha :private_key => '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+
+This option might be useful, if the same code base is used for multiple
+reCAPTCHA setups.
+
+== To use 'recaptcha'
+
+Add +recaptcha_tags+ to each form you want to protect.
+
+And, add +verify_recaptcha+ logic to each form action that you've protected.
+
+=== +recaptcha_tags+
+
+Some of the options available:
+
+<tt>:ssl</tt>::         Uses secure http for captcha widget (default +false+)
+<tt>:noscript</tt>::    Include <noscript> content (default +true+)
+<tt>:display</tt>::     Takes a hash containing the +theme+ and +tabindex+ options per the API. (default +nil+)
+<tt>:ajax</tt>::        Render the dynamic AJAX captcha per the API. (default +false+)
+<tt>:public_key</tt>::  Your public API key, takes precedence over the ENV variable (default +nil+)
+<tt>:error</tt>::       Override the error code returned from the reCAPTCHA API (default +nil+)
+
+You can also override the html attributes for the sizes of the generated +textarea+ and +iframe+
+elements, if CSS isn't your thing. Inspect the source of +recaptcha_tags+ to see these options.
+
+=== +verify_recaptcha+
+
+This method returns +true+ or +false+ after processing the parameters from the reCAPTCHA widget. Why
+isn't this a model validation? Because that violates MVC. You can use it like this, or how ever you
+like. Passing in the ActiveRecord object is optional, if you do--and the captcha fails to verify--an
+error will be added to the object for you to use.
+
+Some of the options available:
+
+<tt>:model</tt>::       Model to set errors
+<tt>:attribute</tt>::   Model attribute to receive errors (default :base)
+<tt>:message</tt>::     Custom error message
+<tt>:private_key</tt>:: Your private API key, takes precedence over the ENV variable (default +nil+).
+<tt>:timeout</tt>::     The number of seconds to wait for reCAPTCHA servers before give up. (default +3+)
+
+  respond_to do |format|
+    if verify_recaptcha(:model => @post, :message => "Oh! It's error with reCAPTCHA!") && @post.save
+      # ...
+    else
+      # ...
+    end
+  end
+
+== I18n support
+reCAPTCHA passes two types of error explanation to a linked model. It will use the I18n gem
+to translate the default error message if I18n is available. To customize the messages to your locale,
+add these keys to your I18n backend:
+
+<tt>recaptcha.errors.verification_failed</tt>:: error message displayed if the captcha words didn't match
+<tt>recaptcha.errors.recaptcha_unavailable</tt>:: displayed if a timout error occured while attempting to verify the captcha
+
+== TODO
+* Remove Rails/ActionController dependencies
+* Framework agnostic
+* Add some helpers to use in before_filter and what not
+* Better documentation
@@ -0,0 +1,60 @@
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name           = "recaptcha"
+    gem.description    = "This plugin adds helpers for the reCAPTCHA API "
+    gem.summary        = "Helpers for the reCAPTCHA API"
+    gem.homepage       = "http://ambethia.com/recaptcha"
+    gem.authors        = ["Jason L. Perry"]
+    gem.email          = "jasper@ambethia.com"
+    gem.files.reject! { |fn| fn.include? ".gitignore" }
+    gem.add_development_dependency "mocha"
+    gem.add_development_dependency "activesupport"
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rd|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include "README.rdoc", "LICENSE", "lib/**/*.rb"
+  rd.rdoc_dir = 'rdoc'
+  rd.options << '-N' # line numbers
+  rd.options << '-S' # inline source
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  # test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :default => :test
+
+
+
@@ -0,0 +1 @@
+0.3.2
@@ -0,0 +1,5 @@
+# Rails plugin initialization.
+# You can also install it as a gem:
+#   config.gem "ambethia-recaptcha", :lib => "recaptcha/rails", :source => "http://gems.github.com"
+
+require 'recaptcha/rails'
 \ No newline at end of file
@@ -0,0 +1,58 @@
+require 'recaptcha/configuration'
+require 'recaptcha/client_helper'
+require 'recaptcha/verify'
+
+module Recaptcha
+  module VERSION #:nodoc:
+    MAJOR = 0
+    MINOR = 2
+    TINY  = 2
+    PATCH = 1
+
+    STRING = [MAJOR, MINOR, TINY, PATCH].join('.')
+  end
+
+
+  RECAPTCHA_API_SERVER_URL        = 'http://www.google.com/recaptcha/api'
+  RECAPTCHA_API_SECURE_SERVER_URL = 'https://www.google.com/recaptcha/api'
+  RECAPTCHA_VERIFY_URL            = 'http://www.google.com/recaptcha/api/verify'
+
+  SKIP_VERIFY_ENV = ['test', 'cucumber']
+
+  # Gives access to the current Configuration.
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  # Allows easy setting of multiple configuration options. See Configuration
+  # for all available options.
+  #--
+  # The temp assignment is only used to get a nicer rdoc. Feel free to remove
+  # this hack.
+  #++
+  def self.configure
+    config = configuration
+    yield(config)
+  end
+
+  def self.with_configuration(config)
+    original_config = {}
+
+    config.each do |key, value|
+      original_config[key] = configuration.send(key)
+      configuration.send("#{key}=", value)
+    end
+
+    result = yield if block_given?
+
+    original_config.each { |key, value| configuration.send("#{key}=", value) }
+    result
+  end
+
+  class RecaptchaError < StandardError
+  end
+end
+
+if defined?(Rails)
+  require 'recaptcha/rails'
+end
@@ -0,0 +1,51 @@
+module Recaptcha
+  module ClientHelper
+    # Your public API can be specified in the +options+ hash or preferably
+    # using the Configuration.
+    def recaptcha_tags(options = {})
+      # Default options
+      key   = options[:public_key] ||= Recaptcha.configuration.public_key
+      raise RecaptchaError, "No public key specified." unless key
+      error = options[:error] ||= (defined? flash ? flash[:recaptcha_error] : "")
+      uri   = Recaptcha.configuration.api_server_url(options[:ssl])
+      html  = ""
+      if options[:display]
+        html << %{<script type="text/javascript">\n}
+        html << %{  var RecaptchaOptions = #{options[:display].to_json};\n}
+        html << %{</script>\n}
+      end
+      if options[:ajax]
+        html << <<-EOS
+          <div id="dynamic_recaptcha"></div>
+          <script type="text/javascript">
+            var rc_script_tag = document.createElement('script'),
+                rc_init_func = function(){Recaptcha.create("#{key}", document.getElementById("dynamic_recaptcha")#{',RecaptchaOptions' if options[:display]});}
+            rc_script_tag.src = "#{uri}/js/recaptcha_ajax.js";
+            rc_script_tag.type = 'text/javascript';
+            rc_script_tag.onload = function(){rc_init_func.call();};
+            rc_script_tag.onreadystatechange = function(){
+              if (rc_script_tag.readyState == 'loaded' || rc_script_tag.readyState == 'complete') {rc_init_func.call();}
+            };
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(rc_script_tag);
+          </script>
+        EOS
+      else
+        html << %{<script type="text/javascript" src="#{uri}/challenge?k=#{key}}
+        html << %{#{error ? "&amp;error=#{CGI::escape(error)}" : ""}"></script>\n}
+        unless options[:noscript] == false
+          html << %{<noscript>\n  }
+          html << %{<iframe src="#{uri}/noscript?k=#{key}" }
+          html << %{height="#{options[:iframe_height] ||= 300}" }
+          html << %{width="#{options[:iframe_width]   ||= 500}" }
+          html << %{style="border:none;"></iframe><br/>\n  }
+          html << %{<textarea name="recaptcha_challenge_field" }
+          html << %{rows="#{options[:textarea_rows] ||= 3}" }
+          html << %{cols="#{options[:textarea_cols] ||= 40}"></textarea>\n  }
+          html << %{<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>}
+          html << %{</noscript>\n}
+        end
+      end
+      return (html.respond_to?(:html_safe) && html.html_safe) || html
+    end # recaptcha_tags
+  end # ClientHelper
+end # Recaptcha
@@ -0,0 +1,53 @@
+module Recaptcha
+  # This class enables detailed configuration of the recaptcha services.
+  #
+  # By calling
+  #
+  #   Recaptcha.configuration # => instance of Recaptcha::Configuration
+  #
+  # or
+  #   Recaptcha.configure do |config|
+  #     config # => instance of Recaptcha::Configuration
+  #   end
+  #
+  # you are able to perform configuration updates.
+  #
+  # Your are able to customize all attributes listed below. All values have
+  # sensitive default and will very likely not need to be changed.
+  #
+  # Please note that the public and private key for the reCAPTCHA API Access
+  # have no useful default value. The keys may be set via the Shell enviroment
+  # or using this configuration. Settings within this configuration always take
+  # precedence.
+  #
+  # Setting the keys with this Configuration
+  #
+  #   Recaptcha.configure do |config|
+  #     config.public_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+  #     config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+  #   end
+  #
+  class Configuration
+    attr_accessor :nonssl_api_server_url,
+                  :ssl_api_server_url,
+                  :verify_url,
+                  :skip_verify_env,
+                  :private_key,
+                  :public_key,
+                  :proxy
+
+    def initialize #:nodoc:
+      @nonssl_api_server_url = RECAPTCHA_API_SERVER_URL
+      @ssl_api_server_url    = RECAPTCHA_API_SECURE_SERVER_URL
+      @verify_url            = RECAPTCHA_VERIFY_URL
+      @skip_verify_env       = SKIP_VERIFY_ENV
+
+      @private_key           = ENV['RECAPTCHA_PRIVATE_KEY']
+      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']
+    end
+
+    def api_server_url(ssl = false) #:nodoc:
+      ssl ? ssl_api_server_url : nonssl_api_server_url
+    end
+  end
+end
@@ -0,0 +1,4 @@
+require 'recaptcha'
+
+Merb::GlobalHelpers.send(:include, Recaptcha::ClientHelper)
+Merb::Controller.send(:include, Recaptcha::Verify)
@@ -0,0 +1,5 @@
+require 'net/http'
+require 'recaptcha'
+
+ActionView::Base.send(:include, Recaptcha::ClientHelper)
+ActionController::Base.send(:include, Recaptcha::Verify)
 \ No newline at end of file
@@ -0,0 +1,15 @@
+require 'net/http'
+require 'recaptcha'
+module Rails
+  module Recaptcha
+    class Railtie < Rails::Railtie
+      initializer "setup config" do
+        begin
+          ActionView::Base.send(:include, ::Recaptcha::ClientHelper)
+          ActionController::Base.send(:include, ::Recaptcha::Verify)
+        end
+      end
+    end
+  end
+end
+
@@ -0,0 +1,61 @@
+require "uri"
+module Recaptcha
+  module Verify
+    # Your private API can be specified in the +options+ hash or preferably
+    # using the Configuration.
+    def verify_recaptcha(options = {})
+      if !options.is_a? Hash
+        options = {:model => options}
+      end
+
+      env = options[:env] || ENV['RAILS_ENV']
+      return true if Recaptcha.configuration.skip_verify_env.include? env
+      model = options[:model]
+      attribute = options[:attribute] || :base
+      private_key = options[:private_key] || Recaptcha.configuration.private_key
+      raise RecaptchaError, "No private key specified." unless private_key
+
+      begin
+        recaptcha = nil
+        if(Recaptcha.configuration.proxy)
+          proxy_server = URI.parse(Recaptcha.configuration.proxy)
+          http = Net::HTTP::Proxy(proxy_server.host, proxy_server.port)
+        else
+          http = Net::HTTP
+        end
+
+        Timeout::timeout(options[:timeout] || 3) do
+          recaptcha = http.post_form(URI.parse(Recaptcha.configuration.verify_url), {
+            "privatekey" => private_key,
+            "remoteip"   => request.remote_ip,
+            "challenge"  => params[:recaptcha_challenge_field],
+            "response"   => params[:recaptcha_response_field]
+          })
+        end
+        answer, error = recaptcha.body.split.map { |s| s.chomp }
+        unless answer == 'true'
+          flash[:recaptcha_error] = error
+          if model
+            message = "Word verification response is incorrect, please try again."
+            message = I18n.translate(:'recaptcha.errors.verification_failed', {:default => message}) if defined?(I18n)
+            model.errors.add attribute, options[:message] || message
+          end
+          return false
+        else
+          flash[:recaptcha_error] = nil
+          return true
+        end
+      rescue Timeout::Error
+        flash[:recaptcha_error] = "recaptcha-not-reachable"
+        if model
+          message = "Oops, we failed to validate your word verification response. Please try again."
+          message = I18n.translate(:'recaptcha.errors.recaptcha_unreachable', :default => message) if defined?(I18n)
+          model.errors.add attribute, options[:message] || message
+        end
+        return false
+      rescue Exception => e
+        raise RecaptchaError, e.message, e.backtrace
+      end
+    end # verify_recaptcha
+  end # Verify
+end # Recaptcha
@@ -0,0 +1,65 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{recaptcha}
+  s.version = "0.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jason L. Perry"]
+  s.date = %q{2010-12-20}
+  s.description = %q{This plugin adds helpers for the reCAPTCHA API }
+  s.email = %q{jasper@ambethia.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "init.rb",
+    "lib/recaptcha.rb",
+    "lib/recaptcha/client_helper.rb",
+    "lib/recaptcha/configuration.rb",
+    "lib/recaptcha/merb.rb",
+    "lib/recaptcha/rails.rb",
+    "lib/recaptcha/verify.rb",
+    "recaptcha.gemspec",
+    "tasks/recaptcha_tasks.rake",
+    "test/recaptcha_test.rb",
+    "test/verify_recaptcha_test.rb"
+  ]
+  s.homepage = %q{http://ambethia.com/recaptcha}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Helpers for the reCAPTCHA API}
+  s.test_files = [
+    "test/recaptcha_test.rb",
+    "test/verify_recaptcha_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+    else
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+  end
+end
+
@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :recaptcha do
+#   # Task goes here
+# end
 \ No newline at end of file
@@ -0,0 +1,52 @@
+require 'test/unit'
+require 'cgi'
+require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
+
+class RecaptchaClientHelperTest < Test::Unit::TestCase
+  include Recaptcha
+  include Recaptcha::ClientHelper
+  include Recaptcha::Verify
+
+  attr_accessor :session
+
+  def setup
+    @session = {}
+    Recaptcha.configure do |config|
+      config.public_key = '0000000000000000000000000000000000000000'
+      config.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+    end
+  end
+
+  def test_recaptcha_tags
+    # Might as well match something...
+    assert_match /http:\/\/www.google.com\/recaptcha\/api\/challenge/, recaptcha_tags
+  end
+
+  def test_recaptcha_tags_with_ssl
+    assert_match /https:\/\/www.google.com\/recaptcha\/api\/challenge/, recaptcha_tags(:ssl => true)
+  end
+
+  def test_recaptcha_tags_without_noscript
+    assert_no_match /noscript/, recaptcha_tags(:noscript => false)
+  end
+
+  def test_should_raise_exception_without_public_key
+    assert_raise RecaptchaError do
+      Recaptcha.configuration.public_key = nil
+      recaptcha_tags
+    end
+  end
+
+  def test_different_configuration_within_with_configuration_block
+    key = Recaptcha.with_configuration(:public_key => '12345') do
+      Recaptcha.configuration.public_key
+    end
+
+    assert_equal('12345', key)
+  end
+
+  def test_reset_configuration_after_with_configuration_block
+    Recaptcha.with_configuration(:public_key => '12345')
+    assert_equal('0000000000000000000000000000000000000000', Recaptcha.configuration.public_key)
+  end
+end
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+require 'test/unit'
+require 'rubygems'
+require 'active_support/core_ext/string'
+require 'mocha'
+require 'i18n'
+require 'net/http'
+require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
+
+class RecaptchaVerifyTest < Test::Unit::TestCase
+  def setup
+    Recaptcha.configuration.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+    @controller = TestController.new
+    @controller.request = stub(:remote_ip => "1.1.1.1")
+    @controller.params = {:recaptcha_challenge_field => "challenge", :recaptcha_response_field => "response"}
+
+    @expected_post_data = {}
+    @expected_post_data["privatekey"] = Recaptcha.configuration.private_key
+    @expected_post_data["remoteip"]   = @controller.request.remote_ip
+    @expected_post_data["challenge"]  = "challenge"
+    @expected_post_data["response"]   = "response"
+
+    @expected_uri = URI.parse(Recaptcha.configuration.verify_url)
+  end
+
+  def test_should_raise_exception_without_private_key
+    assert_raise Recaptcha::RecaptchaError do
+      Recaptcha.configuration.private_key = nil
+      @controller.verify_recaptcha
+    end
+  end
+
+  def test_should_return_false_when_key_is_invalid
+    expect_http_post(response_with_body("false\ninvalid-site-private-key"))
+
+    assert !@controller.verify_recaptcha
+    assert_equal "invalid-site-private-key", @controller.flash[:recaptcha_error]
+  end
+
+  def test_returns_true_on_success
+    @controller.flash[:recaptcha_error] = "previous error that should be cleared"
+    expect_http_post(response_with_body("true\n"))
+
+    assert @controller.verify_recaptcha
+    assert_nil @controller.flash[:recaptcha_error]
+  end
+
+  def test_errors_should_be_added_to_model
+    expect_http_post(response_with_body("false\nbad-news"))
+
+    errors = mock
+    errors.expects(:add).with(:base, "Word verification response is incorrect, please try again.")
+    model = mock(:errors => errors)
+
+    assert !@controller.verify_recaptcha(:model => model)
+    assert_equal "bad-news", @controller.flash[:recaptcha_error]
+  end
+
+  def test_returns_true_on_success_with_optional_key
+    @controller.flash[: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.flash[:recaptcha_error]
+  end
+
+  def test_timeout
+    expect_http_post(Timeout::Error, :exception => true)
+    assert !@controller.verify_recaptcha()
+    assert_equal "recaptcha-not-reachable", @controller.flash[:recaptcha_error]
+  end
+
+  def test_message_should_use_i18n
+    I18n.locale = :de
+    verification_failed_translated   = "Sicherheitscode konnte nicht verifiziert werden."
+    verification_failed_default      = "Word verification response is incorrect, please try again."
+    recaptcha_unreachable_translated = "Netzwerkfehler, bitte versuchen Sie es später erneut."
+    recaptcha_unreachable_default    = "Oops, we failed to validate your word verification response. Please try again."
+    I18n.expects(:translate).with(:'recaptcha.errors.verification_failed', :default => verification_failed_default).returns(verification_failed_translated)
+    I18n.expects(:translate).with(:'recaptcha.errors.recaptcha_unreachable', :default => recaptcha_unreachable_default).returns(recaptcha_unreachable_translated)
+
+    errors = mock
+    errors.expects(:add).with(:base, verification_failed_translated)
+    errors.expects(:add).with(:base, recaptcha_unreachable_translated)
+    model  = mock; model.stubs(:errors => errors)
+
+    expect_http_post(response_with_body("false\nbad-news"))
+    @controller.verify_recaptcha(:model => model)
+
+    expect_http_post(Timeout::Error, :exception => true)
+    @controller.verify_recaptcha(:model => model)
+
+  end
+
+  private
+
+  class TestController
+    include Recaptcha::Verify
+    attr_accessor :request, :params, :flash
+
+    def initialize
+      @flash = {}
+    end
+  end
+
+  def expect_http_post(response, options = {})
+    unless options[:exception]
+      Net::HTTP.expects(:post_form).with(@expected_uri, @expected_post_data).returns(response)
+    else
+      Net::HTTP.expects(:post_form).raises response
+    end
+  end
+
+  def response_with_body(body)
+    stub(:body => body)
+  end
+end
...	...	@@ -285,7 +285,7 @@ class CmsController < MyProfileController
285	285	@task = SuggestArticle.new(params[:task])
286	286	if request.post?
287	287	@task.target = profile
288		- if @task.save
	288	+ if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
289	289	session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
290	290	redirect_to @back_to
291	291	end
...	...
...	...	@@ -2,8 +2,6 @@ class AccountController < ApplicationController
2	2
3	3	no_design_blocks
4	4
5		- inverse_captcha :field => 'e_mail'
6		-
7	5	require_ssl :except => [ :login_popup, :logout_popup, :profile_details ]
8	6
9	7	before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
...	...	@@ -69,7 +67,7 @@ class AccountController < ApplicationController
69	67	@user.person_data = params[:profile_data]
70	68	@person = Person.new(params[:profile_data])
71	69	@person.environment = @user.environment
72		- if request.post? && params[self.icaptcha_field].blank?
	70	+ if request.post?
73	71	@user.signup!
74	72	owner_role = Role.find_by_name('owner')
75	73	@user.person.affiliate(@user.person, [owner_role]) if owner_role
...	...
...	...	@@ -4,10 +4,9 @@ class ContactController < PublicController
4	4
5	5	needs_profile
6	6
7		- inverse_captcha :field => 'e_mail'
8	7	def new
9	8	@contact
10		- if request.post? && params[self.icaptcha_field].blank? && params[:confirm] == 'true'
	9	+ if request.post? && params[:confirm] == 'true'
11	10	@contact = user.build_contact(profile, params[:contact])
12	11	@contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : nil
13	12	@contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : nil
...	...
...	...	@@ -2,8 +2,6 @@ class ContentViewerController < ApplicationController
2	2
3	3	needs_profile
4	4
5		- inverse_captcha :field => 'e_mail'
6		-
7	5	helper ProfileHelper
8	6	helper TagsHelper
9	7
...	...	@@ -76,7 +74,7 @@ class ContentViewerController < ApplicationController
76	74
77	75	@form_div = params[:form]
78	76
79		- if params[:comment] && params[self.icaptcha_field].blank? && params[:confirm] == 'true'
	77	+ if params[:comment] && params[:confirm] == 'true'
80	78	@comment = Comment.new(params[:comment])
81	79	if request.post? && @page.accept_comments?
82	80	add_comment
...	...	@@ -121,7 +119,7 @@ class ContentViewerController < ApplicationController
121	119	def add_comment
122	120	@comment.author = user if logged_in?
123	121	@comment.article = @page
124		- if @comment.save
	122	+ if (@comment.reply_of_id \|\| verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
125	123	@page.touch
126	124	@comment = nil # clear the comment form
127	125	redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
...	...
1	1	class Comment < ActiveRecord::Base
2	2
3		- has_captcha
4		-
5	3	track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target
6	4
7	5	validates_presence_of :title, :body
...	...
1	1	class SuggestArticle < Task
2	2
3		- has_captcha
4		-
5	3	validates_presence_of :target_id, :article_name, :email, :name, :article_body
6	4
7	5	settings_items :email, :type => String
...	...
...	...	@@ -7,8 +7,7 @@
7	7	</div>
8	8	<% end %>
9	9
10		-<% labelled_form_for :user, @user do \|f\| %>
11		-<%= icaptcha_field() %>
	10	+<% labelled_form_for :user, @user, :html => { :multipart => true } do \|f\| %>
12	11
13	12	<%= hidden_field_tag :invitation_code, @invitation_code %>
14	13
...	...
...	...	@@ -18,13 +18,10 @@
18	18
19	19	<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
20	20
21		- <div id="captcha">
22		- <%= labelled_form_field(_("What is the result of '%s = ?'") % @task.captcha.task, text_field(:task, 'captcha_solution')) %>
23		- <%= hidden_field :task, :captcha_secret %>
24		- <br style="clear: both;">
25		- </div>
26		-
27	21	<%= hidden_field_tag('back_to', @back_to) %>
	22	+
	23	+ <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
	24	+
28	25	<% button_bar do %>
29	26	<%= submit_button :save, _('Save') %>
30	27	<%= button :cancel, _('Cancel'), @back_to %>
...	...
...	...	@@ -4,7 +4,6 @@
4	4
5	5
6	6	<% labelled_form_for :contact, @contact do \|f\| %>
7		- <%= icaptcha_field() %>
8	7	<%= hidden_field_tag(:confirm, 'false') %>
9	8
10	9	<%= required_fields_message %>
...	...
...	...	@@ -20,7 +20,6 @@
20	20	</h4>
21	21
22	22	<% form_tag( url_for(@page.view_url.merge({:only_path => true})), { :class => 'comment_form' } ) do %>
23		- <%= icaptcha_field() %>
24	23	<%= hidden_field_tag(:confirm, 'false') %>
25	24
26	25	<%= required_fields_message %>
...	...	@@ -29,7 +28,6 @@
29	28
30	29	<%= required labelled_form_field(_('Name'), text_field(:comment, :name)) %>
31	30	<%= required labelled_form_field(_('e-mail'), text_field(:comment, :email)) %>
32		-
33	31	<p>
34	32	<%= _('If you are a registered user, you can login and be automatically recognized.') %>
35	33	</p>
...	...	@@ -39,8 +37,7 @@
39	37	<%= required labelled_form_field(_('Title'), text_field(:comment, :title)) %>
40	38	<%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
41	39
42		- <%= required labelled_form_field(_("What is the result of '%s = ?'") % @comment.captcha.task, text_field(:comment, :captcha_solution)) %>
43		- <%= hidden_field(:comment, :captcha_secret) %>
	40	+ <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
44	41
45	42	<% button_bar do %>
46	43	<%= submit_button('add', _('Post comment'), :onclick => "this.form.confirm.value = 'true'; this.disabled = true; this.form.submit(); return true;") %>
...	...