recaptcha 4.12.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514874151c3eb8e360abc5dfa43ebbf2f154d2ca1d449d8594cadf2ca5d73e97
-  data.tar.gz: 8859da940e28f21beb58521361b28afead517f5dca8187e5cabfb81fe10d35be
+  metadata.gz: 9b5ffc9bf0c060fee8d77fd96405cfe4a4b9a023663a28ad81a908e674ad6674
+  data.tar.gz: 958f628e01e816b2d27f7fccad2f0c7e14e701789093ee856316738b5b4810d6
 SHA512:
-  metadata.gz: 738e13bd0c4f53dff85f683bf68de9e871dc727d7d8e814f3765f01459aad59c0177fd580f4b1288d60ac469c81511880c51d98bc34ed4c43875a3f1c9e63a15
-  data.tar.gz: f579fe56b1ae81c0c94b1cf09e1cf91402fae35e3b7e9b0600032474152421a1b852db6aaa5f7d202589ec8add27da3a9b79e38f7bc0a084e748e6e4dc775052
+  metadata.gz: f1f835a629b92c10e4250d89db0f8717a5a6907f631a97ef90c0989b2d97875c9cffd81559872d7c025dd86c0a53e301bdd4ee9c60d745070cf4bfce8c24049e
+  data.tar.gz: 361b8d29ab4b9201faf4e6c87cc7bf35043915cebb4714b2c6f4424214476cef96dfe7c9707b8ffb63e7ea320dccf324ba2759b62c5344e48942647de718638e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.12.0 - 2018-08-30
+* add `input` option to `invisible_recaptcha_tags`'s `ui` setting
+
+## 4.11.1 - 2018-08-08
+* leave `tabindex` attribute alone for `invisible_recaptcha_tags`
+
 ## 4.11.0 - 2018-08-06
 * prefer RAILS_ENV over RACK_ENV #286
 

data/README.md

@@ -73,6 +73,8 @@ Some of the options available:
 | :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)) |
+| :onload           | Optional. The name of your callback function to be executed once all the dependencies have loaded. (See [explicit rendering](https://developers.google.com/recaptcha/docs/display#explicit_render))|
+| :render           | Optional. Whether to render the widget explicitly. Defaults to `onload`, which will render the widget in the first g-recaptcha tag it finds. (See [explicit rendering](https://developers.google.com/recaptcha/docs/display#explicit_render))|
 | :nonce            | Optional. Sets nonce attribute for script. Can be generated via `SecureRandom.base64(32)`. (default `nil`)|
 | :id               | Specify an html id attribute (default `nil`)|
 | :script           | If you do not need to add a script tag by helper you can set the option to false. It's necessary when you add a script tag manualy (default `true`)|

data/lib/recaptcha/client_helper.rb

@@ -25,8 +25,8 @@ module Recaptcha
                 <div style="width: 302px; height: 422px; position: absolute;">
                   <iframe
                     src="#{fallback_uri}"
-                    scrolling="no" name="ReCAPTCHA"
-                    style="width: 302px; height: 422px; border-style: none; border: 0;">
+                    name="ReCAPTCHA"
+                    style="width: 302px; height: 422px; border-style: none; border: 0; overflow: hidden;">
                   </iframe>
                 </div>
               </div>
@@ -59,7 +59,7 @@ module Recaptcha
       when :invisible
         html << %(<div data-size="invisible" #{tag_attributes}></div>\n)
       when :input
-        html << %(<input type="submit" #{tag_attributes}>#{text}</input>\n)
+        html << %(<input type="submit" #{tag_attributes} value="#{text}"/>\n)
       else
         raise(RecaptchaError, "ReCAPTCHA ui `#{options[:ui]}` is not valid.")
       end
@@ -67,9 +67,9 @@ module Recaptcha
     end
 
     def self.recaptcha_components(options = {})
-      html = ''.dup
+      html = +''
       attributes = {}
-      fallback_uri = ''.dup
+      fallback_uri = +''
 
       # Since leftover options get passed directly through as tag
       # attributes, we must unconditionally delete all our options
@@ -77,7 +77,9 @@ module Recaptcha
       env = options.delete(:env)
       class_attribute = options.delete(:class)
       site_key = options.delete(:site_key)
-      hl = options.delete(:hl).to_s
+      hl = options.delete(:hl)
+      onload = options.delete(:onload)
+      render = options.delete(:render)
       nonce = options.delete(:nonce)
       skip_script = (options.delete(:script) == false)
       ui = options.delete(:ui)
@@ -93,7 +95,12 @@ module Recaptcha
       unless Recaptcha::Verify.skip?(env)
         site_key ||= Recaptcha.configuration.site_key!
         script_url = Recaptcha.configuration.api_server_url
-        script_url += "?hl=#{hl}" unless hl == ""
+        query_params = hash_to_query(
+          hl: hl,
+          onload: onload,
+          render: render
+        )
+        script_url += "?#{query_params}" unless query_params.empty?
         nonce_attr = " nonce='#{nonce}'" if nonce
         html << %(<script src="#{script_url}" async defer#{nonce_attr}></script>\n) unless skip_script
         fallback_uri = %(#{script_url.chomp(".js")}/fallback?k=#{site_key})
@@ -142,5 +149,9 @@ module Recaptcha
       !Recaptcha::Verify.skip?(options[:env]) &&
       options[:script] != false
     end
+
+    private_class_method def self.hash_to_query(hash)
+      hash.delete_if { |_, val| val.nil? || val.empty? }.to_a.map { |pair| pair.join('=') }.join('&')
+    end
   end
 end

data/lib/recaptcha/rails.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 # deprecated, but let's not blow everyone up
 require 'recaptcha'

data/lib/recaptcha/verify.rb

@@ -4,6 +4,7 @@ require 'json'
 
 module Recaptcha
   module Verify
+    G_RESPONSE_LIMIT = 4000
     # Your private API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def verify_recaptcha(options = {})
@@ -15,7 +16,7 @@ module Recaptcha
       recaptcha_response = options[:response] || params['g-recaptcha-response'].to_s
 
       begin
-        verified = if recaptcha_response.empty?
+        verified = if recaptcha_response.empty? || recaptcha_response.length > G_RESPONSE_LIMIT
           false
         else
           recaptcha_verify_via_api_call(request, recaptcha_response, options)

data/lib/recaptcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Recaptcha
-  VERSION = '4.12.0'
+  VERSION = '4.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json