recaptcha 4.2.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 529e90efb6c6981d74f7f1129efbb672e441ca35
-  data.tar.gz: 81e122d8e18de0b1cc4f63ba1651587c18f5bdb6
+  metadata.gz: 91a422cb91f169dd8b16d4c2aaabaf8d8501dc2f
+  data.tar.gz: 11a287fd4d8ef0274af222feef7c77bfbb6f2c38
 SHA512:
-  metadata.gz: b23f3ce97fb48211958f541a105050ba160a17f6c363634bb8c4aeddf8a161e57c592c96b2fa665e89379b8c84cd9d63415ca5cba7e3ab67aa0757ccdb5d68a0
-  data.tar.gz: 6b7828dd0be7e1317dd82f4130c1cde4a7f51c90890946a2d5ff623da3c863738eb2cad27c29d79e0821393a61792f6b64b9f0d94f892b40e8bc1855d15395ce
+  metadata.gz: 480304f23c3411ad9386b7eb7e99846b26ccc4667d8bec27ebdf02bbd7b398736939996118d0ed0b37753af6b1c75a77c4fd4bfa61b3b1c9a9207bd399cc4087
+  data.tar.gz: 3ff8277354b3b38306d80ba10f39b91bc7036eef99f8478f106656f53a97f5d5d9d29daf309b2cbb8306542d0a24ba6671e9d50bc848402075a7acdae2c18090

data/lib/recaptcha/client_helper.rb

@@ -10,10 +10,12 @@ module Recaptcha
         raise(RecaptchaError, "SSL is now always true. Please remove 'ssl' from your calls to recaptcha_tags.")
       end
 
+      noscript = options.delete(:noscript)
+
       html, tag_attributes, fallback_uri = Recaptcha::ClientHelper.recaptcha_components(options)
       html << %(<div #{tag_attributes}></div>\n)
 
-      if options[:noscript] != false
+      if noscript != false
         html << <<-HTML
           <noscript>
             <div>
@@ -45,32 +47,37 @@ module Recaptcha
 
     # Invisible reCAPTCHA implementation
     def invisible_recaptcha_tags(options = {})
+      text = options.delete(:text)
       html, tag_attributes = Recaptcha::ClientHelper.recaptcha_components(options)
-      html << %(<button type="submit" #{tag_attributes}>#{options[:text]}</button>\n)
+
+      html << %(<button type="submit" #{tag_attributes}>#{text}</button>\n)
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
     def self.recaptcha_components(options = {})
-      site_key = options[:site_key] || Recaptcha.configuration.site_key!
-      script_url = Recaptcha.configuration.api_server_url
-      script_url += "?hl=#{options[:hl]}" unless options[:hl].to_s == ""
+      site_key = options.delete(:site_key) || Recaptcha.configuration.site_key!
+      html = ""
+      attributes = {
+        class: ["g-recaptcha", options.delete(:class)].join(" ")
+      }
 
-      data_attributes = [:badge, :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] = site_key
+      hl = options.delete(:hl)
+      script_url = Recaptcha.configuration.api_server_url
+      script_url += "?hl=#{hl}" unless hl.to_s == ""
+      html << %(<script src="#{script_url}" async defer></script>\n) unless options.delete(:script) == false
+      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{site_key}"
 
-      tag_attributes = data_attributes.map { |k, v| %(data-#{k.to_s.tr('_', '-')}="#{v}") }.join(" ")
-      if id = options[:id]
-        tag_attributes << %( id="#{id}")
+      # Pull out reCaptcha specific data attributes.
+      [:badge, :theme, :type, :callback, :expired_callback, :size].each do |data_attribute|
+        if value = options.delete(data_attribute)
+          attributes["data-#{data_attribute}"] = value
+        end
       end
-      tag_attributes << %( class="g-recaptcha #{options[:class]}")
 
-      html = ""
-      html << %(<script src="#{script_url}" async defer></script>\n) if options.fetch(:script, true)
+      attributes["data-sitekey"] = site_key
 
-      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{site_key}"
+      # Append whatever that's left of options to be attributes on the tag.
+      tag_attributes = attributes.merge(options).map { |k, v| %(#{k}="#{v}") }.join(" ")
 
       [html, tag_attributes, fallback_uri]
     end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "4.2.0".freeze
+  VERSION = "4.3.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Jason L Perry