recaptcha 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15a8d9b4ffc50fb479df2f03065310e3b85be5f4
-  data.tar.gz: 1d2412b3ce72619d131388e77e9b82a4b1e9de46
+  metadata.gz: 19150c1891f5ef4fda5c568d941c8035ef19c0aa
+  data.tar.gz: ffac23399306ce2b5c6c5199389cc755abfe2833
 SHA512:
-  metadata.gz: f1a53822196216dc231d60369edcce9719e724e4e66a35b57e35b7b57ca8104b2d5211a07231616fad499c13420daa3eb584b5337e87dd47631d40e61d801721
-  data.tar.gz: e3fef919669e86e48de71216c3def51609e1d525d1fe7cebc5ada112f5f9613d96783625c0d675cddfeafce97d7783006665371db42be17f027248945784ebc6
+  metadata.gz: 0734d303c81f727913edef8c3f637b2fbf4d2f4612f170656bf1899b9a2be45fdd06401e63bd8eb9a98dac8eb57f9ffbc139a2d2d17a09f93ed0986cd349d452
+  data.tar.gz: cd08fa57ef7c4b3afdc03f8311ab7f4299d0c056686289a7bdff87dd87b6aa6fb5979a7313d0437c3b49ce9730c92000451f429aafe521fc66b5103f5989b8a5

data/{CHANGELOG → CHANGELOG.md}

@@ -1,4 +1,19 @@
-== 0.3.6 / 2012-01-07
+## NEXT
+* 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
+* extract token module
+* need to use `gem "recaptcha", require: "recaptcha/rails"` to get rails helpers installed
+
+## 0.5.0
+* size option
+* support disabling stoken
+* support Rails.env
+
+## 0.3.6 / 2012-01-07
 
 * Many documentation changes
 * Fixed deprecations in dependencies
@@ -6,27 +21,27 @@
 * Fixes for options hash
 * Fixes for failing tests
 
-== 0.3.5 / 2012-05-02
+## 0.3.5 / 2012-05-02
 
 * I18n for error messages
 * Rails: delete flash keys if unused
 
-== 0.3.4 / 2011-12-13
+## 0.3.4 / 2011-12-13
 
 * Rails 3
 * Remove jeweler
 
-== 0.2.2 / 2009-09-14
+## 0.2.2 / 2009-09-14
 
 * Add a timeout to the validator
 * Give the documentation some love
 
-== 0.2.1 / 2009-09-14
+## 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
+## 0.2.0 / 2009-09-12
 
 * RecaptchaOptions AJAX API Fix
 * Added 'cucumber' as a test environment to skip
@@ -35,7 +50,7 @@
 * Removed dependency on ActiveRecord constant
 * Add I18n
 
-== 0.1.0 / 2008-2-8
+## 0.1.0 / 2008-2-8
 
 * 1 major enhancement
-	* Initial Gem Release
+* Initial Gem Release

data/README.md

@@ -11,102 +11,56 @@ 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
 
