re_captcha 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff6ffb0b40900669efac36740ebcfcc1f9055e2
-  data.tar.gz: bda9557db4b3f23a9fd930b81742222a7450eaeb
+  metadata.gz: 3b6be4701f57286eb1bfe932ac7bebf471f37eb6
+  data.tar.gz: 0b6841f91946cdb29719756b273f3b2711276836
 SHA512:
-  metadata.gz: c8610eff65a759829a7cda08b0e941924d5e11b8ca1c0c053cdf6439f1a97f83e901a47572a356709cb85e00e7edd81d4a4d2ab2bebb46a4241c0414399d7fa1
-  data.tar.gz: a792fa3709ae8f52fee267e214a04311ef4fd2d6c33d0d491a85a938ce01291e3246aa64ea61ef3e329431e4d4802144e3e734b6c3aa25b032c17b8c4fbeb32b
+  metadata.gz: cbe06f3566be335608d60361175c42d86eba4c56cb941efaf4a2877534194773cd613e9ca6c146b75b2c6a20ff70534c948b2deee744d52e7643ebd000307580
+  data.tar.gz: f9758cb1da426973bc0563d82a8ba410dcf48a6418cecb2d7d81a56b78e99f20070880d28d13a9360e22acb19d5a4fe56804cbf3e054e8f706de8d72a47a4b38

data/lib/re_captcha/application.rb

@@ -6,7 +6,7 @@ module ReCaptcha
     include API
 
     def recaptcha_valid?(response, remote_ip: nil, model: nil, message: nil)
-      return true if should_skip_verification?
+      return true if skip_verification?
       params = generate_verification_params(response, remote_ip)
       verification = verify_recaptcha(params)
       valid = verification['success']
@@ -14,11 +14,6 @@ module ReCaptcha
       valid
     end
 
-    def secure_token
-      secure_token_builder = SecureTokenBuilder.new(private_key)
-      secure_token_builder.build
-    end
-
     private
 
     def verify_recaptcha(params)
@@ -29,7 +24,7 @@ module ReCaptcha
       { response: response, secret: private_key, remoteip: remote_ip }
     end
 
-    def should_skip_verification?
+    def skip_verification?
       skipped_env.include? env
     end
 

data/lib/re_captcha/helper.rb

@@ -3,18 +3,28 @@ module ReCaptcha
     def recaptcha_tags(options = {})
       html = ''
       html << %(<div class="g-recaptcha" data-sitekey="#{ReCaptcha.client.public_key}" )
-      html << %(data-stoken="#{ReCaptcha.client.secure_token}" #{tag_attributes(options)}></div>\n)
-      html.respond_to?(:html_safe) ? html.html_safe : html
+      html << %(data-stoken="#{secure_token}" #{tag_attributes(options)}></div>\n)
+      format_html(html)
     end
 
     def recaptcha_script(language: nil)
       html = ''
       html << %(<script src="#{ReCaptcha.client.api_endpoint}api.js#{language_query(language)}" async defer></script>\n)
-      html.respond_to?(:html_safe) ? html.html_safe : html
+      format_html(html)
     end
 
     private
 
+    def format_html(html)
+      html.respond_to?(:html_safe) ? html.html_safe : html
+    end
+
+    def secure_token
+      private_key = ReCaptcha.client.private_key
+      secure_token_builder = SecureTokenBuilder.new(private_key)
+      secure_token_builder.build
+    end
+
     def tag_attributes(theme: 'light', type: 'image', size: 'normal',
       tab_index: 0, callback: nil, expired_callback: nil)
       attributes = ''

data/lib/re_captcha/version.rb

@@ -1,3 +1,3 @@
 module ReCaptcha
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/spec/re_captcha/client_spec.rb

@@ -48,7 +48,6 @@ describe ReCaptcha::Client do
     it { expect(instance).to respond_to(:api_endpoint) }
     it { expect(instance).to respond_to(:skipped_env) }
     it { expect(instance).to respond_to(:recaptcha_valid?) }
-    it { expect(instance).to respond_to(:secure_token) }
 
     describe '#private_key' do
       subject(:private_key) { instance.private_key }
@@ -211,15 +210,5 @@ describe ReCaptcha::Client do
         end
       end
     end
-
-    describe '#secure_token' do
-      let(:secure_token_builder) { instance_double("ReCaptcha::SecureTokenBuilder") }
-
-      it 'delegates to SecureTokenBuilder' do
-        ReCaptcha::SecureTokenBuilder.stub(:new).and_return(secure_token_builder)
-        expect(secure_token_builder).to receive(:build)
-        instance.secure_token
-      end
-    end
   end
 end

data/spec/re_captcha/secure_token_builder_spec.rb

@@ -8,10 +8,18 @@ describe ReCaptcha::SecureTokenBuilder do
     it { expect(instance).to respond_to(:build) }
 
     describe '#build' do
+
       it 'builds a secure token' do
         expect(instance.build).to be_a(String)
         expect(instance.build).not_to be_empty
       end
+
+      it 'builds a token with a correct value' do
+        time = Time.parse("Feb 24 1981")
+        allow(Time).to receive(:now).and_return(time)
+        allow(SecureRandom).to receive(:uuid).and_return('8a180d31-c031-4258-a36f-bc4207f67bef')
+        expect(instance.build).to eq("95ZHArcXmvPlPBc6r95vSj_83vWuXuetY9KfVy4O6AszqvTE_ok6u85L74jMQYmYKtIEqjOJzUgiK9kSjEROQYHleYCsftaXldeLgxeQCFI")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re_captcha
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - David Jeusette