invisible_captcha 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0904f2d5218d84ee62e3328259b217c7a3772497c8ecf47ed94a34b4bc083f8
-  data.tar.gz: a2e806057b7cbe29927bbb705e342426b666cbc5c6bc823fe97434d912b322cc
+  metadata.gz: 5011fee9db065c86faf1507c11e0d3000ad61e19d05e7102e8bcf3750abcd52f
+  data.tar.gz: bd104ffe4aeb3436c1d365a293c66f80d9d2e42c543b009ea596ac83d9a84db2
 SHA512:
-  metadata.gz: 9f0ac495f41f5937859077d758e88884e369aa534d97b595fd4dc560923ce8cb9deb31bd3c487f33d04c82878eeed9ada45508b511e8ff77320d762979f0ea7d
-  data.tar.gz: 953bfa53bf999143d76c45f785e11e80e8fbd44a20fc0182c6d87e009ece31610f9b699049e01e01b6fcfeb887de968a656f1dd437973a5d54e8d43cc6c170bb
+  metadata.gz: e1c5608b8671bfef9edfec01531f575fe3a83c12a00dd72090a772686f2fef56ab6436e323dc7ca7daa1b82d30764ca03a2f89d6727145f593d377d1c057fe51
+  data.tar.gz: 811827be3f2a2bd4a18a1004377605c8db09c1279658371d2191e27226afd6557235c8747a5c39ec82a65bc443bb4590dcced9fff96d8be4fba946d21a07a50d

data/Appraisals

@@ -1,5 +1,5 @@
 appraise "rails-6.0" do
-  gem "rails", "6.0.0.rc1"
+  gem "rails", "~> 6.0.0"
 end
 
 appraise "rails-5.2" do
@@ -20,4 +20,4 @@ end
 
 appraise "rails-3.2" do
   gem "rails", "~> 3.2.0"
-end
+end

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.2]
+
+- Allow new timestamp to be set during `on_timestamp_spam` callback (#53)
+
 ## [0.12.1]
 
 - Clear timestamp stored in `session[:invisible_captcha_timestamp]` (#50)
@@ -97,6 +101,7 @@ All notable changes to this project will be documented in this file.
 
 - First version of controller filters
 
+[0.12.2]: https://github.com/markets/invisible_captcha/compare/v0.12.1...v0.12.2
 [0.12.1]: https://github.com/markets/invisible_captcha/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/markets/invisible_captcha/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/markets/invisible_captcha/compare/v0.10.0...v0.11.0

data/gemfiles/rails_6.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "6.0.0.rc1"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/invisible_captcha/controller_ext.rb

@@ -22,8 +22,6 @@ module InvisibleCaptcha
       elsif honeypot_spam?(options)
         on_spam(options)
       end
-
-      clear_session
     end
 
     def on_timestamp_spam(options = {})
@@ -55,15 +53,15 @@ module InvisibleCaptcha
 
       return false unless enabled
 
-      timestamp = session[:invisible_captcha_timestamp]
+      @invisible_captcha_timestamp ||= session.delete(:invisible_captcha_timestamp)
 
       # Consider as spam if timestamp not in session, cause that means the form was not fetched at all
-      unless timestamp
+      unless @invisible_captcha_timestamp
         warn("Invisible Captcha timestamp not found in session.")
         return true
       end
 
-      time_to_submit = Time.zone.now - DateTime.iso8601(timestamp)
+      time_to_submit = Time.zone.now - DateTime.iso8601(@invisible_captcha_timestamp)
       threshold = options[:timestamp_threshold] || InvisibleCaptcha.timestamp_threshold
 
       # Consider as spam if form submitted too quickly
@@ -72,11 +70,7 @@ module InvisibleCaptcha
         return true
       end
 
-      false
-    end
-
-    def clear_session
-      session.delete(:invisible_captcha_timestamp) if session[:invisible_captcha_timestamp]
+      return false
     end
 
     def honeypot_spam?(options = {})

data/lib/invisible_captcha/version.rb

@@ -1,3 +1,3 @@
 module InvisibleCaptcha
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/spec/controllers_spec.rb

@@ -63,12 +63,25 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
       expect(session[:invisible_captcha_timestamp]).to be_nil
     end
 
-    it 'allow a custom on_timestamp_spam callback' do
+    it 'allows a custom on_timestamp_spam callback' do
       switchable_put :update, id: 1, topic: { title: 'bar' }
 
       expect(response.status).to eq(204)
     end
 
+    it 'allows a new timestamp to be set in the on_timestamp_spam callback' do
+      @controller.singleton_class.class_eval do
+        def custom_timestamp_callback
+          session[:invisible_captcha_timestamp] = 2.seconds.from_now(Time.zone.now).iso8601
+          head(204)
+        end
+      end
+
+      expect { switchable_put :update, id: 1, topic: { title: 'bar' } }
+        .to change { session[:invisible_captcha_timestamp] }
+        .to be_present
+    end
+
     context 'successful submissions' do
       it 'passes if submission on or after timestamp_threshold' do
         sleep InvisibleCaptcha.timestamp_threshold

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_captcha
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Marc Anguera Insa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails