invisible_captcha 0.12.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0904f2d5218d84ee62e3328259b217c7a3772497c8ecf47ed94a34b4bc083f8
-  data.tar.gz: a2e806057b7cbe29927bbb705e342426b666cbc5c6bc823fe97434d912b322cc
+  metadata.gz: 0d931568dd6707074ae2b5f48f6a5552283d482a4d87f27b1c72852dfce3d9cb
+  data.tar.gz: 4e78f33d0a7c4be1a774de1e98e55d7fd2f7ff84e1a407d66a565c6e99779fa9
 SHA512:
-  metadata.gz: 9f0ac495f41f5937859077d758e88884e369aa534d97b595fd4dc560923ce8cb9deb31bd3c487f33d04c82878eeed9ada45508b511e8ff77320d762979f0ea7d
-  data.tar.gz: 953bfa53bf999143d76c45f785e11e80e8fbd44a20fc0182c6d87e009ece31610f9b699049e01e01b6fcfeb887de968a656f1dd437973a5d54e8d43cc6c170bb
+  metadata.gz: 3fbe8b6755bbc31fb26fbf9d71f01b7c9dbe919feaaaf12f78f86f7e53e93bb9f04f52c83469ea59840714908d834abf84625a542e7f55de2b7f0cd1d877986c
+  data.tar.gz: 380701e4ddf138445faafb293ed94fe368d58eb7d995d44b3f871362550d5c2bb27d537d00c04cdf89501bc951ab227d3fe7c721389ba1f163327f4d8093ced4

