recaptcha 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0d1a72cc8afa953bf825eb56110bac7c2504f9
-  data.tar.gz: 8dd5b6d14ec70ff852a331e7f561669c79f89c1a
+  metadata.gz: 93857dd1ee9d0a3067af8e75804074f6f06ce25f
+  data.tar.gz: 66df686d1d1218dd05f46102aeec67a0766d4fe2
 SHA512:
-  metadata.gz: 1b473d5e4f2e2d44f395b649bfc1f8eb191689e8ceab3ddbd02a2a97de8cf22a601157ac3a59ff5d6aeaa7f333530ffe351a99fd3eb0b7624e11c528db21a12b
-  data.tar.gz: d5b92c45ab72e016bfa6b0052de795a884eba337e456cd4dd89261de46a4f5428bd5aac70e6ae9106fd71794e4afdd7cf3971cad110761a225343396ee36104f
+  metadata.gz: 3612a091d44d54f188ae6a7160337cc00413e9b009030fc18c1d2e609e27af65c953cd559363c326a274eed7fc7b082d70d7204bcae3c8731fd6fdb62359eae9
+  data.tar.gz: 74a2554d27922dbf8d4e8c612148eb4b181a2fcf79a85e7e171242d21f13a5917698303c87969f33f40ada0b24969be5be67f29d9e13d9f144ef35d7ff4f0958

data/lib/recaptcha/verify.rb

@@ -6,28 +6,20 @@ module Recaptcha
     # using the Configuration.
     def verify_recaptcha(options = {})
       options = {:model => options} unless options.is_a? Hash
-      model = options[:model]
-      attribute = options[:attribute] || :base
-
       return true if Recaptcha::Verify.skip?(options[:env])
 
-      private_key = options[:private_key] || Recaptcha.configuration.private_key!
+      model = options[:model]
+      attribute = options[:attribute] || :base
       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'])
-        verify_hash = {
-          "secret"    => private_key,
-          "remoteip"  => remote_ip.to_s,
-          "response"  => recaptcha_response
-        }
-
-        raw_reply = Recaptcha.get(verify_hash, options)
-        reply = JSON.parse(raw_reply)
-        answer = reply['success']
+        verified = if recaptcha_response.empty?
+          false
+        else
+          recaptcha_verify_via_api_call(request, recaptcha_response, options)
+        end
 
-        if hostname_valid?(reply['hostname'], options[:hostname]) && answer.to_s == 'true'
+        if verified
           flash.delete(:recaptcha_error) if recaptcha_flash_supported? && !model
           true
         else
@@ -64,7 +56,22 @@ module Recaptcha
 
     private
 
-    def hostname_valid?(hostname, validation)
+    def recaptcha_verify_via_api_call(request, recaptcha_response, options)
+      private_key = options[:private_key] || Recaptcha.configuration.private_key!
+      remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
+
+      verify_hash = {
+        "secret"    => private_key,
+        "remoteip"  => remote_ip.to_s,
+        "response"  => recaptcha_response
+      }
+
+      reply = JSON.parse(Recaptcha.get(verify_hash, options))
+      reply['success'].to_s == "true" &&
+        recaptcha_hostname_valid?(reply['hostname'], options[:hostname])
+    end
+
+    def recaptcha_hostname_valid?(hostname, validation)
       case validation
       when nil, FalseClass then true
       when String then validation == hostname

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json