recaptcha 4.6.5 → 4.6.6.ruby187

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18afeb1e9b7dcdb8648f53ac9cd9ae71a2c7faa2
-  data.tar.gz: a2053ac43c00bc5fbdec6149d91fbc1149f0d57b
+  metadata.gz: 86735f0dcb319674c4c69a5d45d019089eb05e9b
+  data.tar.gz: b4f148df5b3fdc9673d2a3818b299bcdb293f2de
 SHA512:
-  metadata.gz: cd8cdb671f6466e9dc0787fa5313603d68ef4646fa2990c3ff2b0905e0a0b5ef7e73c898bc3d56b826d7a4be6b9ae19fed4a69a146bac63e8f8992e1b2ba54d0
-  data.tar.gz: 7e89374cb895516c19036439336a9e773a7f5fd9fb66e263a54111d468f0b713ef9322998eec191487c6f6d716d44421354bd449a37ce89acd506f23800dda2d
+  metadata.gz: 215f69c8ce408c17d1d0bf32f4ae394b55a36fb4c4a670419689a03abd4dd5bb0ad7085da222ffccb78254437542973d6dea6e1cce130797aa38ed827a176e82
+  data.tar.gz: cdd9851bdb4411a6ede4defb5a0f90a3ee0bd206613d6a0703c8529adeeb56bc0b5f6046f4b544cf72746d01caf4a6ae0b340774fd9e876b5daa708a729366f4

data/lib/recaptcha.rb

@@ -3,6 +3,7 @@ require 'recaptcha/client_helper'
 require 'recaptcha/verify'
 require 'uri'
 require 'net/http'
+require 'rack/utils'
 
 module Recaptcha
   CONFIG = {
@@ -50,7 +51,7 @@ module Recaptcha
     else
       Net::HTTP
     end
-    query = URI.encode_www_form(verify_hash)
+    query = Rack::Utils.build_query(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
@@ -61,7 +62,7 @@ module Recaptcha
 
   def self.i18n(key, default)
     if defined?(I18n)
-      I18n.translate(key, default: default)
+      I18n.translate(key, :default => default)
     else
       default
     end

data/lib/recaptcha/client_helper.rb

@@ -48,9 +48,9 @@ module Recaptcha
 
     # Invisible reCAPTCHA implementation
     def invisible_recaptcha_tags(options = {})
-      options = {callback: 'invisibleRecaptchaSubmit'}.merge options
+      options = { :callback => 'invisibleRecaptchaSubmit' }.merge(options)
       text = options.delete(:text)
-      html, tag_attributes = Recaptcha::ClientHelper.recaptcha_components(options.dup)
+      html, tag_attributes = Recaptcha::ClientHelper.recaptcha_components(options)
       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
@@ -61,27 +61,32 @@ module Recaptcha
       attributes = {}
       fallback_uri = ""
 
-      attributes["class"] = "g-recaptcha #{options.delete(:class)}"
+      # Since leftover options get passed directly through as tag
+      # attributes, we must unconditionally delete all our options
+      options = options.dup
+      env = options.delete(:env)
+      class_attribute = options.delete(:class)
+      site_key = options.delete(:site_key)
+      hl = options.delete(:hl).to_s
+      skip_script = (options.delete(:script) == false)
+      data_attributes = {}
+      [:badge, :theme, :type, :callback, :expired_callback, :size, :tabindex].each do |data_attribute|
+        value = options.delete(data_attribute)
+        data_attributes["data-#{data_attribute.to_s.tr('_', '-')}"] = value if value
+      end
 
-      unless Recaptcha::Verify.skip?(options[:env])
-        site_key = options.delete(:site_key) || Recaptcha.configuration.site_key!
-        hl = options.delete(:hl).to_s
+      unless Recaptcha::Verify.skip?(env)
+        site_key ||= Recaptcha.configuration.site_key!
         script_url = Recaptcha.configuration.api_server_url
         script_url += "?hl=#{hl}" unless hl == ""
-        html << %(<script src="#{script_url}" async defer></script>\n) unless options.delete(:script) == false
+        html << %(<script src="#{script_url}" async defer></script>\n) unless skip_script
         fallback_uri = %(#{script_url.chomp(".js")}/fallback?k=#{site_key})
-
-        # Pull out reCaptcha specific data attributes.
-        [:badge, :theme, :type, :callback, :expired_callback, :size, :tabindex].each do |data_attribute|
-          value = options.delete(data_attribute)
-
-          attributes["data-#{data_attribute.to_s.tr('_', '-')}"] = value if value
-        end
-
         attributes["data-sitekey"] = site_key
+        attributes.merge! data_attributes
       end
 
       # Append whatever that's left of options to be attributes on the tag.
+      attributes["class"] = "g-recaptcha #{class_attribute}"
       tag_attributes = attributes.merge(options).map { |k, v| %(#{k}="#{v}") }.join(" ")
 
       [html, tag_attributes, fallback_uri]

data/lib/recaptcha/rails.rb

@@ -1,10 +1,5 @@
+require 'net/http'
 require 'recaptcha'
 
-module Recaptcha
-  class Railtie < Rails::Railtie
-    initializer :recaptcha do
-      ActionView::Base.send(:include, ::Recaptcha::ClientHelper)
-      ActionController::Base.send(:include, ::Recaptcha::Verify)
-    end
-  end
-end
+ActionView::Base.send(:include, Recaptcha::ClientHelper)
+ActionController::Base.send(:include, Recaptcha::Verify)

data/lib/recaptcha/railtie.rb

@@ -0,0 +1,15 @@
+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

data/lib/recaptcha/verify.rb

@@ -5,7 +5,7 @@ module Recaptcha
     # 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])
 
       model = options[:model]

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "4.6.5".freeze
+  VERSION = "4.6.6.ruby187".freeze
 end

metadata

@@ -1,155 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 4.6.5
+  version: 4.6.6.ruby187
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.10
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
-  name: maxitest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.11.3
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.24.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.24.6
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 description: Helpers for the reCAPTCHA API
 email:
 - jasper@ambethia.com
@@ -164,6 +178,7 @@ files:
 - lib/recaptcha/client_helper.rb
 - lib/recaptcha/configuration.rb
 - lib/recaptcha/rails.rb
+- lib/recaptcha/railtie.rb
 - lib/recaptcha/verify.rb
 - lib/recaptcha/version.rb
 homepage: http://github.com/ambethia/recaptcha
@@ -178,15 +193,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helpers for the reCAPTCHA API