invisible_captcha 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15e5223696c06e82c8ab6182a4396a9e4e4bf3acd6e425296e60cc6b49cb225
-  data.tar.gz: e35b51231012ae92b236f81eb1966a16ea3c7b02862d03977bf23478d968538d
+  metadata.gz: b054e8cc12c7c543111eabaa13c46e4ec94d99200bf8fb189d6d1284568f9b3a
+  data.tar.gz: 11c94f7e36b4c2892c9def7ab86b5fcb560005fdc0c68b5beef3971eb065950c
 SHA512:
-  metadata.gz: ccc4299595595e513fa8f8eb472233b83fa334608b3cd4fcba3d1316b8f1819d83e7cc3d2678dce0ac954c52a4b90ecf0643424d0358cd8dd3412c4aa04ac391
-  data.tar.gz: 1fcceba58cb21d931e6d8f7f49a3a1649230628442e18f3664a80d5ac983dbec0bc5caeeda17cacc748bfbfabce93bd189f695bc0d123d4bd2ef0d94a20cdb3e
+  metadata.gz: eea98bc58a674b4daa961a5fc3bb5edafbfef74034ed06364684993d96802a7bd8c169507f208b635ba24b09fc0e0b69039f964babd874e1104ae9a29c1dc2ee
+  data.tar.gz: 710d6bf3c780d91525dca60566db5f20f564f784e27223af0ab9342fb95d1bc507e4bdafe687cdacd60b7496f547a5f81653b6a7ebfcca0425fd2de53a13adba

data/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["2.7", "3.0", "3.1", "3.2"]
-        gemfile: [rails_6.0, rails_6.1, rails_7.0]
+        gemfile: [rails_6.0, rails_6.1, rails_7.0, rails_7.1]
         exclude:
           - ruby: "3.1"
             gemfile: rails_6.0

data/Appraisals

@@ -1,4 +1,5 @@
 %w(
+  7.1
   7.0
   6.1
   6.0

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2.0]
+
+- Official support for Rails 7.1
+- Fix flash message for `on_timestamp_spam` callback (#125)
+- Fix potential error when lookup the honeypot parameter using (#128)
+
 ## [2.1.0]
 
 - Drop official support for EOL Rubies: 2.5 and 2.6
@@ -130,6 +136,7 @@ All notable changes to this project will be documented in this file.
 
 - First version of controller filters
 
+[2.2.0]: https://github.com/markets/invisible_captcha/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/markets/invisible_captcha/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/markets/invisible_captcha/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/markets/invisible_captcha/compare/v1.0.1...v1.1.0

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"

data/lib/invisible_captcha/controller_ext.rb

@@ -30,7 +30,8 @@ module InvisibleCaptcha
       if action = options[:on_timestamp_spam]
         send(action)
       else
-        redirect_back(fallback_location: root_path, flash: { error: InvisibleCaptcha.timestamp_error_message })
+        flash[:error] = InvisibleCaptcha.timestamp_error_message
+        redirect_back(fallback_location: root_path)
       end
     end
 
@@ -88,7 +89,7 @@ module InvisibleCaptcha
         # If honeypot is defined for this controller-action, search for:
         # - honeypot: params[:subtitle]
         # - honeypot with scope: params[:topic][:subtitle]
-        if params[honeypot].present? || params.dig(scope, honeypot).present?
+        if params[honeypot].present? || (params[scope] && params[scope][honeypot].present?)
           warn_spam("Honeypot param '#{honeypot}' was present.")
           return true
         else
@@ -98,7 +99,7 @@ module InvisibleCaptcha
         end
       else
         InvisibleCaptcha.honeypots.each do |default_honeypot|
-          if params[default_honeypot].present? || params.dig(scope, default_honeypot).present?
+          if params[default_honeypot].present? || (params[scope] && params[scope][default_honeypot].present?)
             warn_spam("Honeypot param '#{scope}.#{default_honeypot}' was present.")
             return true
           end

data/lib/invisible_captcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InvisibleCaptcha
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/controllers_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
         }
 
         expect(flash[:error]).not_to be_present
-        expect(response.body).to be_present
+        expect(response.body).to redirect_to(new_topic_path)
 
         # Make sure session is cleared
         expect(session[:invisible_captcha_timestamp]).to be_nil
@@ -96,7 +96,7 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
         post :publish, params: { id: 1 }
 
         expect(flash[:error]).not_to be_present
-        expect(response.body).to be_present
+        expect(response.body).to redirect_to(new_topic_path)
       end
     end
   end
@@ -126,13 +126,13 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
         it 'passes with no spam' do
           post :categorize, params: { topic: { title: 'foo' } }
 
-          expect(response.body).to be_present
+          expect(response.body).to redirect_to(new_topic_path)
         end
 
         it 'fails with spam' do
           post :categorize, params: { topic: { "#{InvisibleCaptcha.honeypots.sample}": 'foo' } }
 
-          expect(response.body).to be_blank
+          expect(response.body).not_to redirect_to(new_topic_path)
         end
       end
 
@@ -140,13 +140,13 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
         it 'passes with no spam' do
           post :categorize
 
-          expect(response.body).to be_present
+          expect(response.body).to redirect_to(new_topic_path)
         end
 
         it 'fails with spam' do
           post :categorize, params: { "#{InvisibleCaptcha.honeypots.sample}": 'foo' }
 
-          expect(response.body).to be_blank
+          expect(response.body).not_to redirect_to(new_topic_path)
         end
       end
 

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
+  <title>InvisibleCaptcha Demo</title>
   <%= stylesheet_link_tag "/styles.css" %>
   <%= csrf_meta_tags %>
   <%= invisible_captcha_styles %>
@@ -24,5 +24,11 @@
   <% end %>
 
   <%= yield %>
+
+  <footer>
+    Running on
+    <b>Ruby <%= RUBY_VERSION %></b> and
+    <b>Rails <%= Rails.version %></b>
+  </footer>
   </body>
 </html>

data/spec/dummy/public/styles.css

@@ -31,6 +31,15 @@ button {
   font-size: 1em;
 }
 
+footer {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  padding: 1em 0;
+  font-size: 0.8em;
+  background-color: #ccc;
+}
+
 .errors {
   color: darkred;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_captcha
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Marc Anguera Insa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,6 +115,7 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
 - invisible_captcha.gemspec
 - lib/invisible_captcha.rb
 - lib/invisible_captcha/controller_ext.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Honeypot spam protection for Rails