diff -Nru ruby-recaptcha-0.4.0/CHANGELOG ruby-recaptcha-3.2.0/CHANGELOG
--- ruby-recaptcha-0.4.0/CHANGELOG	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/CHANGELOG	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-== 0.3.6 / 2012-01-07
-
-* Many documentation changes
-* Fixed deprecations in dependencies
-* Protocol relative JS includes
-* Fixes for options hash
-* Fixes for failing tests
-
-== 0.3.5 / 2012-05-02
-
-* I18n for error messages
-* Rails: delete flash keys if unused
-
-== 0.3.4 / 2011-12-13
-
-* Rails 3
-* Remove jeweler
-
-== 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
diff -Nru ruby-recaptcha-0.4.0/CHANGELOG.md ruby-recaptcha-3.2.0/CHANGELOG.md
--- ruby-recaptcha-0.4.0/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/CHANGELOG.md	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,91 @@
+## 3.1.0 - 2016-06-10
+* better error messages
+* frozen constants
+
+## 3.0.0 - 2016-05-27
+* remove all non-ssl options
+
+## 2.3.0 - 2016-05-25
+* enable ssl verification by default ... disable via `disable_ssl_verification = true`
+
+## 2.2.0 - 2016-05-23
+* Add global hostname validator config
+* Clean up after with_configuration exception
+
+## 2.1.0 - 2016-05-19
+* do not query google if repactcha was not submitted
+
+## 2.0.0 - 2016-05-17
+* remove stoken support, must use custom domain verification or domain whitelist
+
+## 1.3.0 - 2016-04-07
+* do not set model error and flash
+
+## 1.2.0 - 2016-04-01
+* custom domain validation
+
+## 1.1.0 - 2016-01-27
+* support RACK_ENV
+
+## 1.0.2 - 2015-11-30
+* nice deprecations for api_version
+
+## 1.0.1 - 2015-11-30
+* no longer defines `Rails` when `recaptcha/rails` is required
+
+## 1.0.0 - 2015-11-30
+* remove api v1 support
+* remove ssl_api_server_url, nonssl_api_server_url, change api_server_url to always need ssl option
+* removed activesupport dependency for .to_query
+* made flash and models both have descriptive errors
+
+## 0.6.0 - 2015-11-19
+* extract token module
+* need to use `gem "recaptcha", require: "recaptcha/rails"` to get rails helpers installed
+
+## 0.5.0 - 2015-11-18
+* size option
+* support disabling stoken
+* support Rails.env
+
+## 0.3.6 / 2012-01-07
+
+* Many documentation changes
+* Fixed deprecations in dependencies
+* Protocol relative JS includes
+* Fixes for options hash
+* Fixes for failing tests
+
+## 0.3.5 / 2012-05-02
+
+* I18n for error messages
+* Rails: delete flash keys if unused
+
+## 0.3.4 / 2011-12-13
+
+* Rails 3
+* Remove jeweler
+
+## 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
diff -Nru ruby-recaptcha-0.4.0/debian/changelog ruby-recaptcha-3.2.0/debian/changelog
--- ruby-recaptcha-0.4.0/debian/changelog	2015-07-28 18:00:55.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/changelog	2016-07-09 13:45:26.000000000 +0000
@@ -1,3 +1,19 @@
+ruby-recaptcha (3.2.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Reupload to unstable
+  * Check gemspec dependencies during build
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 09 Jul 2016 18:25:17 +0530
+
+ruby-recaptcha (3.2.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream major release
+  * Remove patch gemspec_without_git.patch (gem2deb can handle it now)
+
+ -- Pirate Praveen <praveen@debian.org>  Thu, 16 Jun 2016 16:04:41 +0530
+
 ruby-recaptcha (0.4.0-1) unstable; urgency=medium
 
   * New upstream release:
diff -Nru ruby-recaptcha-0.4.0/debian/control ruby-recaptcha-3.2.0/debian/control
--- ruby-recaptcha-0.4.0/debian/control	2015-07-28 07:51:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/control	2016-06-16 09:59:14.000000000 +0000
@@ -3,20 +3,20 @@
 Priority: optional
 Maintainer: David Martínez Moreno <ender@debian.org>
 Build-Depends: debhelper (>= 9),
-               gem2deb (>= 0.2.6~)
-Standards-Version: 3.9.6
+               gem2deb
+Standards-Version: 3.9.8
 Homepage: https://github.com/ambethia/recaptcha/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-recaptcha.git
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-recaptcha.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-recaptcha.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-recaptcha.git
 XS-Ruby-Versions: all
 
 Package: ruby-recaptcha
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: rails (>> 4.1),
          ruby | ruby-interpreter,
-         rails (>> 4.1)
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Ruby helpers for the reCAPTCHA API
  This plugin gives a high-level interface for using reCAPTCHA authentication
  methods in your ruby programs.
diff -Nru ruby-recaptcha-0.4.0/debian/patches/gemspec_without_git.patch ruby-recaptcha-3.2.0/debian/patches/gemspec_without_git.patch
--- ruby-recaptcha-0.4.0/debian/patches/gemspec_without_git.patch	2015-07-28 07:23:25.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/patches/gemspec_without_git.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Description: Use a gemspec that doesn't depend on git.
- The .tar.gz obviously doesn't have a .git and in the pdebuild chroots
- we also don't have the git binary.
-Author: David Martínez Moreno <ender@debian.org>
-Bug-Ubuntu: https://launchpad.net/bugs/1400564
-Forwarded: no
-Last-Update: 2015-07-28
-
---- ruby-recaptcha-0.4.0.orig/recaptcha.gemspec
-+++ ruby-recaptcha-0.4.0/recaptcha.gemspec
-@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
- 
-   s.rubyforge_project = "recaptcha"
- 
--  s.files         = `git ls-files`.split("\n")
--  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-+  s.files         = Dir.glob("lib/**/*")
-+  s.test_files    = Dir.glob("{test,spec,features}/**/*")
-   s.require_paths = ["lib"]
- 
-   s.add_development_dependency "mocha"
diff -Nru ruby-recaptcha-0.4.0/debian/patches/series ruby-recaptcha-3.2.0/debian/patches/series
--- ruby-recaptcha-0.4.0/debian/patches/series	2015-07-28 07:49:58.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-gemspec_without_git.patch
diff -Nru ruby-recaptcha-0.4.0/debian/ruby-recaptcha.docs ruby-recaptcha-3.2.0/debian/ruby-recaptcha.docs
--- ruby-recaptcha-0.4.0/debian/ruby-recaptcha.docs	2015-07-28 06:19:35.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/ruby-recaptcha.docs	2016-06-16 09:58:21.000000000 +0000
@@ -1 +1 @@
-README.rdoc
+README.md
diff -Nru ruby-recaptcha-0.4.0/debian/rules ruby-recaptcha-3.2.0/debian/rules
--- ruby-recaptcha-0.4.0/debian/rules	2015-07-28 06:19:35.000000000 +0000
+++ ruby-recaptcha-3.2.0/debian/rules	2016-07-09 13:45:09.000000000 +0000
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/assets/javascripts/application.js ruby-recaptcha-3.2.0/demo/rails/app/assets/javascripts/application.js
--- ruby-recaptcha-0.4.0/demo/rails/app/assets/javascripts/application.js	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/assets/javascripts/application.js	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/assets/stylesheets/application.css ruby-recaptcha-3.2.0/demo/rails/app/assets/stylesheets/application.css
--- ruby-recaptcha-0.4.0/demo/rails/app/assets/stylesheets/application.css	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/assets/stylesheets/application.css	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/controllers/application_controller.rb ruby-recaptcha-3.2.0/demo/rails/app/controllers/application_controller.rb
--- ruby-recaptcha-0.4.0/demo/rails/app/controllers/application_controller.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/controllers/application_controller.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/controllers/captcha_controller.rb ruby-recaptcha-3.2.0/demo/rails/app/controllers/captcha_controller.rb
--- ruby-recaptcha-0.4.0/demo/rails/app/controllers/captcha_controller.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/controllers/captcha_controller.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,12 @@
+class CaptchaController < ApplicationController
+  def index
+  end
+
+  def create
+    if verify_recaptcha
+      render text: 'YES'
+    else
+      render text: 'NO'
+    end
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/controllers/users_controller.rb ruby-recaptcha-3.2.0/demo/rails/app/controllers/users_controller.rb
--- ruby-recaptcha-0.4.0/demo/rails/app/controllers/users_controller.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/controllers/users_controller.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,18 @@
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+
+  def edit
+    @user = User.find(params[:id])
+  end
+
+  def update
+    @user = User.find(params[:id])
+    if verify_recaptcha(model: @user, message: 'Error in passing CAPTCHA.') && @user.save
+      redirect_to users_path, notice: "Saved"
+    else
+      render 'edit'
+    end
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/helpers/application_helper.rb ruby-recaptcha-3.2.0/demo/rails/app/helpers/application_helper.rb
--- ruby-recaptcha-0.4.0/demo/rails/app/helpers/application_helper.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/helpers/application_helper.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/models/user.rb ruby-recaptcha-3.2.0/demo/rails/app/models/user.rb
--- ruby-recaptcha-0.4.0/demo/rails/app/models/user.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/models/user.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/views/captcha/index.html.erb ruby-recaptcha-3.2.0/demo/rails/app/views/captcha/index.html.erb
--- ruby-recaptcha-0.4.0/demo/rails/app/views/captcha/index.html.erb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/views/captcha/index.html.erb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,46 @@
+<% if params[:multi] %>
+  <script type="text/javascript">
+    var verifyCallback = function(response) {
+      alert(response);
+    };
+    var widgetId1;
+    var widgetId2;
+    var onloadCallback = function() {
+      // Renders the HTML element with id 'example1' as a reCAPTCHA widget.
+      // The id of the reCAPTCHA widget is assigned to 'widgetId1'.
+      widgetId1 = grecaptcha.render('example1', {
+        'sitekey' : "<%= Recaptcha.configuration.public_key %>",
+        'theme' : 'light'
+      });
+      widgetId2 = grecaptcha.render(document.getElementById('example2'), {
+        'sitekey' : "<%= Recaptcha.configuration.public_key %>"
+      });
+      grecaptcha.render('example3', {
+        'sitekey' : "<%= Recaptcha.configuration.public_key %>",
+        'callback' : verifyCallback,
+        'theme' : 'dark'
+      });
+    };
+  </script>
+
+  <%= form_tag "/captchas" do |f| %>
+    <div id="example1"></div>
+    <%= submit_tag %>
+  <% end %>
+  <%= form_tag "/captchas" do %>
+    <div id="example2"></div>
+    <%= submit_tag %>
+  <% end %>
+  <%= form_tag "/captchas" do %>
+    <div id="example3"></div>
+    <%= submit_tag %>
+  <% end %>
+  <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
+  <%= link_to 'Single ?', '?' %>
+<% else %>
+  <%= form_tag "/captchas" do %>
+    <%= recaptcha_tags %>
+    <%= submit_tag %>
+  <% end %>
+  <%= link_to 'Multi ?', '?multi=1' %>
+<% end %>
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/views/layouts/application.html.erb ruby-recaptcha-3.2.0/demo/rails/app/views/layouts/application.html.erb
--- ruby-recaptcha-0.4.0/demo/rails/app/views/layouts/application.html.erb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/views/layouts/application.html.erb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Foo</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<% flash.each do |k,v| %>
+  <div><%= k %>: <%= v %></div>
+<% end %>
+
+<%= yield %>
+
+</body>
+</html>
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/views/users/edit.html.erb ruby-recaptcha-3.2.0/demo/rails/app/views/users/edit.html.erb
--- ruby-recaptcha-0.4.0/demo/rails/app/views/users/edit.html.erb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/views/users/edit.html.erb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,5 @@
+<%= form_for @user do |f| %>
+  <%= f.text_field :name %>
+  <%= recaptcha_tags %>
+  <%= f.submit %>
+<% end %>
diff -Nru ruby-recaptcha-0.4.0/demo/rails/app/views/users/index.html.erb ruby-recaptcha-3.2.0/demo/rails/app/views/users/index.html.erb
--- ruby-recaptcha-0.4.0/demo/rails/app/views/users/index.html.erb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/app/views/users/index.html.erb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,5 @@
+<table>
+  <% @users.each do |user| %>
+    <tr><td><%= link_to user.name, edit_user_path(user) %></td></tr>
+  <% end %>
+</table>
diff -Nru ruby-recaptcha-0.4.0/demo/rails/bin/bundle ruby-recaptcha-3.2.0/demo/rails/bin/bundle
--- ruby-recaptcha-0.4.0/demo/rails/bin/bundle	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/bin/bundle	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff -Nru ruby-recaptcha-0.4.0/demo/rails/bin/rails ruby-recaptcha-3.2.0/demo/rails/bin/rails
--- ruby-recaptcha-0.4.0/demo/rails/bin/rails	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/bin/rails	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff -Nru ruby-recaptcha-0.4.0/demo/rails/bin/rake ruby-recaptcha-3.2.0/demo/rails/bin/rake
--- ruby-recaptcha-0.4.0/demo/rails/bin/rake	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/bin/rake	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff -Nru ruby-recaptcha-0.4.0/demo/rails/bin/setup ruby-recaptcha-3.2.0/demo/rails/bin/setup
--- ruby-recaptcha-0.4.0/demo/rails/bin/setup	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/bin/setup	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/bin/spring ruby-recaptcha-3.2.0/demo/rails/bin/spring
--- ruby-recaptcha-0.4.0/demo/rails/bin/spring	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/bin/spring	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
+    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
+    gem 'spring', match[1]
+    require 'spring/binstub'
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/application.rb ruby-recaptcha-3.2.0/demo/rails/config/application.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/application.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/application.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,26 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Foo
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/boot.rb ruby-recaptcha-3.2.0/demo/rails/config/boot.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/boot.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/boot.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/database.yml ruby-recaptcha-3.2.0/demo/rails/config/database.yml
--- ruby-recaptcha-0.4.0/demo/rails/config/database.yml	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/database.yml	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/environment.rb ruby-recaptcha-3.2.0/demo/rails/config/environment.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/environment.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/environment.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/environments/development.rb ruby-recaptcha-3.2.0/demo/rails/config/environments/development.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/environments/development.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/environments/development.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,41 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/assets.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/assets.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/assets.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/assets.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/backtrace_silencers.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/backtrace_silencers.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/backtrace_silencers.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/backtrace_silencers.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/cookies_serializer.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/cookies_serializer.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/cookies_serializer.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/cookies_serializer.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/filter_parameter_logging.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/filter_parameter_logging.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/filter_parameter_logging.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/filter_parameter_logging.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/inflections.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/inflections.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/inflections.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/inflections.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/mime_types.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/mime_types.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/mime_types.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/mime_types.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/session_store.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/session_store.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/session_store.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/session_store.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, key: '_foo_session'
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/initializers/wrap_parameters.rb ruby-recaptcha-3.2.0/demo/rails/config/initializers/wrap_parameters.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/initializers/wrap_parameters.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/initializers/wrap_parameters.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/locales/en.yml ruby-recaptcha-3.2.0/demo/rails/config/locales/en.yml
--- ruby-recaptcha-0.4.0/demo/rails/config/locales/en.yml	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/locales/en.yml	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/routes.rb ruby-recaptcha-3.2.0/demo/rails/config/routes.rb
--- ruby-recaptcha-0.4.0/demo/rails/config/routes.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/routes.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,5 @@
+Rails.application.routes.draw do
+  root to: "captcha#index"
+  post "/captchas" => "captcha#create"
+  resources :users
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config/secrets.yml ruby-recaptcha-3.2.0/demo/rails/config/secrets.yml
--- ruby-recaptcha-0.4.0/demo/rails/config/secrets.yml	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config/secrets.yml	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: c9f78eaa370cf6e763541491003469a07754b0ed2d37638e13c892540ecae39311ed928af595b3b7603807950c46ca49249e5c8c9db7c1faccbe71a6bb76cee9
+
+test:
+  secret_key_base: a9bd3f4f67f18b8a9333886d8552528265d5962385de1b1f2b3883214c06d6a53dced9fc954b9649de9c8e4da0925d41427aad6d4aa76e5570eade23ab27c85c
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff -Nru ruby-recaptcha-0.4.0/demo/rails/config.ru ruby-recaptcha-3.2.0/demo/rails/config.ru
--- ruby-recaptcha-0.4.0/demo/rails/config.ru	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/config.ru	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application
diff -Nru ruby-recaptcha-0.4.0/demo/rails/db/migrate/20151226015155_add_user.rb ruby-recaptcha-3.2.0/demo/rails/db/migrate/20151226015155_add_user.rb
--- ruby-recaptcha-0.4.0/demo/rails/db/migrate/20151226015155_add_user.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/db/migrate/20151226015155_add_user.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,7 @@
+class AddUser < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :name
+    end
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/db/schema.rb ruby-recaptcha-3.2.0/demo/rails/db/schema.rb
--- ruby-recaptcha-0.4.0/demo/rails/db/schema.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/db/schema.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,20 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20151226015155) do
+
+  create_table "users", force: :cascade do |t|
+    t.string "name"
+  end
+
+end
diff -Nru ruby-recaptcha-0.4.0/demo/rails/db/seeds.rb ruby-recaptcha-3.2.0/demo/rails/db/seeds.rb
--- ruby-recaptcha-0.4.0/demo/rails/db/seeds.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/db/seeds.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1 @@
+User.create! name: "Tester"
diff -Nru ruby-recaptcha-0.4.0/demo/rails/.env ruby-recaptcha-3.2.0/demo/rails/.env
--- ruby-recaptcha-0.4.0/demo/rails/.env	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/.env	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,3 @@
+# these will only work on localhost ... make your own at https://www.google.com/recaptcha
+RECAPTCHA_PUBLIC_KEY=6Le7oRETAAAAAETt105rjswZ15EuVJiF7BxPROkY
+RECAPTCHA_PRIVATE_KEY=6Le7oRETAAAAAL5a8yOmEdmDi3b2pH7mq5iH1bYK
diff -Nru ruby-recaptcha-0.4.0/demo/rails/Gemfile ruby-recaptcha-3.2.0/demo/rails/Gemfile
--- ruby-recaptcha-0.4.0/demo/rails/Gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/Gemfile	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'dotenv-rails', groups: [:development, :test]
+gem 'rails', '4.2.5'
+gem 'sqlite3'
+gem 'recaptcha', require: 'recaptcha/rails', path: '../..'
diff -Nru ruby-recaptcha-0.4.0/demo/rails/Gemfile.lock ruby-recaptcha-3.2.0/demo/rails/Gemfile.lock
--- ruby-recaptcha-0.4.0/demo/rails/Gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/Gemfile.lock	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,115 @@
+PATH
+  remote: ../..
+  specs:
+    recaptcha (1.1.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    dotenv (2.0.2)
+    dotenv-rails (2.0.2)
+      dotenv (= 2.0.2)
+      railties (~> 4.0)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99)
+    mini_portile (0.6.2)
+    minitest (5.8.3)
+    nokogiri (1.6.6.4)
+      mini_portile (~> 0.6.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  dotenv-rails
+  rails (= 4.2.5)
+  recaptcha!
+  sqlite3
+
+BUNDLED WITH
+   1.11.2
diff -Nru ruby-recaptcha-0.4.0/demo/rails/.gitignore ruby-recaptcha-3.2.0/demo/rails/.gitignore
--- ruby-recaptcha-0.4.0/demo/rails/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/.gitignore	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,17 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp
Binary files /tmp/tmpHp5eIo/5_QUsaI_ZW/ruby-recaptcha-0.4.0/demo/rails/public/favicon.ico and /tmp/tmpHp5eIo/UmzJkKWiPQ/ruby-recaptcha-3.2.0/demo/rails/public/favicon.ico differ
diff -Nru ruby-recaptcha-0.4.0/demo/rails/Rakefile ruby-recaptcha-3.2.0/demo/rails/Rakefile
--- ruby-recaptcha-0.4.0/demo/rails/Rakefile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/rails/Rakefile	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks
diff -Nru ruby-recaptcha-0.4.0/demo/sinatra/Gemfile ruby-recaptcha-3.2.0/demo/sinatra/Gemfile
--- ruby-recaptcha-0.4.0/demo/sinatra/Gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/sinatra/Gemfile	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'
+gem 'recaptcha', require: 'recaptcha/rails', path: '../..'
diff -Nru ruby-recaptcha-0.4.0/demo/sinatra/Gemfile.lock ruby-recaptcha-3.2.0/demo/sinatra/Gemfile.lock
--- ruby-recaptcha-0.4.0/demo/sinatra/Gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/sinatra/Gemfile.lock	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,28 @@
+PATH
+  remote: ../..
+  specs:
+    recaptcha (0.6.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.1)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  recaptcha!
+  sinatra
+
+BUNDLED WITH
+   1.10.6
diff -Nru ruby-recaptcha-0.4.0/demo/sinatra/server.rb ruby-recaptcha-3.2.0/demo/sinatra/server.rb
--- ruby-recaptcha-0.4.0/demo/sinatra/server.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/demo/sinatra/server.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,29 @@
+require 'bundler/setup'
+require 'sinatra'
+require 'recaptcha'
+
+# these will only work on localhost ... make your own at https://www.google.com/recaptcha
+Recaptcha.configure do |config|
+  config.public_key  = '6Le7oRETAAAAAETt105rjswZ15EuVJiF7BxPROkY'
+  config.private_key = '6Le7oRETAAAAAL5a8yOmEdmDi3b2pH7mq5iH1bYK'
+end
+
+include Recaptcha::ClientHelper
+include Recaptcha::Verify
+
+get '/' do
+  <<-HTML
+    <form action="/verify">
+      #{recaptcha_tags}
+      <input type="submit"/>
+    </form>
+  HTML
+end
+
+get '/verify' do
+  if verify_recaptcha
+    'YES!'
+  else
+    'NO!'
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/Gemfile.lock ruby-recaptcha-3.2.0/Gemfile.lock
--- ruby-recaptcha-0.4.0/Gemfile.lock	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/Gemfile.lock	2016-06-13 17:14:08.000000000 +0000
@@ -1,52 +1,79 @@
 PATH
   remote: .
   specs:
-    recaptcha (0.4.0)
+    recaptcha (3.2.0)
+      json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    addressable (2.3.8)
+    ast (2.3.0)
+    bump (0.5.3)
+    byebug (8.2.0)
     coderay (1.1.0)
-    columnize (0.8.9)
-    debugger-linecache (1.2.0)
-    i18n (0.6.11)
-    json (1.8.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    hashdiff (0.2.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    maxitest (1.5.4)
+      minitest (>= 5.0.0, < 5.9.0)
     metaclass (0.0.4)
     method_source (0.8.2)
-    minitest (5.4.3)
+    minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    pry (0.10.1)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
-    rake (10.3.2)
+    rainbow (2.1.0)
+    rake (10.4.2)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    safe_yaml (1.0.4)
     slop (3.6.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.0.5)
+    webmock (1.22.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport
+  bump
   i18n
-  minitest (~> 5.0)
+  maxitest
   mocha
   pry-byebug
   rake
   recaptcha!
+  rubocop
+  webmock
+
+BUNDLED WITH
+   1.12.3
diff -Nru ruby-recaptcha-0.4.0/init.rb ruby-recaptcha-3.2.0/init.rb
--- ruby-recaptcha-0.4.0/init.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/init.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# 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
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/client_helper.rb ruby-recaptcha-3.2.0/lib/recaptcha/client_helper.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/client_helper.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/client_helper.rb	2016-06-13 17:14:08.000000000 +0000
@@ -3,119 +3,56 @@
     # Your public API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def recaptcha_tags(options = {})
-      return v1_tags(options) if Recaptcha.configuration.v1?
-      return v2_tags(options) if Recaptcha.configuration.v2?
-    end # recaptcha_tags
-
-    def v1_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])
-      lang  = options[:display] && options[:display][:lang] ? options[:display][:lang].to_sym : ""
-      html  = ""
-      if options[:display]
-        html << %{<script type="text/javascript">\n}
-        html << %{  var RecaptchaOptions = #{hash_to_json(options[:display])};\n}
-        html << %{</script>\n}
+      if options.key?(:stoken)
+        raise(RecaptchaError, "Secure Token is deprecated. Please remove 'stoken' from your calls to recaptcha_tags.")
       end
-      if options[:ajax]
-        if options[:display] && options[:display][:custom_theme_widget]
-          widget = options[:display][:custom_theme_widget]
-        else
-          widget = "dynamic_recaptcha"
-          html << <<-EOS
-           <div id="#{widget}"></div>
-          EOS
-        end
-        html << <<-EOS
-          <script type="text/javascript">
-            var rc_script_tag = document.createElement('script'),
-                rc_init_func = function(){Recaptcha.create("#{key}", document.getElementById("#{widget}")#{',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)}" : ""}}
-        html << %{#{lang ? "&amp;lang=#{lang}" : ""}"></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
+      if options.key?(:ssl)
+        raise(RecaptchaError, "SSL is now always true. Please remove 'ssl' from your calls to recaptcha_tags.")
       end
-      return (html.respond_to?(:html_safe) && html.html_safe) || html
-    end
 
-    def v2_tags(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])
-      uri += "?hl=#{options[:hl]}" unless options[:hl].blank?
-      
-      v2_options = options.slice(:theme, :type, :callback).map {|k,v| %{data-#{k}="#{v}"} }.join(" ")
-
-      html = ""
-      html << %{<script src="#{uri}" async defer></script>\n}
-      html << %{<div class="g-recaptcha" data-sitekey="#{key}" #{v2_options}></div>\n}
-    
-      unless options[:noscript] == false
-        fallback_uri = "#{uri.chomp('.js')}/fallback?k=#{key}"
-        html << %{<noscript>}
-        html << %{<div style="width: 302px; height: 352px;">}
-        html << %{  <div style="width: 302px; height: 352px; position: relative;">}
-        html << %{    <div style="width: 302px; height: 352px; position: absolute;">}
-        html << %{      <iframe src="#{fallback_uri}"}
-        html << %{                frameborder="0" scrolling="no"}
-        html << %{                style="width: 302px; height:352px; border-style: none;">}
-        html << %{        </iframe>}
-        html << %{      </div>}
-        html << %{      <div style="width: 250px; height: 80px; position: absolute; border-style: none; }
-        html << %{             bottom: 21px; left: 25px; margin: 0px; padding: 0px; right: 25px;">}
-        html << %{        <textarea id="g-recaptcha-response" name="g-recaptcha-response" }
-        html << %{                  class="g-recaptcha-response" }
-        html << %{                  style="width: 250px; height: 80px; border: 1px solid #c1c1c1; }
-        html << %{                  margin: 0px; padding: 0px; resize: none;" value=""> }
-        html << %{        </textarea>}
-        html << %{      </div>}
-        html << %{    </div>}
-        html << %{  </div>}
-        html << %{</noscript>}
+      public_key = options[:public_key] || Recaptcha.configuration.public_key!
+
+      script_url = Recaptcha.configuration.api_server_url
+      script_url += "?hl=#{options[:hl]}" unless options[:hl].to_s == ""
+      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{public_key}"
+
+      data_attributes = [:theme, :type, :callback, :expired_callback, :size]
+      data_attributes = options.each_with_object({}) do |(k, v), a|
+        a[k] = v if data_attributes.include?(k)
       end
+      data_attributes[:sitekey] = public_key
+      data_attributes = data_attributes.map { |k, v| %(data-#{k.to_s.tr('_', '-')}="#{v}") }.join(" ")
 
-      return (html.respond_to?(:html_safe) && html.html_safe) || html
-    end
+      html = %(<script src="#{script_url}" async defer></script>\n)
+      html << %(<div class="g-recaptcha" #{data_attributes}></div>\n)
 
-    private
+      if options[:noscript] != false
+        html << <<-HTML
+          <noscript>
+            <div style="width: 302px; height: 352px;">
+              <div style="width: 302px; height: 352px; position: relative;">
+                <div style="width: 302px; height: 352px; position: absolute;">
+                  <iframe
+                    src="#{fallback_uri}"
+                    frameborder="0" scrolling="no"
+                    style="width: 302px; height:352px; border-style: none;">
+                  </iframe>
+                </div>
+                <div style="width: 250px; height: 80px; position: absolute; border-style: none;
+                  bottom: 21px; left: 25px; margin: 0px; padding: 0px; right: 25px;">
+                  <textarea id="g-recaptcha-response" name="g-recaptcha-response"
+                    class="g-recaptcha-response"
+                    style="width: 250px; height: 80px; border: 1px solid #c1c1c1;
+                    margin: 0px; padding: 0px; resize: none;" value="">
+                  </textarea>
+                </div>
+              </div>
+            </div>
+          </noscript>
+        HTML
+      end
 
-    def hash_to_json(hash)
-      result = "{"
-      result << hash.map do |k, v|
-        if v.is_a?(Hash)
-          "\"#{k}\": #{hash_to_json(v)}"
-        elsif ! v.is_a?(String) || k.to_s == "callback"
-          "\"#{k}\": #{v}"
-        else
-          "\"#{k}\": \"#{v}\""
-        end
-      end.join(", ")
-      result << "}"
+      html.respond_to?(:html_safe) ? html.html_safe : html
     end
-  end # ClientHelper
-end # Recaptcha
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/configuration.rb ruby-recaptcha-3.2.0/lib/recaptcha/configuration.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/configuration.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/configuration.rb	2016-06-13 17:14:08.000000000 +0000
@@ -28,47 +28,30 @@
   #   end
   #
   class Configuration
-    attr_accessor :api_version, 
-                  :skip_verify_env,
-                  :private_key,
-                  :public_key,
-                  :proxy,
-                  :handle_timeouts_gracefully,
-                  :use_ssl_by_default
+    attr_accessor :skip_verify_env, :private_key, :public_key, :proxy, :handle_timeouts_gracefully, :hostname
 
     def initialize #:nodoc:
-      @api_version                = RECAPTCHA_API_VERSION
-      @skip_verify_env            = SKIP_VERIFY_ENV
+      @skip_verify_env            = %w[test cucumber]
       @handle_timeouts_gracefully = HANDLE_TIMEOUTS_GRACEFULLY
-      @use_ssl_by_default         = USE_SSL_BY_DEFAULT
 
       @private_key           = ENV['RECAPTCHA_PRIVATE_KEY']
-      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']      
+      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']
     end
 
-    def api_server_url(ssl = nil) #:nodoc:
-      ssl = use_ssl_by_default if ssl.nil?
-      ssl ? ssl_api_server_url : nonssl_api_server_url
+    def private_key!
+      private_key || raise(RecaptchaError, "No private key specified.")
     end
 
-    def nonssl_api_server_url
-      CONFIG[@api_version]['server_url']
+    def public_key!
+      public_key || raise(RecaptchaError, "No public key specified.")
     end
 
-    def ssl_api_server_url
-      CONFIG[@api_version]['secure_server_url']
+    def api_server_url
+      CONFIG.fetch('server_url')
     end
 
     def verify_url
-      CONFIG[@api_version]['verify_url']
-    end
-
-    def v1?
-      @api_version == 'v1'
-    end
-
-    def v2?
-      @api_version == 'v2'
+      CONFIG.fetch('verify_url')
     end
   end
 end
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/merb.rb ruby-recaptcha-3.2.0/lib/recaptcha/merb.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/merb.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/merb.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-require 'recaptcha'
-
-Merb::GlobalHelpers.send(:include, Recaptcha::ClientHelper)
-Merb::Controller.send(:include, Recaptcha::Verify)
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/rails.rb ruby-recaptcha-3.2.0/lib/recaptcha/rails.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/rails.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/rails.rb	2016-06-13 17:14:08.000000000 +0000
@@ -1,5 +1,10 @@
-require 'net/http'
 require 'recaptcha'
 
-ActionView::Base.send(:include, Recaptcha::ClientHelper)
-ActionController::Base.send(:include, Recaptcha::Verify)
\ No newline at end of file
+module Recaptcha
+  class Railtie < Rails::Railtie
+    initializer :recaptcha do
+      ActionView::Base.send(:include, ::Recaptcha::ClientHelper)
+      ActionController::Base.send(:include, ::Recaptcha::Verify)
+    end
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/railtie.rb ruby-recaptcha-3.2.0/lib/recaptcha/railtie.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/railtie.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/railtie.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-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
-
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/verify.rb ruby-recaptcha-3.2.0/lib/recaptcha/verify.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/verify.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/verify.rb	2016-06-13 17:14:08.000000000 +0000
@@ -1,111 +1,102 @@
-require "uri"
+require 'json'
+
 module Recaptcha
   module Verify
     # Your private API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def verify_recaptcha(options = {})
-      options = {:model => options} unless options.is_a? Hash
+      options = {model: options} unless options.is_a? Hash
+      return true if Recaptcha::Verify.skip?(options[:env])
 
-      env_options = options[:env] || ENV['RAILS_ENV']
-      return true if Recaptcha.configuration.skip_verify_env.include? env_options
       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
+      recaptcha_response = options[:response] || params['g-recaptcha-response'].to_s
 
       begin
-        recaptcha = nil
-        if(Recaptcha.configuration.proxy)
-          proxy_server = URI.parse(Recaptcha.configuration.proxy)
-          http = Net::HTTP::Proxy(proxy_server.host, proxy_server.port, proxy_server.user, proxy_server.password)
+        verified = if recaptcha_response.empty?
+          false
         else
-          http = Net::HTTP
-        end
-
-        # env['REMOTE_ADDR'] to retrieve IP for Grape API
-        remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
-        if Recaptcha.configuration.v1?
-          verify_hash = {
-            "privatekey" => private_key,
-            "remoteip"   => remote_ip,
-            "challenge"  => params[:recaptcha_challenge_field],
-            "response"   => params[:recaptcha_response_field]
-          }
-          Timeout::timeout(options[:timeout] || 3) do
-            recaptcha = http.post_form(URI.parse(Recaptcha.configuration.verify_url), verify_hash)
-          end
-          answer, error = recaptcha.body.split.map { |s| s.chomp }
+          recaptcha_verify_via_api_call(request, recaptcha_response, options)
         end
 
-        if Recaptcha.configuration.v2?
-          verify_hash = {
-            "secret"    => private_key,
-            "remoteip"  => remote_ip,
-            "response"  => params['g-recaptcha-response']
-          }
-
-          Timeout::timeout(options[:timeout] || 3) do
-            uri = URI.parse(Recaptcha.configuration.verify_url + '?' + verify_hash.to_query)
-            http_instance = http.new(uri.host, uri.port)
-            if uri.port==443
-              http_instance.use_ssl =
-              http_instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
-            request = Net::HTTP::Get.new(uri.request_uri)
-            recaptcha = http_instance.request(request)
-          end
-          answer, error = JSON.parse(recaptcha.body).values
-        end
-
-        unless answer.to_s == 'true'
-          error = 'verification_failed' if error && Recaptcha.configuration.v2?
-          if request_in_html_format?
-            flash[:recaptcha_error] = if defined?(I18n)
-                                        I18n.translate("recaptcha.errors.#{error}", {:default => error})
-                                      else
-                                        error
-                                      end
-          end
-
-          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
+        if verified
+          flash.delete(:recaptcha_error) if recaptcha_flash_supported? && !model
+          true
         else
-          flash.delete(:recaptcha_error) if request_in_html_format?
-          return true
+          recaptcha_error(
+            model,
+            attribute,
+            options[:message],
+            "recaptcha.errors.verification_failed",
+            "reCAPTCHA verification failed, please try again."
+          )
+          false
         end
       rescue Timeout::Error
         if Recaptcha.configuration.handle_timeouts_gracefully
-          if request_in_html_format?
-            flash[:recaptcha_error] = if defined?(I18n)
-                                        I18n.translate('recaptcha.errors.recaptcha_unreachable', {:default => 'Recaptcha unreachable.'})
-                                      else
-                                        'Recaptcha unreachable.'
-                                      end
-          end
-
-          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
+          recaptcha_error(
+            model,
+            attribute,
+            options[:message],
+            "recaptcha.errors.recaptcha_unreachable",
+            "Oops, we failed to validate your reCAPTCHA response. Please try again."
+          )
+          false
         else
           raise RecaptchaError, "Recaptcha unreachable."
         end
-      rescue Exception => e
+      rescue StandardError => e
         raise RecaptchaError, e.message, e.backtrace
       end
-    end # verify_recaptcha
+    end
+
+    def verify_recaptcha!(options = {})
+      verify_recaptcha(options) || raise(VerifyError)
+    end
+
+    def self.skip?(env)
+      env ||= ENV['RACK_ENV'] || ENV['RAILS_ENV'] || (Rails.env if defined? Rails.env)
+      Recaptcha.configuration.skip_verify_env.include? env
+    end
+
+    private
+
+    def recaptcha_verify_via_api_call(request, recaptcha_response, options)
+      private_key = options[:private_key] || Recaptcha.configuration.private_key!
+      remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
+
+      verify_hash = {
+        "secret"    => private_key,
+        "remoteip"  => remote_ip.to_s,
+        "response"  => recaptcha_response
+      }
+
+      reply = JSON.parse(Recaptcha.get(verify_hash, options))
+      reply['success'].to_s == "true" &&
+        recaptcha_hostname_valid?(reply['hostname'], options[:hostname])
+    end
+
+    def recaptcha_hostname_valid?(hostname, validation)
+      validation ||= Recaptcha.configuration.hostname
+
+      case validation
+      when nil, FalseClass then true
+      when String then validation == hostname
+      else validation.call(hostname)
+      end
+    end
 
-    def request_in_html_format?
+    def recaptcha_error(model, attribute, message, key, default)
+      message ||= Recaptcha.i18n(key, default)
+      if model
+        model.errors.add attribute, message
+      else
+        flash[:recaptcha_error] = message if recaptcha_flash_supported?
+      end
+    end
+
+    def recaptcha_flash_supported?
       request.respond_to?(:format) && request.format == :html && respond_to?(:flash)
     end
-    def verify_recaptcha!(options = {})
-      verify_recaptcha(options) or raise VerifyError
-    end #verify_recaptcha!
-  end # Verify
-end # Recaptcha
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha/version.rb ruby-recaptcha-3.2.0/lib/recaptcha/version.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha/version.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha/version.rb	2016-06-13 17:14:08.000000000 +0000
@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "0.4.0"
+  VERSION = "3.2.0".freeze
 end
diff -Nru ruby-recaptcha-0.4.0/lib/recaptcha.rb ruby-recaptcha-3.2.0/lib/recaptcha.rb
--- ruby-recaptcha-0.4.0/lib/recaptcha.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/lib/recaptcha.rb	2016-06-13 17:14:08.000000000 +0000
@@ -1,27 +1,18 @@
 require 'recaptcha/configuration'
 require 'recaptcha/client_helper'
 require 'recaptcha/verify'
+require 'uri'
+require 'net/http'
 
 module Recaptcha
-  CONFIG =
-    {
-      'v1' => {
-        'server_url' => '//www.google.com/recaptcha/api',
-        'secure_server_url' => 'https://www.google.com/recaptcha/api',
-        'verify_url' => 'http://www.google.com/recaptcha/api/verify'
-      },
-
-      'v2' => {
-        'server_url' => '//www.google.com/recaptcha/api.js',
-        'secure_server_url' => 'https://www.google.com/recaptcha/api.js',
-        'verify_url' => 'https://www.google.com/recaptcha/api/siteverify'
-      }
-    }
+  CONFIG = {
+    'server_url' => 'https://www.google.com/recaptcha/api.js',
+    'verify_url' => 'https://www.google.com/recaptcha/api/siteverify'
+  }.freeze
 
-  RECAPTCHA_API_VERSION           = 'v2' 
   USE_SSL_BY_DEFAULT              = false
   HANDLE_TIMEOUTS_GRACEFULLY      = true
-  SKIP_VERIFY_ENV = ['test', 'cucumber']
+  DEFAULT_TIMEOUT = 3
 
   # Gives access to the current Configuration.
   def self.configuration
@@ -47,20 +38,38 @@
       configuration.send("#{key}=", value)
     end
 
-    result = yield if block_given?
-
+    yield if block_given?
+  ensure
     original_config.each { |key, value| configuration.send("#{key}=", value) }
-    result
   end
 
-  class RecaptchaError < StandardError
+  def self.get(verify_hash, options)
+    http = if Recaptcha.configuration.proxy
+      proxy_server = URI.parse(Recaptcha.configuration.proxy)
+      Net::HTTP::Proxy(proxy_server.host, proxy_server.port, proxy_server.user, proxy_server.password)
+    else
+      Net::HTTP
+    end
+    query = URI.encode_www_form(verify_hash)
+    uri = URI.parse(Recaptcha.configuration.verify_url + '?' + query)
+    http_instance = http.new(uri.host, uri.port)
+    http_instance.read_timeout = http_instance.open_timeout = options[:timeout] || DEFAULT_TIMEOUT
+    http_instance.use_ssl = true if uri.port == 443
+    request = Net::HTTP::Get.new(uri.request_uri)
+    http_instance.request(request).body
   end
 
-  class VerifyError < RecaptchaError
+  def self.i18n(key, default)
+    if defined?(I18n)
+      I18n.translate(key, default: default)
+    else
+      default
+    end
   end
 
-end
+  class RecaptchaError < StandardError
+  end
 
-if defined?(Rails)
-  require 'recaptcha/rails'
+  class VerifyError < RecaptchaError
+  end
 end
diff -Nru ruby-recaptcha-0.4.0/Rakefile ruby-recaptcha-3.2.0/Rakefile
--- ruby-recaptcha-0.4.0/Rakefile	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/Rakefile	2016-06-13 17:14:08.000000000 +0000
@@ -1,8 +1,15 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "bump/tasks"
 
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb']
 end
 
-task :default => :test
+desc "rubocop"
+task :rubocop do
+  sh "rubocop --display-cop-names"
+end
+
+task default: [:test, :rubocop]
diff -Nru ruby-recaptcha-0.4.0/README.md ruby-recaptcha-3.2.0/README.md
--- ruby-recaptcha-0.4.0/README.md	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/README.md	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,163 @@
+# reCAPTCHA
+
+Author:    Jason L Perry (http://ambethia.com)<br/>
+Copyright: Copyright (c) 2007-2013 Jason L Perry<br/>
+License:   [MIT](http://creativecommons.org/licenses/MIT/)<br/>
+Info:      https://github.com/ambethia/recaptcha<br/>
+Bugs:      https://github.com/ambethia/recaptcha/issues<br/>
+
+This plugin adds helpers for the [reCAPTCHA API](https://www.google.com/recaptcha). 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` or `verify_recaptcha!`,
+which throws an error on failiure.
+
+## Rails Installation
+
+[obtain a reCAPTCHA API key](https://www.google.com/recaptcha/admin).
+
+```Ruby
+gem "recaptcha", require: "recaptcha/rails"
+```
+
+Keep keys out of the code base with environment variables.<br/>
+Set in production and locally use [dotenv](https://github.com/bkeepers/dotenv), make sure to add it above recaptcha.
+
+Otherwise see [Alternative API key setup](#alternative-api-key-setup).
+
+```
+export RECAPTCHA_PUBLIC_KEY  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+export RECAPTCHA_PRIVATE_KEY = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+```
+
+Add `recaptcha_tags` to the forms you want to protect.
+
+```Erb
+<%= form_for @foo do |f| %>
+  # ... other tags
+  <%= recaptcha_tags %>
+  # ... other tags
+<% end %>
+```
+
+And, add `verify_recaptcha` logic to each form action that you've protected.
+
+```Ruby
+# app/controllers/users_controller.rb
+@user = User.new(params[:user].permit(:name))
+if verify_recaptcha(model: @user) && @user.save
+  redirect_to @user
+else
+  render 'new'
+end
+```
+
+## Sinatra / Rack / Ruby installation
+
+See [sinatra demo](/demo/sinatra) for details.
+
+ - add `gem 'recaptcha'` to `Gemfile`
+ - set env variables
+ - `include Recaptcha::ClientHelper` where you need `recaptcha_tags`
+ - `include Recaptcha::Verify` where you need `verify_recaptcha`
+
+## recaptcha_tags
+
+Some of the options available:
+
+| Option      | Description |
+|-------------|-------------|
+| :noscript   | Include <noscript> content (default `true`)|
+| :display    | Takes a hash containing the `theme` and `tabindex` options per the API. (default `nil`), options: 'red', 'white', 'blackglass', 'clean', 'custom'|
+| :ajax       | Render the dynamic AJAX captcha per the API. (default `false`)|
+| :public_key | Override public API key |
+| :error      | Override the error code returned from the reCAPTCHA API (default `nil`)|
+| :size       | Specify a size (default `nil`)|
+| :hl         | Optional. Forces the widget to render in a specific language. Auto-detects the user's language if unspecified. (See [language codes](https://developers.google.com/recaptcha/docs/language)) |
+
+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:
+
+| Option       | Description |
+|--------------|-------------|
+| :model       | Model to set errors.
+| :attribute   | Model attribute to receive errors. (default :base)
+| :message     | Custom error message.
+| :private_key | Override private API key.
+| :timeout     | The number of seconds to wait for reCAPTCHA servers before give up. (default `3`)
+| :response    | Custom response parameter. (default: params['g-recaptcha-response'])
+| :hostname    | Expected hostname or a callable that validates the hostname, see [domain validation](https://developers.google.com/recaptcha/docs/domain_validation) and [hostname](https://developers.google.com/recaptcha/docs/verify#api-response) docs. (default: `nil`, but can be changed by setting `config.hostname`)
+
+## 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:
+
+`recaptcha.errors.verification_failed` error message displayed if the captcha words didn't match
+`recaptcha.errors.recaptcha_unreachable` displayed if a timeout error occured while attempting to verify the captcha
+
+Also you can translate API response errors to human friendly by adding translations to the locale (`config/locales/en.yml`):
+
+```Yaml
+en:
+  recaptcha:
+    errors:
+      incorrect-captcha-sol: 'Fail'
+```
+
+## Testing
+
+By default, reCAPTCHA is skipped in "test" and "cucumber" env. To enable it during test:
+
+```Ruby
+Recaptcha.configuration.skip_verify_env.delete("test")
+```
+
+## Alternative API key setup
+
+### Recaptcha.configure
+
+```Ruby
+# config/initializers/recaptcha.rb
+Recaptcha.configure do |config|
+  config.public_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+  config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+  # Uncomment the following line if you are using a proxy server:
+  # config.proxy = 'http://myproxy.com.au:8080'
+end
+```
+
+### Recaptcha.with_configuration
+
+For temporary overwrites (not thread safe).
+
+```Ruby
+Recaptcha.with_configuration(public_key: '12345') do
+  # Do stuff with the overwritten public_key.
+end
+```
+
+### Per call
+
+Pass in keys as options at runtime, for code base with multiple reCAPTCHA setups:
+
+```Ruby
+recaptcha_tags public_key: '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+
+and
+
+verify_recaptcha private_key: '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+```
+
+## Misc
+ - Check out the [wiki](https://github.com/ambethia/recaptcha/wiki) and leave whatever you found valuable there.
+ - [Add multiple widgets to the same page](https://github.com/ambethia/recaptcha/wiki/Add-multiple-widgets-to-the-same-page)
+ - [Use Recaptcha with Devise](https://github.com/plataformatec/devise/wiki/How-To:-Use-Recaptcha-with-Devise)
diff -Nru ruby-recaptcha-0.4.0/README.rdoc ruby-recaptcha-3.2.0/README.rdoc
--- ruby-recaptcha-0.4.0/README.rdoc	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/README.rdoc	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-= reCAPTCHA
-
-Author::    Jason L Perry (http://ambethia.com)
-Copyright:: Copyright (c) 2007-2013 Jason L Perry
-License::   {MIT}[http://creativecommons.org/licenses/MIT/]
-Info::      http://github.com/ambethia/recaptcha
-Bugs::      http://github.com/ambethia/recaptcha/issues
-
-This plugin adds helpers for the {reCAPTCHA API}[https://www.google.com/recaptcha]. 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+ or +verify_recaptcha!+,
-which throws an error on failiure.
-
-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.
-
-== Rails Installation
-
-reCAPTCHA for Rails > 3.0, add this to your Gemfile:
-
-  gem "recaptcha", :require => "recaptcha/rails"
-
-Rails apps below 3.0 are no longer supported, but you can install an older
-release and view it's README.
-
-== Setting up your API Keys
-
-There are multiple ways to setup your reCAPTCHA API key once you
-{obtain}[https://www.google.com/recaptcha/admin] 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'
-    # Uncomment the following line if you are using a proxy server:
-    # config.proxy = 'http://myproxy.com.au:8080'
-    # Uncomment if you want to use the newer version of the API,
-    # only works for versions >= 0.3.7:
-    # config.api_version = 'v2'
-  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.with_configuration(:public_key => '12345') do
-    # Do stuff with the overwritten public_key.
-  end
-
-=== Heroku & 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. This would also be the preffered method
-in an Heroku deployment.
-
-  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. Place it where you want the recaptcha widget to appear.
-
-Example:
-
-  <%= form_for @foo do |f| %>
-    # ... additional lines truncated for brevity ...
-    <%= recaptcha_tags %>
-    # ... additional lines truncated for brevity ...
-  <% end %>
-
-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+, but can be changed by setting +config.use_ssl_by_default+)
-<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+), options: 'red', 'white', 'blackglass', 'clean', 'custom'
-<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_unreachable</tt>:: displayed if a timeout error occured while attempting to verify the captcha
-
-Also you can translate API response errors to human friendly by adding translations to the locale (+config/locales/en.yml+):
-
-  en:
-    recaptcha:
-      errors:
-        incorrect-captcha-sol: 'Fail'
-
-== TODO
-* Remove Rails/ActionController dependencies
-* Framework agnostic
-* Add some helpers to use in before_filter and what not
-* Better documentation
diff -Nru ruby-recaptcha-0.4.0/recaptcha.gemspec ruby-recaptcha-3.2.0/recaptcha.gemspec
--- ruby-recaptcha-0.4.0/recaptcha.gemspec	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/recaptcha.gemspec	2016-06-13 17:14:08.000000000 +0000
@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "recaptcha/version"
+require "./lib/recaptcha/version"
 
 Gem::Specification.new do |s|
   s.name        = "recaptcha"
@@ -8,19 +6,20 @@
   s.authors     = ["Jason L Perry"]
   s.email       = ["jasper@ambethia.com"]
   s.homepage    = "http://github.com/ambethia/recaptcha"
-  s.summary     = %q{Helpers for the reCAPTCHA API}
-  s.description = %q{This plugin adds helpers for the reCAPTCHA API}
+  s.summary     = s.description = "Helpers for the reCAPTCHA API"
+  s.license     = "MIT"
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.rubyforge_project = "recaptcha"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.files       = `git ls-files lib README.md CHANGELOG.md LICENSE`.split("\n")
 
+  s.add_runtime_dependency "json"
   s.add_development_dependency "mocha"
   s.add_development_dependency "rake"
   s.add_development_dependency "activesupport"
   s.add_development_dependency "i18n"
-  s.add_development_dependency "minitest", "~> 5.0"
+  s.add_development_dependency "maxitest"
   s.add_development_dependency "pry-byebug"
+  s.add_development_dependency "bump"
+  s.add_development_dependency "webmock"
+  s.add_development_dependency "rubocop"
 end
diff -Nru ruby-recaptcha-0.4.0/.rubocop.yml ruby-recaptcha-3.2.0/.rubocop.yml
--- ruby-recaptcha-0.4.0/.rubocop.yml	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/.rubocop.yml	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,154 @@
+# If you own a namespace and would like to enforce a different set of
+# rules, add a `.rubocop.yml` file to that directory. That configuration
+# can inherit from this file or override these rules entirely.
+
+LineLength:
+  Max: 120
+
+ClassLength:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+HashSyntax:
+   EnforcedStyle: ruby19
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Lint/AmbiguousOperator:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false
+
+Lint/EndAlignment:
+  AlignWith: variable
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/FirstParameterIndentation:
+  Enabled: false
+
+Style/IndentHash:
+  Enabled: false
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/ExtraSpacing:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+# alias / alias_method are both fine
+Style/Alias:
+  Enabled: false
+
+# for simple cases more readable
+Style/GuardClause:
+  Enabled: false
+
+# for single `/` more readable
+Style/RegexpLiteral:
+  Enabled: false
+
+# %w[] shows that it will return an array
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '[]'
+    '%w': '[]'
+    '%W': '[]'
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+# looks correct / intuitive
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Style/IndentationWidth:
+  Width: 2
+
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+
+# often makes logical sense to not combine if with elsif
+Style/IfInsideElse:
+  Enabled: false
+
+AllCops:
+  TargetRubyVersion: 2.1
+  Include:
+    - 'Rakefile'
+    - 'Gemfile'
+    - 'Rakefile'
+  Exclude:
+    - 'vendor/**/*'
+    - 'demo/**/*'
diff -Nru ruby-recaptcha-0.4.0/test/client_helper_test.rb ruby-recaptcha-3.2.0/test/client_helper_test.rb
--- ruby-recaptcha-0.4.0/test/client_helper_test.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/client_helper_test.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,35 @@
+require_relative 'helper'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash'
+
+describe Recaptcha::ClientHelper do
+  include Recaptcha::ClientHelper
+
+  it "uses ssl" do
+    recaptcha_tags.must_include "\"#{Recaptcha.configuration.api_server_url}\""
+  end
+
+  describe "noscript" do
+    it "does not adds noscript tags when noscript is given" do
+      recaptcha_tags(noscript: false).wont_include "noscript"
+    end
+
+    it "does not add noscript tags" do
+      recaptcha_tags.must_include "noscript"
+    end
+  end
+
+  it "can include size" do
+    html = recaptcha_tags(size: 10)
+    html.must_include(
+      "<div class=\"g-recaptcha\" data-size=\"10\" data-sitekey=\"0000000000000000000000000000000000000000\""
+    )
+  end
+
+  it "raises withut public key" do
+    Recaptcha.configuration.public_key = nil
+    assert_raises Recaptcha::RecaptchaError do
+      recaptcha_tags
+    end
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/test/configuration_test.rb ruby-recaptcha-3.2.0/test/configuration_test.rb
--- ruby-recaptcha-0.4.0/test/configuration_test.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/configuration_test.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,33 @@
+require_relative 'helper'
+
+describe Recaptcha::Configuration do
+  describe "#api_server_url" do
+    it "serves the default" do
+      Recaptcha.configuration.api_server_url.must_equal "https://www.google.com/recaptcha/api.js"
+    end
+  end
+
+  it "can overwrite configuration in a block" do
+    outside = '0000000000000000000000000000000000000000'
+    Recaptcha.configuration.public_key.must_equal outside
+
+    Recaptcha.with_configuration(public_key: '12345') do
+      Recaptcha.configuration.public_key.must_equal '12345'
+    end
+
+    Recaptcha.configuration.public_key.must_equal outside
+  end
+
+  it "cleans up block configuration after block raises an exception" do
+    before = Recaptcha.configuration.public_key.dup
+
+    assert_raises NoMemoryError do
+      Recaptcha.with_configuration(public_key: '12345') do
+        Recaptcha.configuration.public_key.must_equal '12345'
+        raise NoMemoryError, "an exception"
+      end
+    end
+
+    Recaptcha.configuration.public_key.must_equal before
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/test/helper.rb ruby-recaptcha-3.2.0/test/helper.rb
--- ruby-recaptcha-0.4.0/test/helper.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/helper.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,22 @@
+require 'bundler/setup'
+require 'maxitest/autorun'
+require 'mocha/setup'
+require 'webmock/minitest'
+require 'cgi'
+require 'recaptcha'
+require 'i18n'
+
+ENV.delete('RAILS_ENV')
+ENV.delete('RACK_ENV')
+
+I18n.enforce_available_locales = false
+
+Minitest::Test.send(:prepend, Module.new do
+  def setup
+    super
+    Recaptcha.configure do |config|
+      config.public_key = '0000000000000000000000000000000000000000'
+      config.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+    end
+  end
+end)
diff -Nru ruby-recaptcha-0.4.0/test/recaptcha_configuration_test.rb ruby-recaptcha-3.2.0/test/recaptcha_configuration_test.rb
--- ruby-recaptcha-0.4.0/test/recaptcha_configuration_test.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/recaptcha_configuration_test.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-require 'minitest/autorun'
-require 'cgi'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
-
-class RecaptchaConfigurationTest < Minitest::Test
-  include Recaptcha
-  include Recaptcha::ClientHelper
-  include Recaptcha::Verify
-
-  attr_accessor :session
-
-  def setup
-    @session = {}
-    @nonssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.nonssl_api_server_url) + '(.*)')
-    @ssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.ssl_api_server_url) + '(.*)')
-    Recaptcha.configure do |config|
-      config.public_key = '0000000000000000000000000000000000000000'
-      config.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-      config.api_version = 'v2'
-    end
-  end
-
-  def test_recaptcha_api_version_default
-    assert_equal(Recaptcha.configuration.api_version, Recaptcha::RECAPTCHA_API_VERSION)
-  end
-
-  def test_v2_with_v2_api?
-    assert Recaptcha.configuration.v2?
-    refute Recaptcha.configuration.v1?
-  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
\ No newline at end of file
diff -Nru ruby-recaptcha-0.4.0/test/recaptcha_test.rb ruby-recaptcha-3.2.0/test/recaptcha_test.rb
--- ruby-recaptcha-0.4.0/test/recaptcha_test.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/recaptcha_test.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-require 'minitest/autorun'
-require 'cgi'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
-
-class RecaptchaClientHelperTest < Minitest::Test
-  include Recaptcha
-  include Recaptcha::ClientHelper
-  include Recaptcha::Verify
-
-  attr_accessor :session
-
-  def setup
-    @session = {}
-    @nonssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.nonssl_api_server_url) + '(.*)')
-    @ssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.ssl_api_server_url) + '(.*)')
-    Recaptcha.configure do |config|
-      config.public_key = '0000000000000000000000000000000000000000'
-      config.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-    end
-  end
-
-  def test_recaptcha_tags_v2
-    Recaptcha.configuration.api_version = 'v2'
-    # match a v2 only tag
-    assert_match /data-sitekey/, recaptcha_tags
-    # refute a v1 only tag
-    refute_match /\/challenge\?/, recaptcha_tags
-  end
-
-  def test_ssl_by_default
-    Recaptcha.configuration.use_ssl_by_default = true
-    assert_match @ssl_api_server_url, recaptcha_tags
-  end
-
-  def test_relative_protocol_by_default_without_ssl
-    Recaptcha.configuration.use_ssl_by_default = false
-    assert_match @nonssl_api_server_url, recaptcha_tags(:ssl => false)
-  end
-
-  def test_recaptcha_tags_with_ssl
-    assert_match @ssl_api_server_url, recaptcha_tags(:ssl => true)
-  end
-
-  def test_recaptcha_tags_without_noscript
-    refute_match /noscript/, recaptcha_tags(:noscript => false)
-  end
-
-  def test_should_raise_exception_without_public_key
-    assert_raises RecaptchaError do
-      Recaptcha.configuration.public_key = nil
-      recaptcha_tags
-    end
-  end
-end
diff -Nru ruby-recaptcha-0.4.0/test/recaptcha_v1_test.rb ruby-recaptcha-3.2.0/test/recaptcha_v1_test.rb
--- ruby-recaptcha-0.4.0/test/recaptcha_v1_test.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/recaptcha_v1_test.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-require 'minitest/autorun'
-require 'cgi'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
-
-class RecaptchaV1Test < Minitest::Test
-  include Recaptcha
-  include Recaptcha::ClientHelper
-  include Recaptcha::Verify
-
-  attr_accessor :session
-
-  def setup
-    @session = {}
-    @nonssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.nonssl_api_server_url) + '(.*)')
-    @ssl_api_server_url = Regexp.new(Regexp.quote(Recaptcha.configuration.ssl_api_server_url) + '(.*)')
-    Recaptcha.configure do |config|
-      config.public_key = '0000000000000000000000000000000000000000'
-      config.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-      config.api_version = 'v1'
-    end
-  end
-
-  def test_v1_with_v1_api?
-    assert Recaptcha.configuration.v1?
-    refute Recaptcha.configuration.v2?
-  end
-
-  def test_recaptcah_tags_v1
-    Recaptcha.configuration.api_version = 'v1'
-    # match a v1 only tag
-    assert_match /\/challenge\?/, recaptcha_tags
-    # refute a v2 only tag
-    refute_match /data-sitekey/, recaptcha_tags
-  end
-end
\ No newline at end of file
diff -Nru ruby-recaptcha-0.4.0/test/verify_recaptcha_test.rb ruby-recaptcha-3.2.0/test/verify_recaptcha_test.rb
--- ruby-recaptcha-0.4.0/test/verify_recaptcha_test.rb	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/verify_recaptcha_test.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-# coding: utf-8
-
-require 'minitest/autorun'
-require 'rubygems'
-require 'active_support'
-require 'active_support/core_ext/string'
-require 'mocha/setup'
-require 'i18n'
-require 'net/http'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
-
-class RecaptchaVerifyTest < Minitest::Test
-  def setup
-    Recaptcha.configuration.private_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-    @controller = TestController.new
-    @controller.request = stub(:remote_ip => "1.1.1.1", format: :html)
-
-    @expected_post_data = {}
-    @expected_post_data["remoteip"]   = @controller.request.remote_ip
-    @expected_post_data["response"]   = "response"
-
-    if Recaptcha.configuration.v1?
-      @controller.params = {:recaptcha_challenge_field => "challenge", :recaptcha_response_field => "response"}
-      @expected_post_data["privatekey"] = Recaptcha.configuration.private_key
-      @expected_post_data["challenge"]  = "challenge"
-    end
-
-    if Recaptcha.configuration.v2?
-      @controller.params = {:recaptcha_response_field => "response"}
-      @expected_post_data["secret"] = Recaptcha.configuration.private_key
-    end
-
-    @expected_uri = URI.parse(Recaptcha.configuration.verify_url)
-  end
-
-  def test_should_raise_exception_when_calling_bang_method
-    @controller.expects(:verify_recaptcha).returns(false)
-
-    assert_raises Recaptcha::VerifyError do
-      @controller.verify_recaptcha!
-    end
-  end
-
-  def test_should_return_whatever_verify_method_returns_when_using_bang_method
-    @controller.expects(:verify_recaptcha).returns(:foo)
-
-    assert_equal :foo, @controller.verify_recaptcha!
-  end
-
-  def test_should_raise_exception_without_private_key
-    skip
-    assert_raises Recaptcha::RecaptchaError do
-      Recaptcha.configuration.private_key = nil
-      @controller.verify_recaptcha
-    end
-  end
-
-  def test_should_return_false_when_key_is_invalid
-    skip
-    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
-    skip
-    @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
-    skip
-    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
-    skip
-    @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
-    skip
-    expect_http_post(Timeout::Error, :exception => true)
-    assert !@controller.verify_recaptcha()
-    assert_equal "Recaptcha unreachable.", @controller.flash[:recaptcha_error]
-  end
-
-  def test_timeout_when_handle_timeouts_gracefully_disabled
-    skip
-    Recaptcha.with_configuration(:handle_timeouts_gracefully => false) do
-      expect_http_post(Timeout::Error, :exception => true)
-      assert_raises Recaptcha::RecaptchaError, "Recaptcha unreachable." do
-        assert @controller.verify_recaptcha()
-      end
-      assert_nil @controller.flash[:recaptcha_error]
-    end
-  end
-
-  def test_message_should_use_i18n
-    skip
-    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.bad-news', {:default => 'bad-news'})
-    I18n.expects(:translate).with('recaptcha.errors.recaptcha_unreachable', {:default => 'Recaptcha unreachable.'})
-
-    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
-
-  def test_it_translates_api_response_with_i18n
-    skip
-    api_error_translated = "Bad news, body :("
-    expect_http_post(response_with_body("false\nbad-news"))
-    I18n.expects(:translate).with('recaptcha.errors.bad-news', :default => 'bad-news').returns(api_error_translated)
-
-    assert !@controller.verify_recaptcha
-    assert_equal api_error_translated, @controller.flash[:recaptcha_error]
-  end
-
-  def test_it_fallback_to_api_response_if_i18n_translation_is_missing
-    skip
-    expect_http_post(response_with_body("false\nbad-news"))
-
-    assert !@controller.verify_recaptcha
-    assert_equal 'bad-news', @controller.flash[:recaptcha_error]
-  end
-
-  def test_not_flashing_error_if_request_format_not_in_html
-    skip
-    @controller.request = stub(:remote_ip => "1.1.1.1", format: :json)
-    expect_http_post(response_with_body("false\nbad-news"))
-    assert !@controller.verify_recaptcha
-    assert_nil @controller.flash[:recaptcha_error]
-  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
diff -Nru ruby-recaptcha-0.4.0/test/verify_test.rb ruby-recaptcha-3.2.0/test/verify_test.rb
--- ruby-recaptcha-0.4.0/test/verify_test.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-recaptcha-3.2.0/test/verify_test.rb	2016-06-13 17:14:08.000000000 +0000
@@ -0,0 +1,250 @@
+require_relative 'helper'
+
+describe Recaptcha::Verify do
+  before do
+    @controller = TestController.new
+    @controller.request = stub(remote_ip: "1.1.1.1", format: :html)
+
+    @expected_post_data = {}
+    @expected_post_data["remoteip"]   = @controller.request.remote_ip
+    @expected_post_data["response"]   = "response"
+
+    @controller.params = {:recaptcha_response_field => "response", 'g-recaptcha-response' => 'string'}
+    @expected_post_data["secret"] = Recaptcha.configuration.private_key
+
+    @expected_uri = URI.parse(Recaptcha.configuration.verify_url)
+  end
+
+  describe "#verify_recaptcha!" do
+    it "raises when it fails" do
+      @controller.expects(:verify_recaptcha).returns(false)
+
+      assert_raises Recaptcha::VerifyError do
+        @controller.verify_recaptcha!
+      end
+    end
+
+    it "returns a value when it passes" do
+      @controller.expects(:verify_recaptcha).returns(:foo)
+
+      assert_equal :foo, @controller.verify_recaptcha!
+    end
+  end
+
+  describe "#verify_recaptcha" do
+    it "returns true on success" do
+      @controller.flash[:recaptcha_error] = "previous error that should be cleared"
+      expect_http_post.to_return(body: '{"success":true}')
+
+      assert @controller.verify_recaptcha
+      assert_nil @controller.flash[:recaptcha_error]
+    end
+
+    it "raises without private key" do
+      Recaptcha.configuration.private_key = nil
+      assert_raises Recaptcha::RecaptchaError do
+        @controller.verify_recaptcha
+      end
+    end
+
+    it "returns false when private key is invalid" do
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"invalid-site-private-key"}))
+
+      refute @controller.verify_recaptcha
+      assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+    end
+
+    it "adds an error to the model" do
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"bad-news"}))
+
+      errors = mock
+      errors.expects(:add).with(:base, "reCAPTCHA verification failed, please try again.")
+      model = mock(errors: errors)
+
+      refute @controller.verify_recaptcha(model: model)
+      assert_nil @controller.flash[:recaptcha_error]
+    end
+
+    it "returns true on success with optional key" do
+      key = 'ADIFFERENTPRIVATEKEYXXXXXXXXXXXXXX'
+      @controller.flash[:recaptcha_error] = "previous error that should be cleared"
+      expect_http_post(private_key: key).to_return(body: '{"success":true}')
+
+      assert @controller.verify_recaptcha(private_key: key)
+      assert_nil @controller.flash[:recaptcha_error]
+    end
+
+    it "fails silently when timing out" do
+      expect_http_post.to_timeout
+      refute @controller.verify_recaptcha
+      @controller.flash[:recaptcha_error].must_equal(
+        "Oops, we failed to validate your reCAPTCHA response. Please try again."
+      )
+    end
+
+    it "blows up on timeout when graceful is disabled" do
+      Recaptcha.with_configuration(handle_timeouts_gracefully: false) do
+        expect_http_post.to_timeout
+        assert_raises Recaptcha::RecaptchaError, "Recaptcha unreachable." do
+          assert @controller.verify_recaptcha
+        end
+        assert_nil @controller.flash[:recaptcha_error]
+      end
+    end
+
+    it "uses I18n for the failed message" do
+      I18n.locale = :de
+      verification_failed_translated   = "Sicherheitscode konnte nicht verifiziert werden."
+      verification_failed_default      = "reCAPTCHA verification failed, please try again."
+
+      I18n.expects(:translate).
+        with('recaptcha.errors.verification_failed', default: verification_failed_default).
+        returns(verification_failed_translated)
+
+      errors = mock
+      errors.expects(:add).with(:base, verification_failed_translated)
+      model = mock
+      model.stubs(errors: errors)
+
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"bad-news"}))
+      @controller.verify_recaptcha(model: model)
+    end
+
+    it "uses I18n for the timeout message" do
+      I18n.locale = :de
+      recaptcha_unreachable_translated = "Netzwerkfehler, bitte versuchen Sie es später erneut."
+      recaptcha_unreachable_default    = "Oops, we failed to validate your reCAPTCHA response. Please try again."
+
+      I18n.expects(:translate).
+        with('recaptcha.errors.recaptcha_unreachable', default: recaptcha_unreachable_default).
+        returns(recaptcha_unreachable_translated)
+
+      errors = mock
+      errors.expects(:add).with(:base, recaptcha_unreachable_translated)
+      model = mock
+      model.stubs(errors: errors)
+
+      expect_http_post.to_timeout
+      @controller.verify_recaptcha(model: model)
+    end
+
+    it "translates api response with I18n" do
+      api_error_translated = "Bad news, body :("
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"bad-news"}))
+      I18n.expects(:translate).
+        with('recaptcha.errors.verification_failed', default: 'reCAPTCHA verification failed, please try again.').
+        returns(api_error_translated)
+
+      refute @controller.verify_recaptcha
+      assert_equal api_error_translated, @controller.flash[:recaptcha_error]
+    end
+
+    it "falls back to api response if i18n translation is missing" do
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"bad-news"}))
+
+      refute @controller.verify_recaptcha
+      assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+    end
+
+    it "does not flash error when request was not html" do
+      @controller.request = stub(remote_ip: "1.1.1.1", format: :json)
+      expect_http_post.to_return(body: %({"foo":"false", "bar":"bad-news"}))
+      refute @controller.verify_recaptcha
+      assert_nil @controller.flash[:recaptcha_error]
+    end
+
+    it "does not verify via http call when user did not click anything" do
+      @controller.params = { 'g-recaptcha-response' => ""}
+      assert_not_requested :get, %r{\.google\.com}
+      assert_equal false, @controller.verify_recaptcha
+      assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+    end
+
+    describe ':hostname' do
+      let(:hostname) { 'fake.hostname.com' }
+
+      before do
+        expect_http_post.to_return(body: %({"success":true, "hostname": "#{hostname}"}))
+      end
+
+      it "passes with nil" do
+        assert @controller.verify_recaptcha(hostname: nil)
+        assert_nil @controller.flash[:recaptcha_error]
+      end
+
+      it "passes with false" do
+        assert @controller.verify_recaptcha(hostname: false)
+        assert_nil @controller.flash[:recaptcha_error]
+      end
+
+      it "check for equality when string custom hostname validation is passed" do
+        assert @controller.verify_recaptcha(hostname: hostname)
+        assert_nil @controller.flash[:recaptcha_error]
+      end
+
+      it "fails when custom hostname validation does not match" do
+        expect_http_post.to_return(body: %({"success":true, "hostname": "not_#{hostname}"}))
+
+        refute @controller.verify_recaptcha(hostname: hostname)
+        assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+      end
+
+      it "check with call when callable custom hostname validation is passed" do
+        assert @controller.verify_recaptcha(hostname: -> (d) { d == hostname })
+        assert_nil @controller.flash[:recaptcha_error]
+      end
+
+      it "raises when invalid custom hostname validation is passed" do
+        assert_raises Recaptcha::RecaptchaError do
+          @controller.verify_recaptcha(hostname: 0)
+        end
+      end
+
+      describe "when default hostname validation matches" do
+        around { |test| Recaptcha.with_configuration(hostname: hostname, &test) }
+
+        it "passes" do
+          assert @controller.verify_recaptcha
+          assert_nil @controller.flash[:recaptcha_error]
+        end
+
+        it "fails when custom validation does not match" do
+          refute @controller.verify_recaptcha(hostname: "not_#{hostname}")
+          assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+        end
+      end
+
+      describe "when default hostname validation does not match" do
+        around { |test| Recaptcha.with_configuration(hostname: "not_#{hostname}", &test) }
+
+        it "fails" do
+          refute @controller.verify_recaptcha
+          assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
+        end
+
+        it "passes when custom validation matches" do
+          assert @controller.verify_recaptcha(hostname: hostname)
+          assert_nil @controller.flash[:recaptcha_error]
+        end
+      end
+    end
+  end
+
+  private
+
+  class TestController
+    include Recaptcha::Verify
+    attr_accessor :request, :params, :flash
+
+    def initialize
+      @flash = {}
+    end
+  end
+
+  def expect_http_post(private_key: Recaptcha.configuration.private_key)
+    stub_request(
+      :get,
+      "https://www.google.com/recaptcha/api/siteverify?remoteip=1.1.1.1&response=string&secret=#{private_key}"
+    )
+  end
+end
diff -Nru ruby-recaptcha-0.4.0/.travis.yml ruby-recaptcha-3.2.0/.travis.yml
--- ruby-recaptcha-0.4.0/.travis.yml	2015-03-22 16:40:12.000000000 +0000
+++ ruby-recaptcha-3.2.0/.travis.yml	2016-06-13 17:14:08.000000000 +0000
@@ -1,3 +1,9 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 2.1.2
+  - 2.0.0
+  - 2.1.6
+  - 2.2.3
+matrix:
+  fast_finish: true