invisible_captcha 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69fb2a8c65477376dbea0a7162151d6c100282dc
-  data.tar.gz: b5f5134aff6f55b7d766972151ce85194cadd3e6
+SHA256:
+  metadata.gz: f0904f2d5218d84ee62e3328259b217c7a3772497c8ecf47ed94a34b4bc083f8
+  data.tar.gz: a2e806057b7cbe29927bbb705e342426b666cbc5c6bc823fe97434d912b322cc
 SHA512:
-  metadata.gz: 390075abc680625ac3eee6b237765336554c5e7eec9c06acb368aa1b7f403ef4c1fc8b7ff21170fde71217b7704dc85b4d797e2f4760c9e255a464c7367deda5
-  data.tar.gz: be7d59009de1f3d70485fc19dd6e3bb5b8f0537a5f2e51b879a33ff8a4de9d7832bc81583ca3cf2f5f229ddd1fdde8c54f0e1201127a4e6941974b410f0127b2
+  metadata.gz: 9f0ac495f41f5937859077d758e88884e369aa534d97b595fd4dc560923ce8cb9deb31bd3c487f33d04c82878eeed9ada45508b511e8ff77320d762979f0ea7d
+  data.tar.gz: 953bfa53bf999143d76c45f785e11e80e8fbd44a20fc0182c6d87e009ece31610f9b699049e01e01b6fcfeb887de968a656f1dd437973a5d54e8d43cc6c170bb

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -3,23 +3,38 @@ cache: bundler
 sudo: false
 rvm:
   - ruby-head
-  - 2.5.1
-  - 2.4.4
-  - 2.3.6
-  - 2.2.9
+  - 2.6.2
+  - 2.5.5
+  - 2.4.5
+  - 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"
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do yes | gem install bundler -v '< 2'
 matrix:
   exclude:
+    - rvm: 2.4.5
+      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.5.1
+    - rvm: 2.6.2
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.4.4
+    - 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

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "rails-6.0" do
+  gem "rails", "6.0.0.rc1"
+end
+
 appraise "rails-5.2" do
   gem "rails", "~> 5.2.0"
 end
@@ -11,7 +15,7 @@ appraise "rails-5.0" do
 end
 
 appraise "rails-4.2" do
-  gem "rails", github: 'rails/rails', branch: '4-2-stable'
+  gem "rails", "~> 4.2.0"
 end
 
 appraise "rails-3.2" do

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.1]
+
+- Clear timestamp stored in `session[:invisible_captcha_timestamp]` (#50)
+- Rails 6 support
+
 ## [0.12.0]
 
 - Honeypot input with autocomplete="off" by default (#42)
@@ -92,6 +97,7 @@ All notable changes to this project will be documented in this file.
 
 - First version of controller filters
 
+[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
 [0.10.0]: https://github.com/markets/invisible_captcha/compare/v0.9.3...v0.10.0

data/README.md

@@ -21,18 +21,12 @@ It also comes with a time-sensitive :hourglass: form submission.
 
 Invisible Captcha is tested against Rails `>= 3.2` and Ruby `>= 2.2`.
 
-Add this line to you Gemfile:
+Add this line to your Gemfile and then execute `bundle install`:
 
-```
+```ruby
 gem 'invisible_captcha'
 ```
 
-Or install the gem manually:
-
-```
-$ gem install invisible_captcha
-```
-
 ## Usage
 
 View code:
@@ -166,6 +160,26 @@ You can override the english ones in your own i18n config files as well as add n
 
 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:
+
+```ruby
+# test/test_helper.rb, spec/rails_helper.rb, ...
+InvisibleCaptcha.timestamp_enabled = false
+```
+
+Another option is to wait for the timestamp check to be valid:
+
+```ruby
+# Maybe in a before block
+InvisibleCaptcha.init!
+InvisibleCaptcha.timestamp_threshold = 1
+
+# Before testing your controller action
+sleep InvisibleCaptcha.timestamp_threshold
+```
+
 ## Contribute
 
 Any kind of idea, feedback or bug report are welcome! Open an [issue](https://github.com/markets/invisible_captcha/issues) or send a [pull request](https://github.com/markets/invisible_captcha/pulls).

data/gemfiles/rails_3.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", :github => "rails/rails", :branch => "4-2-stable"
+gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

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

data/lib/invisible_captcha/controller_ext.rb

@@ -22,6 +22,8 @@ module InvisibleCaptcha
       elsif honeypot_spam?(options)
         on_spam(options)
       end
+
+      clear_session
     end
 
     def on_timestamp_spam(options = {})
@@ -73,6 +75,10 @@ module InvisibleCaptcha
       false
     end
 
+    def clear_session
+      session.delete(:invisible_captcha_timestamp) if session[:invisible_captcha_timestamp]
+    end
+
     def honeypot_spam?(options = {})
       honeypot = options[:honeypot]
       scope    = options[:scope] || controller_name.singularize

data/lib/invisible_captcha/version.rb

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

data/spec/controllers_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe InvisibleCaptcha::ControllerExt, type: :controller do
+RSpec.describe InvisibleCaptcha::ControllerExt, type: :controller do
   render_views
 
   def switchable_post(action, params = {})
@@ -60,6 +58,9 @@ describe InvisibleCaptcha::ControllerExt, type: :controller do
 
       expect(response).to redirect_to 'http://test.host/topics'
       expect(flash[:error]).to eq(InvisibleCaptcha.timestamp_error_message)
+
+      # Make sure session is cleared
+      expect(session[:invisible_captcha_timestamp]).to be_nil
     end
 
     it 'allow a custom on_timestamp_spam callback' do
@@ -72,10 +73,17 @@ describe InvisibleCaptcha::ControllerExt, type: :controller do
       it 'passes if submission on or after timestamp_threshold' do
         sleep InvisibleCaptcha.timestamp_threshold
 
-        switchable_post :create, topic: { title: 'foo' }
+        switchable_post :create, topic: {
+          title: 'foobar',
+          author: 'author',
+          body: 'body that passes validation'
+        }
 
         expect(flash[:error]).not_to be_present
         expect(response.body).to be_present
+
+        # Make sure session is cleared
+        expect(session[:invisible_captcha_timestamp]).to be_nil
       end
 
       it 'allow to set a custom timestamp_threshold per action' do

data/spec/invisible_captcha_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe InvisibleCaptcha do
+RSpec.describe InvisibleCaptcha do
   it 'initialize with defaults' do
     InvisibleCaptcha.init!
 

data/spec/spec_helper.rb

@@ -1,12 +1,28 @@
 ENV['RAILS_ENV'] = 'test'
+
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'invisible_captcha'
 
 RSpec.configure do |config|
-  config.order = 'random'
+  config.disable_monkey_patching!
+  config.order = :random
   config.expect_with :rspec
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
 end
+
+# Rails 4.2 call `initialize` inside `recycle!`. However Ruby 2.6 doesn't allow calling `initialize` twice.
+# More info: https://github.com/rails/rails/issues/34790
+if RUBY_VERSION >= "2.6.0" && Rails.version < "5"
+  module ActionController
+    class TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        @mon_mutex_owner_object_id = nil
+        @mon_mutex = nil
+        initialize
+      end
+    end
+  end
+end

data/spec/view_helpers_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe InvisibleCaptcha::ViewHelpers, type: :helper do
+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;")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_captcha
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Marc Anguera Insa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -101,6 +102,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - invisible_captcha.gemspec
 - lib/invisible_captcha.rb
 - lib/invisible_captcha/controller_ext.rb
@@ -170,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple honeypot protection for RoR apps