data/.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 spec/dummy/log/*.log
 spec/dummy/tmp/
 .byebug_history
+.DS_Store

data/.travis.yml

@@ -1,20 +1,17 @@
 language: ruby
 cache: bundler
-sudo: false
 rvm:
   - ruby-head
-  - 2.6.2
-  - 2.5.5
-  - 2.4.5
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
   - 2.3.8
-  - 2.2.10
 gemfile:
   - gemfiles/rails_6.0.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_3.2.gemfile
 before_install:
   # Rails 4.x requires Bundler version < 2.0.
   - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
@@ -22,19 +19,9 @@ before_install:
   - rvm @global do yes | gem install bundler -v '< 2'
 matrix:
   exclude:
-    - rvm: 2.4.5
+    - rvm: 2.4.9
       gemfile: gemfiles/rails_6.0.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: 2.2.10
-      gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.6.2
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.5.5
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails_3.2.gemfile
   allow_failures:
-    - rvm: ruby-head
+    - rvm: ruby-head

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
@@ -17,7 +17,3 @@ end
 appraise "rails-4.2" do
   gem "rails", "~> 4.2.0"
 end
-
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2.0"
-end

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.0]
+
+- New option `prepend: true` for the controller macro (#77)
+
+## [1.0.1]
+
+- Fix naming issue with Ruby 2.7 (#65)
+
+## [1.0.0]
+
+- Remove Ruby 2.2 and Rails 3.2 support
+- Add Instrumentation event (#62)
+
+## [0.13.0]
+
+- Add support for the Content Security Policy nonce (#61)
+- Freeze all strings (#60)
+
+## [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 +119,11 @@ All notable changes to this project will be documented in this file.
 
 - First version of controller filters
 
+[1.1.0]: https://github.com/markets/invisible_captcha/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/markets/invisible_captcha/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/markets/invisible_captcha/compare/v0.13.0...v1.0.0
+[0.13.0]: https://github.com/markets/invisible_captcha/compare/v0.12.2...v0.13.0
+[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/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2017 Marc Anguera Insa
+Copyright 2012-2019 Marc Anguera Insa
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,19 +7,19 @@
 
 Invisible Captcha provides different techniques to protect your application against spambots.
 
-The main protection is a solution based on the `honeypot` principle, which provides a better user experience, since there is no extra steps for real users, but for the bots.
+The main protection is a solution based on the `honeypot` principle, which provides a better user experience since there are no extra steps for real users, only for the bots.
 
 Essentially, the strategy consists on adding an input field :honey_pot: into the form that:
 
 - shouldn't be visible by the real users
 - should be left empty by the real users
-- will most be filled by spam bots
+- will most likely be filled by spam bots
 
 It also comes with a time-sensitive :hourglass: form submission.
 
 ## Installation
 
-Invisible Captcha is tested against Rails `>= 3.2` and Ruby `>= 2.2`.
+Invisible Captcha is tested against Rails `>= 4.2` and Ruby `>= 2.3`.
 
 Add this line to your Gemfile and then execute `bundle install`:
 
@@ -47,7 +47,7 @@ class TopicsController < ApplicationController
 end
 ```
 
-This method will act as a `before_action` that triggers when spam is detected (honeypot field has some value). By default it responds with no content (only headers: `head(200)`). This is a good default, since the bot will surely read the response code and will think that it has achieved to submit the form properly. But, anyway, you are able to define your own callback by passing a method to the `on_spam` option:
+This method will act as a `before_action` that triggers when spam is detected (honeypot field has some value). By default, it responds with no content (only headers: `head(200)`). This is a good default, since the bot will surely read the response code and will think that it has achieved to submit the form properly. But, anyway, you can define your own callback by passing a method to the `on_spam` option:
 
 ```ruby
 class TopicsController < ApplicationController
@@ -61,7 +61,7 @@ class TopicsController < ApplicationController
 end
 ```
 
-Note that is not mandatory to specify a `honeypot` attribute (nor in the view, nor in the controller). In this case, the engine will take a random field from `InvisibleCaptcha.honeypots`. So, if you're integrating it following this path, in your form:
+Note that it is not mandatory to specify a `honeypot` attribute (neither in the view nor in the controller). In this case, the engine will take a random field from `InvisibleCaptcha.honeypots`. So, if you're integrating it following this path, in your form:
 
 ```erb
 <%= form_tag(new_contact_path) do |f| %>
@@ -69,12 +69,32 @@ Note that is not mandatory to specify a `honeypot` attribute (nor in the view, n
 <% end %>
 ```
 
-In you controller:
+In your controller:
 
 ```
 invisible_captcha only: [:new_contact]
 ```
 
+`invisible_captcha` sends all messages to `flash[:error]`. For messages to appear on your pages, add `<%= flash[:error] %>` to `app/views/layouts/application.html.erb` (somewhere near the top of your `<body>` element):
+
+```erb
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Yet another Rails app</title>
+  <%= stylesheet_link_tag    "application", media: "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <%= flash[:error] %>
+  <%= yield %>
+</body>
+</html>
+```
+
+You can place `<%= flash[:error] %>` next to `:alert` and `:notice` message types, if you have them in your `app/views/layouts/application.html.erb`.
+
 ## Options and customization
 
 This section contains a description of all plugin options and customizations.
@@ -84,7 +104,7 @@ This section contains a description of all plugin options and customizations.
 You can customize:
 
 - `sentence_for_humans`: text for real users if input field was visible. By default, it uses I18n (see below).
-- `honeypots`: collection of default honeypots. Used by the view helper, called with no args, to generate a random honeypot field name. By default, a random collection is already generated.
+- `honeypots`: collection of default honeypots. Used by the view helper, called with no args, to generate a random honeypot field name. By default, a random collection is already generated. As the random collection is stored in memory, it will not work if are running multiple Rails instances behind a load balancer. See [Multiple Rails instances](#multiple-rails-instances).
 - `visual_honeypots`: make honeypots visible, also useful to test/debug your implementation.
 - `timestamp_threshold`: fastest time (in seconds) to expect a human to submit the form (see [original article by Yoav Aner](https://blog.gingerlime.com/2012/simple-detection-of-comment-spam-in-rails/) outlining the idea). By default, 4 seconds. **NOTE:** It's recommended to deactivate the autocomplete feature to avoid false positives (`autocomplete="off"`).
 - `timestamp_enabled`: option to disable the time threshold check at application level. Could be useful, for example, on some testing scenarios. By default, true.
@@ -107,6 +127,20 @@ InvisibleCaptcha.setup do |config|
 end
 ```
 
+#### Multiple Rails instances
+
+If you have multiple Rails instances running behind a load balancer, you have to share the same honeypots collection between the instances.
+
+Either use a fixed collection or share them between the instances using `Rails.cache`:
+
+```ruby
+InvisibleCaptcha.setup do |config|
+  config.honeypots = Rails.cache.fetch('invisible_captcha_honeypots') do
+    (1..20).map { InvisibleCaptcha.generate_random_honeypot }
+  end
+end
+```
+
 ### Controller method options:
 
 The `invisible_captcha` method accepts some options:
@@ -119,6 +153,7 @@ The `invisible_captcha` method accepts some options:
 - `timestamp_enabled`: enable/disable this technique at action level.
 - `on_timestamp_spam`: custom callback to be called when form submitted too quickly. The default action redirects to `:back` printing a warning in `flash[:error]`.
 - `timestamp_threshold`: custom threshold per controller/action. Overrides the global value for `InvisibleCaptcha.timestamp_threshold`.
+- `prepend`: the spam detection will run in a `prepend_before_action` if `prepend: true`, otherwise will run in a `before_action`.
 
 ### View helpers options:
 
@@ -145,6 +180,73 @@ You can also pass html options to the input:
 <%= invisible_captcha :subtitle, :topic, id: "your_id", class: "your_class" %>
 ```
 
+### Spam detection notifications
+
+In addition to the `on_spam` controller callback, you can use the [Active Support Instrumentation API](https://guides.rubyonrails.org/active_support_instrumentation.html) to set up a global event handler that fires whenever spam is detected. This is useful for advanced logging, background processing, etc.
+
+To set up a global event handler, [subscribe](https://guides.rubyonrails.org/active_support_instrumentation.html#subscribing-to-an-event) to the `invisible_captcha.spam_detected` event in an initializer:
+
+```ruby
+# config/initializers/invisible_captcha.rb
+
+ActiveSupport::Notifications.subscribe('invisible_captcha.spam_detected') do |*args, data|
+  AwesomeLogger.warn(data[:message], data)  # Log to an external logging service.
+  SpamRequest.create(data)                  # Record the blocked request in your database.
+end
+```
+
+The `data` passed to the subscriber is hash containing information about the request that was detected as spam. For example:
+
+```ruby
+{
+  message: "Invisible Captcha honeypot param 'subtitle' was present.",
+  remote_ip: '127.0.0.1',
+  user_agent: 'Chrome 77',
+  controller: 'users',
+  action: 'create',
+  url: 'http://example.com/users',
+  params: {
+    topic: { subtitle: 'foo' },
+    controller: 'users',
+    action: 'create'
+  }
+}
+```
+
+_**Note:** `params` will be filtered according to your `Rails.application.config.filter_parameters` configuration, making them (probably) safe for logging. But always double-check that you're not inadvertently logging sensitive form data, like passwords and credit cards._
+
+### Content Security Policy
+
+If you're using a Content Security Policy (CSP) in your Rails app, you will need to generate a nonce on the server, and pass `nonce: true` attribute to the view helper. Uncomment the following lines in your `config/initializers/content_security_policy.rb` file:
+
+```ruby
+# Be sure to restart your server when you modify this file.
+
+# If you are using UJS then enable automatic nonce generation
+Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Set the nonce only to specific directives
+Rails.application.config.content_security_policy_nonce_directives = %w(style-src)
+```
+Note that if you are already generating nonce for scripts, you'd have to include `script-src` to `content_security_policy_nonce_directives` as well:
+
+```ruby
+Rails.application.config.content_security_policy_nonce_directives = %w(script-src style-src)
+```
+
+And in your view helper, you need to pass `nonce: true` to the `invisible_captcha` helper:
+
+```erb
+<%= invisible_captcha nonce: true %>
+```
+
+**WARNING:** Content Security Policy can break your site! If you already run a website with third-party scripts, styles, images, and fonts, it is highly recommended to enable CSP in report-only mode and observe warnings as they appear. Learn more at MDN:
+
+* https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
+* https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+Note that Content Security Policy only works on Rails 5.2 and up.
+
 ### I18n
 
 `invisible_captcha` tries to use I18n when it's available by default. The keys it looks for are the following:
@@ -156,17 +258,20 @@ en:
     timestamp_error_message: "Sorry, that was too quick! Please resubmit."
 ```
 
-You can override the english ones in your own i18n config files as well as add new ones for other locales.
+You can override the English ones in your i18n config files as well as add new ones for other locales.
 
 If you intend to use I18n with `invisible_captcha`, you _must not_ set `sentence_for_humans` or `timestamp_error_message` to strings in the setup phase.
 
 ## Testing your controllers
 
-If you're encountering unexpected behaviour while testing controllers that use the `invisible_captcha` action filter, you may want to disable timestamp check for the test environment:
+If you're encountering unexpected behaviour while testing controllers that use the `invisible_captcha` action filter, you may want to disable timestamp check for the test environment. Add the following snippet to the `config/initializers/invisible_captcha.rb` file:
 
 ```ruby
-# test/test_helper.rb, spec/rails_helper.rb, ...
-InvisibleCaptcha.timestamp_enabled = false
+# Be sure to restart your server when you modify this file.
+
+InvisibleCaptcha.setup do |config|
+  config.timestamp_enabled = !Rails.env.test?
+end
 ```
 
 Another option is to wait for the timestamp check to be valid:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 

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/invisible_captcha.gemspec

@@ -15,11 +15,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '>= 3.2.0'
+  spec.add_dependency 'rails', '>= 4.2'
 
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'test-unit', '~> 3.0'
-  spec.add_development_dependency 'byebug'
 end
-

data/lib/invisible_captcha.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'invisible_captcha/version'
 require 'invisible_captcha/controller_ext'
 require 'invisible_captcha/view_helpers'

data/lib/invisible_captcha/controller_ext.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module InvisibleCaptcha
   module ControllerExt
     module ClassMethods
       def invisible_captcha(options = {})
-        if respond_to?(:before_action)
-          before_action(options) do
+        if options.key?(:prepend)
+          prepend_before_action(options) do
             detect_spam(options)
           end
         else
-          before_filter(options) do
+          before_action(options) do
             detect_spam(options)
           end
         end
@@ -22,8 +24,6 @@ module InvisibleCaptcha
       elsif honeypot_spam?(options)
         on_spam(options)
       end
-
-      clear_session
     end
 
     def on_timestamp_spam(options = {})
@@ -55,28 +55,24 @@ 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
-        warn("Invisible Captcha timestamp not found in session.")
+      unless @invisible_captcha_timestamp
+        warn_spam("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
       if time_to_submit < threshold
-        warn("Invisible Captcha timestamp threshold not reached (took #{time_to_submit.to_i}s).")
+        warn_spam("Invisible Captcha timestamp threshold not reached (took #{time_to_submit.to_i}s).")
         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 = {})
@@ -88,7 +84,7 @@ module InvisibleCaptcha
         # - honeypot: params[:subtitle]
         # - honeypot with scope: params[:topic][:subtitle]
         if params[honeypot].present? || (params[scope] && params[scope][honeypot].present?)
-          warn("Invisible Captcha honeypot param '#{honeypot}' was present.")
+          warn_spam("Invisible Captcha honeypot param '#{honeypot}' was present.")
           return true
         else
           # No honeypot spam detected, remove honeypot from params to avoid UnpermittedParameters exceptions
@@ -98,7 +94,7 @@ module InvisibleCaptcha
       else
         InvisibleCaptcha.honeypots.each do |default_honeypot|
           if params[default_honeypot].present?
-            warn("Invisible Captcha honeypot param '#{default_honeypot}' was present.")
+            warn_spam("Invisible Captcha honeypot param '#{default_honeypot}' was present.")
             return true
           end
         end
@@ -107,8 +103,19 @@ module InvisibleCaptcha
       false
     end
 
-    def warn(message)
+    def warn_spam(message)
       logger.warn("Potential spam detected for IP #{request.remote_ip}. #{message}")
+
+      ActiveSupport::Notifications.instrument(
+        'invisible_captcha.spam_detected',
+        message: message,
+        remote_ip: request.remote_ip,
+        user_agent: request.user_agent,
+        controller: params[:controller],
+        action: params[:action],
+        url: request.url,
+        params: request.filtered_parameters
+      )
     end
   end
 end

data/lib/invisible_captcha/form_helpers.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module InvisibleCaptcha
   module FormHelpers
     def invisible_captcha(honeypot, options = {})
       @template.invisible_captcha(honeypot, self.object_name, options)
     end
   end
-end
+end

data/lib/invisible_captcha/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InvisibleCaptcha
   class Railtie < Rails::Railtie
     initializer 'invisible_captcha.rails_integration' do

data/lib/invisible_captcha/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InvisibleCaptcha
-  VERSION = "0.12.1"
+  VERSION = "1.1.0"
 end

data/lib/invisible_captcha/view_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InvisibleCaptcha
   module ViewHelpers
     # Builds the honeypot html
@@ -54,7 +56,13 @@ module InvisibleCaptcha
 
       return if visible
 
-      content_tag(:style, media: 'screen') do
+      nonce = if Rails.version >= '5.2'
+                content_security_policy_nonce if options[:nonce]
+              else
+                nil
+              end
+
+      content_tag(:style, media: 'screen', nonce: nonce) do
         ".#{css_class} {#{InvisibleCaptcha.css_strategy}}"
       end
     end

data/spec/controllers_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
   render_views
 
   def switchable_post(action, params = {})
-    if ::Rails::VERSION::STRING > '5'
+    if Rails.version > '5'
       post action, params: params
     else
       post action, params
@@ -10,7 +12,7 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
   end
 
   def switchable_put(action, params = {})
-    if ::Rails::VERSION::STRING > '5'
+    if Rails.version > '5'
       put action, params: params
     else
       put action, params
@@ -63,12 +65,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
@@ -128,5 +143,43 @@ RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
       expect(flash[:error]).not_to be_present
       expect(@controller.params[:topic].key?(:subtitle)).to eq(false)
     end
+
+    describe 'ActiveSupport::Notifications' do
+      let(:dummy_handler) { double(handle_event: nil) }
+
+      let!(:subscriber) do
+        subscriber = ActiveSupport::Notifications.subscribe('invisible_captcha.spam_detected') do |*args, data|
+          dummy_handler.handle_event(data)
+        end
+
+        subscriber
+      end
+
+      after  { ActiveSupport::Notifications.unsubscribe(subscriber) }
+
+      it 'dispatches an `invisible_captcha.spam_detected` event' do
+        # Skip the `with` matcher for Rails < 5 due to issues comparing arguments passed to / recived by the dummy event handler.
+        # https://github.com/markets/invisible_captcha/pull/62#issuecomment-552218501
+        if Rails.version > '5'
+          expect(dummy_handler).to receive(:handle_event).once.with(
+            message: "Invisible Captcha honeypot param 'subtitle' was present.",
+            remote_ip: '0.0.0.0',
+            user_agent: 'Rails Testing',
+            controller: 'topics',
+            action: 'create',
+            url: 'http://test.host/topics',
+            params: {
+              topic: { subtitle: "foo"},
+              controller: 'topics',
+              action: 'create'
+            }
+          )
+        else
+          expect(dummy_handler).to receive(:handle_event).once
+        end
+
+        switchable_post :create, topic: { subtitle: 'foo' }
+      end
+    end
   end
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/config/environments/test.rb

@@ -39,4 +39,4 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-end
+end

data/spec/invisible_captcha_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe InvisibleCaptcha do
   it 'initialize with defaults' do
     InvisibleCaptcha.init!

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
@@ -5,6 +7,9 @@ require 'rspec/rails'
 require 'invisible_captcha'
 
 RSpec.configure do |config|
+  if Rails.version >= '5.2'
+    config.include ActionDispatch::ContentSecurityPolicy::Request, type: :helper
+  end
   config.disable_monkey_patching!
   config.order = :random
   config.expect_with :rspec

data/spec/view_helpers_spec.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
 RSpec.describe InvisibleCaptcha::ViewHelpers, type: :helper do
   before(:each) do
     allow(Time.zone).to receive(:now).and_return(Time.zone.parse('Feb 19 1986'))
     allow(InvisibleCaptcha).to receive(:css_strategy).and_return("display:none;")
 
+    if Rails.version >= '5.2'
+      allow_any_instance_of(ActionDispatch::ContentSecurityPolicy::Request).to receive(:content_security_policy_nonce).and_return('123')
+    end
+
     # to test content_for and provide
     @view_flow = ActionView::OutputFlow.new
 
@@ -26,6 +32,12 @@ RSpec.describe InvisibleCaptcha::ViewHelpers, type: :helper do
     expect(invisible_captcha(:subtitle, :topic, { class: 'foo_class' })).to match(/class="foo_class"/)
   end
 
+  if Rails.version >= '5.2'
+    it 'with CSP nonce' do
+      expect(invisible_captcha(:subtitle, :topic, { nonce: true })).to match(/nonce="123"/)
+    end
+  end
+
   it 'generated html + styles' do
     InvisibleCaptcha.honeypots = [:foo_id]
     output = invisible_captcha.gsub("\"", "'")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_captcha
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Marc Anguera Insa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Unobtrusive, flexible and simple spam protection for Rails applications
   using honeypot strategy for better user experience.
 email:
@@ -97,7 +69,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
@@ -113,6 +84,7 @@ files:
 - spec/controllers_spec.rb
 - spec/dummy/README.md
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -180,6 +152,7 @@ test_files:
 - spec/controllers_spec.rb
 - spec/dummy/README.md
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb

data/gemfiles/rails_3.2.gemfile

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