recaptcha 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d97798a175e48327e1aea8ee6e57c1ea9a31cf8
-  data.tar.gz: 5648bc8af9271450af13692d0d519b0d4aa65c01
+  metadata.gz: d78a24c8953339b28e38ddd0a9422ca8e079a128
+  data.tar.gz: 1e7d4afecedc4e85d4631fc7818b946d573cbc7c
 SHA512:
-  metadata.gz: 95f50723630205780a74ee7ad28a6496e80dd903ed6be311ef287c5cc986a1c5f3b81cdd2ec8f2360d3ccceca220bc2fe46d2579a080713cab67737cc3a04531
-  data.tar.gz: 01348b45a9933b3abbe1c2f9d5f16b7800145a31cc298cbe035e62136ed231ad6584b476c670c2e1fa2ccc27e7ef6b60fbbb46f08d0995ce71a6142e6f932139
+  metadata.gz: 874da6c556bee8715720231333840bd62fe82c19659eb443d1433c223fd047b9925b917084b29ed212730dc6500a0acfeffecf8764a8338e7b045cbfe174c5b4
+  data.tar.gz: 37599b7354e15e31b184bae99ba1a493ee41d146010685848ff5ec3baa7bf95ea5450007bd820b6e1b6af3eef9b3440b40122a8e278ba5a0fa796b673215430f

data/README.md

@@ -101,10 +101,25 @@ Some of the options available:
 
 ## invisible_recaptcha_tags
 
-[Invisible reCAPTCHA](https://developers.google.com/recaptcha/docs/invisible) has two differences:
+Make sure to read [Invisible reCAPTCHA](https://developers.google.com/recaptcha/docs/invisible).
 
-1. Needs a callback function, which is called after verification with Google's reCAPTCHA service. This callback function must submit the form.
-2. The `invisible_recaptcha_tags` generates a submit button.
+### With a single form on a page
+
+1. The `invisible_recaptcha_tags` generates a submit button for you.
+
+```Erb
+<%= form_for @foo do |f| %>
+  # ... other tags
+  <%= invisible_recaptcha_tags text: 'Submit form' %>
+<% end %>
+```
+
+Then, add `verify_recaptcha` to your controller as seen [above](#rails-installation).
+
+### With multiple forms on a page
+
+1. You will need a custom callback function, which is called after verification with Google's reCAPTCHA service. This callback function must submit the form. Optionally, `invisible_recaptcha_tags` currently implements a JS function called `invisibleRecaptchaSubmit` that is called when no `callback` is passed. Should you wish to override `invisibleRecaptchaSubmit`, you will need to use `invisible_recaptcha_tags script: false`, see lib/recaptcha/client_helper.rb for details.
+2. The `invisible_recaptcha_tags` generates a submit button for you.
 
 ```Erb
 <%= form_for @foo, html: {id: 'invisible-recaptcha-form'} do |f| %>

data/lib/recaptcha/client_helper.rb

@@ -47,9 +47,10 @@ module Recaptcha
 
     # Invisible reCAPTCHA implementation
     def invisible_recaptcha_tags(options = {})
+      options = {callback: 'invisibleRecaptchaSubmit'}.merge options
       text = options.delete(:text)
-      html, tag_attributes = Recaptcha::ClientHelper.recaptcha_components(options)
-
+      html, tag_attributes = Recaptcha::ClientHelper.recaptcha_components(options.dup)
+      html << recaptcha_default_callback if recaptcha_default_callback_required?(options)
       html << %(<button type="submit" #{tag_attributes}>#{text}</button>\n)
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
@@ -84,5 +85,37 @@ module Recaptcha
 
       [html, tag_attributes, fallback_uri]
     end
+
+    private
+
+    def recaptcha_default_callback
+      <<-HTML
+        <script>
+          var invisibleRecaptchaSubmit = function () {
+            var closestForm = function (ele) {
+              var curEle = ele.parentNode;
+              while (curEle.nodeName !== 'FORM' && curEle.nodeName !== 'BODY'){
+                curEle = curEle.parentNode;
+              }
+              return curEle.nodeName === 'FORM' ? curEle : null
+            };
+
+            var eles = document.getElementsByClassName('g-recaptcha');
+            if (eles.length > 0) {
+              var form = closestForm(eles[0]);
+              if (form) {
+                form.submit();
+              }
+            }
+          };
+        </script>
+      HTML
+    end
+
+    def recaptcha_default_callback_required?(options)
+      options[:callback] == 'invisibleRecaptchaSubmit' &&
+      !Recaptcha::Verify.skip?(options[:env]) &&
+      options[:script] != false
+    end
   end
 end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "4.5.0".freeze
+  VERSION = "4.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json