-```Ruby
-gem "recaptcha", require: "recaptcha/rails"
-```
-
-(Rails < 3.0: 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 a pair](https://www.google.com/recaptcha/admin).
-
-### 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.
-
-```Ruby
-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 older version of the API,
-  # only works for versions >= 0.3.7, default value is 'v2':
-  # config.api_version = 'v1'
-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:
+[obtain a reCAPTCHA API key](https://www.google.com/recaptcha/admin).
 
 ```Ruby
-Recaptcha.with_configuration(public_key: '12345') do
-  # Do stuff with the overwritten public_key.
-end
+gem "recaptcha", require: "recaptcha/rails"
 ```
 
-### Heroku & Shell environment
+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.
 
-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.
+Otherwise see [Alternative API key setup](#alternative-api-key-setup).
 
 ```
 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:
+Add `recaptcha_tags` to the forms you want to protect. 
 
-```Ruby
-recaptcha_tags public_key: '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+```Erb
+<%= form_for @foo do |f| %>
+  # ... other tags
+  <%= recaptcha_tags %>
+  # ... other tags
+<% end %>
 ```
 
-and later,
+And, add `verify_recaptcha` logic to each form action that you've protected.
 
 ```Ruby
-verify_recaptcha private_key: '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+# 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
 ```
 
-This option might be useful, if the same code base is used for multiple
-reCAPTCHA setups.
+## Sinatra / Rack / Ruby installation
 
-## To use 'recaptcha'
+See [sinatra demo](/demo/sinatra) for details.
 
-Add `recaptcha_tags` to each form you want to protect. 
-Place it where you want the recaptcha widget to appear.
+ - add `gem 'recaptcha'` to `Gemfile`
+ - set env variables
+ - `include Recaptcha::ClientHelper` where you need `recaptcha_tags`
+ - `include Recaptcha::Verify` where you need `verify_recaptcha`
 
-Example:
-
-```Erb
-<%= 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
+## recaptcha_tags
 
 Some of the options available:
 
@@ -116,16 +70,15 @@ Some of the options available:
 | :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 | Your public API key, takes precedence over the ENV variable (default `nil`)|
+| :public_key | Override public API key |
 | :error      | Override the error code returned from the reCAPTCHA API (default `nil`)|
 | :stoken     | Include in reCAPTCHA API v2 the security token (default `true`)|
 | :size       | Specify a size (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
+## 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
@@ -139,135 +92,10 @@ Some of the options available:
 | :model       | Model to set errors
 | :attribute   | Model attribute to receive errors (default :base)
 | :message     | Custom error message
-| :private_key | Your private API key, takes precedence over the ENV variable (default `nil`).
+| :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'])
 
-```Ruby
-respond_to do |format|
-  if verify_recaptcha(model @post, message: "Oh! It's error with reCAPTCHA!") && @post.save
-    # ...
-  else
-    # ...
-  end
-end
-```
-
-### Add multiple widgets to the same page
-
-This is an example taken from the [official google documentation](https://developers.google.com/recaptcha/docs/display).
-
-Add a script tag for a callback
-
-```Html
-<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>
-```
-
-In the callback you will have the `sitekey` generated by this gem with `<%= Recaptcha.configuration.public_key %>`
-
-Next you need to have some elements with an id matching those specified in the callback
-
-```Erb
-<%= form_for @foo do |f| %>
-  # ... additional lines truncated for brevity ...
-  <div id="example1"></div>
-  # ... additional lines truncated for brevity ...
-<% end %>
-<%= form_for @foo2 do |f| %>
-  # ... additional lines truncated for brevity ...
-  <div id="example2"></div>
-  # ... additional lines truncated for brevity ...
-<% end %>
-<%= form_for @foo3 do |f| %>
-  # ... additional lines truncated for brevity ...
-  <div id="example3"></div>
-  # ... additional lines truncated for brevity ...
-<% end %>
-```
-
-And finally you need a script tag that gets the reCAPTCHA code from google and tells it that your code is explicit and gives it the callback.
-
-```Html
-<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
-```
-
-Now all together:
-
-```Html
-<html>
-  <head>
-    <title>reCAPTCHA demo: Explicit render for multiple widgets</title>
-    <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>
-  </head>
-  <body>
-    <%= form_for @foo do |f| %>
-      # ... additional lines truncated for brevity ...
-      <div id="example1"></div>
-      # ... additional lines truncated for brevity ...
-    <% end %>
-    <%= form_for @foo2 do |f| %>
-      # ... additional lines truncated for brevity ...
-      <div id="example2"></div>
-      # ... additional lines truncated for brevity ...
-    <% end %>
-    <%= form_for @foo3 do |f| %>
-      # ... additional lines truncated for brevity ...
-      <div id="example3"></div>
-      # ... additional lines truncated for brevity ...
-    <% end %>
-    <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
-  </body>
-</html>
-```
-
-The only real difference between this example and the google example is you will use the `<%= Recaptcha.configuration.public_key %>` for the `sitekey`
-
-If your callback has to live on another file (maybe a layout), then you would set the callback on window `window.onloadCallback = function() {...}`
-
-Then on the backend, you will still use the `verify_recaptcha` as explained in this readme.
 
 ## I18n support
 reCAPTCHA passes two types of error explanation to a linked model. It will use the I18n gem
@@ -287,9 +115,49 @@ en:
 ```
 
 ## Testing
-By default, reCAPTCHA is skipped on "test" env, so if you need to make sure it's working properly, just remove the "test" entry of the skip_environment inside Recapcha class, look:
 
+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)

data/lib/recaptcha.rb

@@ -2,27 +2,19 @@ require 'recaptcha/configuration'
 require 'recaptcha/client_helper'
 require 'recaptcha/verify'
 require 'recaptcha/token'
+require 'uri'
 
 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'
-      }
-    }
-
-  RECAPTCHA_API_VERSION           = 'v2'
+  CONFIG = {
+    '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'
+  }
+
   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
@@ -54,6 +46,34 @@ module Recaptcha
     result
   end
 
+  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
+    if uri.port == 443
+      http_instance.use_ssl = true
+      http_instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    request = Net::HTTP::Get.new(uri.request_uri)
+    http_instance.request(request).body
+  end
+
+  def self.i18n(key, default)
+    if defined?(I18n)
+      I18n.translate(key, default: default)
+    else
+      default
+    end
+  end
+
+
   class RecaptchaError < StandardError
   end
 

data/lib/recaptcha/client_helper.rb

@@ -3,129 +3,50 @@ module Recaptcha
     # 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
+      public_key = options[:public_key] || Recaptcha.configuration.public_key!
 
-    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}
-      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
-      end
-      return (html.respond_to?(:html_safe) && html.html_safe) || html
-    end
-
-    def v2_tags(options)
-      public_key   = options[:public_key] ||= Recaptcha.configuration.public_key
-      raise RecaptchaError, "No public key specified." unless public_key
-      private_key  = options[:private_key] ||= Recaptcha.configuration.private_key
-      raise RecaptchaError, "No private key specified." unless private_key
-      error = options[:error] ||= ((defined? flash) ? flash[:recaptcha_error] : "") # TODO not being used !?
-      uri   = Recaptcha.configuration.api_server_url(options[:ssl])
-      uri += "?hl=#{options[:hl]}" unless options[:hl].blank?
-
-      html = ""
-      html << %{<script src="#{uri}" async defer></script>\n}
-
-      data_attributes = options.slice(:theme, :type, :callback, :expired_callback, :size)
-      data_attributes[:sitekey] = public_key
+      script_url = Recaptcha.configuration.api_server_url(ssl: options[:ssl])
+      script_url += "?hl=#{options[:hl]}" unless options[:hl].to_s == ""
+      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{public_key}"
 
-      if options[:stoken] != false
-        data_attributes[:stoken] = Recaptcha::Token.secure_token
+      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[:stoken] = Recaptcha::Token.secure_token if options[:stoken] != false
+      data_attributes = data_attributes.map { |k,v| %{data-#{k.to_s.tr('_','-')}="#{v}"} }.join(" ")
 
-      data_attributes = data_attributes.map {|k,v| %{data-#{k.to_s.gsub(/_/,'-')}="#{v}"} }.join(" ")
-
+      html = %{<script src="#{script_url}" async defer></script>\n}
       html << %{<div class="g-recaptcha" #{data_attributes}></div>\n}
 
-      unless options[:noscript] == false
-        fallback_uri = "#{uri.chomp('.js')}/fallback?k=#{public_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>}
+      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
 
-      (html.respond_to?(:html_safe) && html.html_safe) || html
-    end
-
-    private
-
-    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 =~ %r{(callback|expired-callback)}
-          "\"#{k}\": #{v}"
-        else
-          "\"#{k}\": \"#{v}\""
-        end
-      end.join(", ")
-      result << "}"
+      html.respond_to?(:html_safe) ? html.html_safe : html
     end
   end
 end

data/lib/recaptcha/configuration.rb

@@ -28,47 +28,33 @@ module Recaptcha
   #   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, :use_ssl_by_default
 
     def initialize #:nodoc:
-      @api_version                = RECAPTCHA_API_VERSION
       @skip_verify_env            = SKIP_VERIFY_ENV
       @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(ssl: nil)
+      ssl = use_ssl_by_default if ssl.nil?
+      key = (ssl ? 'secure_server_url' : 'server_url')
+      CONFIG.fetch(key)
     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

data/lib/recaptcha/verify.rb

@@ -1,101 +1,53 @@
-require "uri"
-require "json"
+require 'json'
 
 module Recaptcha
   module Verify
-    DEFAULT_TIMEOUT = 3
-
     # 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
-
-      env_options = options[:env] || ENV['RAILS_ENV'] || (Rails.env if defined? 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
 
-      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)
-        else
-          http = Net::HTTP
-        end
+      return true if Recaptcha::Verify.skip?(options[:env])
+
+      private_key = options[:private_key] || Recaptcha.configuration.private_key!
+      recaptcha_response = options[:response] || params['g-recaptcha-response'].to_s
 
+      begin
         # 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] || DEFAULT_TIMEOUT) do
-            recaptcha = http.post_form(URI.parse(Recaptcha.configuration.verify_url), verify_hash)
-          end
-          answer, error = recaptcha.body.split.map { |s| s.chomp }
-        end
+        verify_hash = {
+          "secret"    => private_key,
+          "remoteip"  => remote_ip.to_s,
+          "response"  => recaptcha_response
+        }
 
-        if Recaptcha.configuration.v2?
-          verify_hash = {
-            "secret"    => private_key,
-            "remoteip"  => remote_ip,
-            "response"  => params['g-recaptcha-response']
-          }
-
-          Timeout::timeout(options[:timeout] || DEFAULT_TIMEOUT) 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
+        reply = Recaptcha.get(verify_hash, options)
+        answer = JSON.parse(reply)['success']
 
         if answer.to_s == 'true'
-          flash.delete(:recaptcha_error) if request_in_html_format?
+          flash.delete(:recaptcha_error) if recaptcha_flash_supported?
           true
         else
-          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
+          recaptcha_error(
+            model,
+            attribute,
+            options[:message],
+            "recaptcha.errors.verification_failed",
+            "Word verification response is incorrect, 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
+          recaptcha_error(
+            model,
+            attribute,
+            options[:message],
+            "recaptcha.errors.recaptcha_unreachable",
+            "Oops, we failed to validate your word verification response. Please try again."
+          )
           false
         else
           raise RecaptchaError, "Recaptcha unreachable."
@@ -105,12 +57,25 @@ module Recaptcha
       end
     end
 
-    def request_in_html_format?
+    def verify_recaptcha!(options = {})
+      verify_recaptcha(options) or raise VerifyError
+    end
+
+    private
+
+    def recaptcha_error(model, attribute, message, key, default)
+      message = message || Recaptcha.i18n(key, default)
+      flash[:recaptcha_error] = message if recaptcha_flash_supported?
+      model.errors.add attribute, message if model
+    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
+    def self.skip?(env)
+      env ||= ENV['RAILS_ENV'] || (Rails.env if defined? Rails.env)
+      Recaptcha.configuration.skip_verify_env.include? env
     end
   end
 end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "0.6.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpers for the reCAPTCHA API
 email:
 - jasper@ambethia.com
@@ -129,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/recaptcha.rb