acts_as_textcaptcha 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b2f39dcac098efd1d5cffccf5e963cff7e3c3c63
-  data.tar.gz: 433df07a2b0d681f25d5484a24081bfaa0e918c4
+SHA256:
+  metadata.gz: 3a465a05115f3c4c3730aaa5e17ff43ce4167dee5ba269c54ea23c45613a7fcf
+  data.tar.gz: 00ab7bf7dadf2c90f623e1a668be1bef30b941bfd67c4abcf54e9a5b5679658e
 SHA512:
-  metadata.gz: 27b234f2a1935fbfc23835e18d88a145193daa8177120812a6b4b8faa21974fbe3e19d1b1485634383363d9198b4d75c479151dbec02eb1ae6ebf519a85541a1
-  data.tar.gz: d308be3a0e327e4c121fed11a7f827cef33617cea5f1dce197dd248b572869e862c74433efb8aaa2151e34b6667c03c1454dfc2936aa5d35f99db747f84b2e8c
+  metadata.gz: 476c04ecc39f85a54b8f4dd2f3420579ada995553eb841ad39cdde9b534557b9f61d0d5579ab9db568ce0d8a6aa4e82838741943e1d6551f3b35f5551dc13aa0
+  data.tar.gz: 85fa6bdb42b013190232ed5d970a817e7a6fb142b7a40ab1d4c4ed57f2ee03a6592342097db1c7ccfe9826a8ecc95fed332fe737f5ce3b10b8cc33d99c2f6269

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/gemfiles/vendor/bundle
 /.yardoc
 /Gemfile.lock
 /_yardoc/
@@ -7,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gemfile.lock

data/.travis.yml

@@ -1,13 +1,25 @@
 sudo: false
 language: ruby
-before_install:
-  - mkdir -p ./tmp/test_db
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
 rvm:
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-
-branches:
-  except:
-    - gh-pages
+- 2.2.9
+- 2.3.6
+- 2.4.3
+- 2.5.0
+matrix:
+  exclude:
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.gemfile
+before_install:
+  - gem update --system
+deploy:
+  provider: rubygems
+  api_key:
+    secure: AUJy9JSNrNcJcZc6JQErh1LtmHrdQBk1W0DYVT0soyBEx5hbKKoIympmrlh9VcZxNpbLfbuCdxl2C0nWMembwx71tLytvM76BqoU2KKTxQQLju8SUAyzGQabkNHr0mzpUDQiC4L16c5k+voCkWtptGkxiVq6eDZExBSzDM8cVMk=
+  gem: acts_as_textcaptcha
+  on:
+    tags: true
+    repo: matthutchinson/acts_as_textcaptcha

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails-3" do
+  gem "rails", "3.2.22.5"
+end
+
+appraise "rails-4" do
+  gem "rails", "4.2.10"
+end
+
+appraise "rails-5" do
+  gem "rails", "5.1.4"
+end

data/CHANGELOG.md

@@ -7,6 +7,11 @@ project adheres to [Semantic Versioning][Semver].
 
   * Your contribution here!
 
+## [4.2.0][] (17 Jan 2018)
+  * Updated Rubies for Travis CI
+  * Update tests to remove MiniTest warnings
+  * Latest Rails (~> 5.1.4) now set in gemspec
+
 ## [4.1.3][] (28 May 2016)
   * Updated gem dependencies
   * Switched from FakeWeb to Webmock
@@ -35,7 +40,8 @@ project adheres to [Semantic Versioning][Semver].
 
 (further change log details for older releases are unavailable)
 
-[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.1.3...HEAD
+[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.2.0...HEAD
+[4.1.3]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.1.3...v4.2.0
 [4.1.3]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.1.2...v4.1.3
 [4.1.2]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.1.1...v4.1.2
 [4.1.1]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.1.0...v4.1.1

data/README.md

@@ -7,54 +7,61 @@
 [![Gem Dependencies](https://img.shields.io/gemnasium/matthutchinson/acts_as_textcaptcha.svg?style=flat)](https://gemnasium.com/matthutchinson/acts_as_textcaptcha)
 
 ActsAsTextcaptcha provides spam protection for your Rails models using logic
-questions from the excellent [Text CAPTCHA](http://textcaptcha.com/) web service
-(by [Rob Tuley](http://openknot.com/me/) of [Openknot](http://openknot.com/)).
-It is also possible to configure your own text captcha questions (instead, or as
-a fall back in the event of any remote API issues).
+questions from the excellent [TextCaptcha](http://textcaptcha.com/) web service
+(by [Rob Tuley](https://twitter.com/robtuley). It is also possible to configure your
+own captcha questions (instead, or as a fallback in the event of any API
+issues).
 
 This gem is actively maintained, has good test coverage and is compatible with
-Rails >= 3.0.0 (including Rails 4). If you have any issues please report them
+Rails >= 3 (including Rails 4 & 5) and Ruby >= 2.1. If you have issues
+please report them
 [here](https://github.com/matthutchinson/acts_as_textcaptcha/issues/new).
 
 Logic questions from the web service are aimed at a child's age of 7, so they
 can be solved easily by even the most cognitively impaired users. As they
 involve human logic, questions cannot be solved by a robot. There are both
-advantages and disadvantages for using logic questions over image based
-captchas, find out more at [TextCAPTCHA](http://textcaptcha.com/why).
+advantages and disadvantages in using logic questions over image based
+captchas, find out more at [TextCaptcha](http://textcaptcha.com/).
 
 ## Demo
 
-Try a [working demo here](http://textcaptcha.herokuapp.com)!
+Try a [working demo here](https://acts-as-textcaptcha-demo.herokuapp.com)!
 
-## Installing
+**Or** click below to deploy your own example Rails app to Heroku (already
+configured with acts_as_textcaptcha). See
+[here](https://github.com/matthutchinson/acts_as_textcaptcha_demo) for more
+details.
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://www.heroku.com/deploy?template=https://github.com/matthutchinson/acts_as_textcaptcha_demo/tree/master)
 
-*NOTE:* The steps to configure your app changed with the v4.0.0 release. If you
-are having problems please carefully check the steps below or refer to the [upgrade
-instructions](https://github.com/matthutchinson/acts_as_textcaptcha/wiki/Upgrading-from-3.0.10).
+## Installing
 
 First add the following to your Gemfile, then `bundle install`;
 
     gem 'acts_as_textcaptcha'
 
-Next [grab an API key for your website](http://textcaptcha.com/api), then add
-the following code to models you would like to protect;
+Add the following code to models you would like to protect;
 
-    class Comment < ActiveRecord::Base
-      # (this is the simplest way to configure the gem, with an API key only)
-      acts_as_textcaptcha :api_key => 'PASTE_YOUR_TEXTCAPTCHA_API_KEY_HERE'
+    class Comment < ApplicationRecord
+      # (this is the simplest way to configure the gem)
+      acts_as_textcaptcha :api_key => 'TEXTCAPTCHA_API_IDENTITY'
     end
 
-Next in your controller's *new* action you'll want to generate and assign the
-logic question for the new record, like so;
+Your `TEXTCAPTCHA_API_IDENTITY` should be some reference to yourself (e.g. an
+email address, domain or similar where if there are problems with your usage you
+can be contacted).
+
+Next, in your controller's *new* action generate and assign the logic question
+for the record, like so;
 
     def new
       @comment = Comment.new
       @comment.textcaptcha
     end
 
-Finally, in your form view add the textcaptcha question and answer fields using
-the textcaptcha_fields helper.  Feel free to arrange the HTML within this block
-as you like;
+Finally, in the view add the textcaptcha question and answer fields to your form
+using the `textcaptcha_fields` helper. Feel free to arrange the HTML within this
+block as you like;
 
     <%= textcaptcha_fields(f) do %>
       <div class="field">
@@ -63,48 +70,56 @@ as you like;
       </div>
     <% end %>
 
-*NOTE:* If you'd rather NOT use this helper and would prefer to write your own
-form view code, see the html produced from the textcaptcha_fields method in the
-[source
-code](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_helper.rb).
+*NOTE:* If you'd rather NOT use this helper and prefer to write your own form
+elements, take a look at the HTML produced from this helper method
+[here](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_helper.rb).
 
-### Toggling Textcaptcha
+*NOTE:* The defaults for [cache
+configuration](http://guides.rubyonrails.org/caching_with_rails.html#cache-stores)
+changed with Rails 5 and this gem **requires** a working Rails.cache store to
+exist.
+
+*NOTE:* These installation steps changed with v4.0.0 of this gem. If you are
+having problems please refer to the 3.0 [upgrade
+guide](https://github.com/matthutchinson/acts_as_textcaptcha/wiki/Upgrading-from-3.0.10).
+
+### Toggling TextCaptcha
 
 You can toggle textcaptcha on/off for your models by overriding the
 `perform_textcaptcha?` method. If it returns false, no questions will be fetched
-from the web service and textcaptcha validation is disabled.
+from the web service and captcha validation is disabled.
 
 This is useful for writing your own custom logic for toggling spam protection
 on/off e.g. for logged in users. By default the `perform_textcaptcha?` method
-[checks if the form object is a new (unsaved)
+[checks if the object is a new (unsaved)
 record](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha.rb#L54).
 
 So out of the box, spam protection is only enabled for creating new records (not
-updating).  Here is a typical example showing how to overwrite the
+updating). Here is a typical example showing how to overwrite the
 `perform_textcaptcha?` method, while maintaining the new record check.
 
-    class Comment < ActiveRecord::Base
-      acts_as_textcaptcha :api_key => 'YOUR_TEXTCAPTCHA_API_KEY'
+    class Comment < ApplicationRecord
+      acts_as_textcaptcha :api_key => 'TEXTCAPTCHA_API_IDENTITY'
 
       def perform_textcaptcha?
         super && user.admin?
       end
     end
 
-## More configuration options
+### Configuration options
 
 You can configure captchas with the following options;
 
-* *api_key* (_required_) - get a free key from http://textcaptcha.com/api
-* *questions* (_optional_) - array of question and answer hashes (see below) A random question from this array will be asked if the web service fails OR if no API key has been set.  Multiple answers to the same question are comma separated (e.g. 2,two). So do not use commas in your answers!
+* *api_key* (_required_) - reference to yourself (e.g. your email - to identify calls to the textcaptcha.com API)
+* *questions* (_optional_) - array of question and answer hashes (see below) A random question from this array will be asked if the web service fails OR if no `api_key` has been set. Multiple answers to the same question are comma separated (e.g. 2,two). Don't use commas in your answers!
 * *cache_expiry_minutes* (_optional_) - minutes for answers to persist in the cache (default 10 minutes), see [below for details](https://github.com/matthutchinson/acts_as_textcaptcha#what-does-the-code-do)
 * *http_read_timeout* (_optional_) - Net::HTTP option, seconds to wait for one block to be read from the remote API
 * *http_open_timeout* (_optional_) - Net::HTTP option, seconds to wait for the connection to open to the remote API
 
 For example;
 
-    class Comment < ActiveRecord::Base
-      acts_as_textcaptcha :api_key              => 'YOUR_TEXTCAPTCHA_API_KEY',
+    class Comment < ApplicationRecord
+      acts_as_textcaptcha :api_key              => 'TEXTCAPTCHA_API_IDENTITY',
                           :http_read_timeout    => 60,
                           :http_read_timeout    => 10,
                           :cache_expiry_minutes => 10,
@@ -112,27 +127,28 @@ For example;
                                                     { 'question' => 'The green hat is what color?', 'answers' => 'green' }]
     end
 
-### YAML config
+#### YAML config
 
 The gem can be configured for models individually (as shown above) or with a
-config/textcaptcha.yml file.  The config file must have an api_key defined and
-optional array of questions. Options definied inline in model classes take
-preference over the configuration in textcaptcha.yml.  The gem comes with a
-handy rake task to copy over a
+config/textcaptcha.yml file. The config file must have an `api_key` defined
+and/or an array of questions and answers. Any options defined inline in model
+classes take preference over the global configuration in textcaptcha.yml.
+
+The gem comes with a handy rake task to copy over a
 [textcaptcha.yml](http://github.com/matthutchinson/acts_as_textcaptcha/raw/master/config/textcaptcha.yml)
 template to your config directory;
 
     rake textcaptcha:config
 
-### Configuring _without_ the TextCAPTCHA web service
+#### Configuring _without_ the TextCaptcha web service
 
-To use only your own logic questions, simply ommit the api_key from the
-configuration and define at least 1 logic question and answer (see above).
+To use only your own logic questions, simply omit the `api_key` from the
+configuration and define at least one logic question and answer (see above).
 
 ## Translations
 
 The gem uses the standard Rails I18n translation approach (with a fall-back to
-English). Unfortunately at present, the Text CAPTCHA web service only provides
+English). Unfortunately at present, the TextCaptcha web service only provides
 logic questions in English.
 
     en:
@@ -147,109 +163,105 @@ logic questions in English.
       activemodel:
         attributes:
           comment:
-            textcaptcha_answer: "Textcaptcha answer"
+            textcaptcha_answer: "TextCaptcha answer"
 
-## Without Rails or ActiveRecord
+## Without ActiveRecord
 
-Although this gem has been built with Rails in mind, is entirely possible to use
-it without ActiveRecord, or Rails.  As an example, take a look at the
+It is possible to use this gem without ActiveRecord. As an example, take a look at the
 [Contact](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/test/test_models.rb#L44)
 model used in the test suite
 [here](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/test/test_models.rb#L44).
 
-Please note that the built-in
-[TextcaptchaCache](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_cache.rb)
-class directly wraps the
-[Rails.cache](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html).
-An alternative  TextcaptchaCache implementation will be necessary if Rails.cache
-is not available.
-
 ## Testing and docs
 
 In development you can run the tests and rdoc tasks like so;
 
-* rake test (all tests)
-* rake test:coverage (all tests with code coverage)
-* rake rdoc (generate docs)
+* `rake test` (all tests)
+* `rake test:coverage` (all tests with code coverage reporting)
+* `appraisal rake test` (all tests with all gemfile variations)
+* `appraisal rails-3 rake test` (all tests using a specific gemfile)
+* `rake rdoc` (generate docs)
+
+This gem uses [appraisal](https://github.com/thoughtbot/appraisal) to run the
+test suite with multiple versions of Rails.
 
 ## What does the code do?
 
 The gem contains two parts, a module for your ActiveRecord models, and a single
-view helper method.  The ActiveRecord module makes use of two futher classes,
+view helper method. The ActiveRecord module makes use of two futher classes,
 [TextcaptchaApi](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_api.rb)
 and
 [TextcaptchaCache](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_cache.rb).
 
-A call to @model.textcaptcha in your controller will query the Text CAPTCHA web
-service.  A GET request is made with Net::HTTP and parsed using the default
-Rails ActiveSupport::XMLMini backend.  A textcaptcha_question and a random cache
-key is assigned to the record.  An array of possible answers is stored in the
-TextcaptchaCache with this random key.  The cached answers have (by default) a
-10 minute TTL in your cache. If your forms take more than 10 minutes to be
+A call to `@model.textcaptcha` in your controller will query the TextCaptcha web
+service. A GET request is made with Net::HTTP and parsed using the default Rails
+`ActiveSupport::XMLMini` backend. A textcaptcha_question and a random cache key
+are assigned to the record. An array of possible answers is also stored in the
+TextcaptchaCache with this random key. The cached answers have (by default) a 10
+minute TTL in your cache. If your forms take more than 10 minutes to be
 completed you can adjust this value setting the `cache_expiry_minutes` option.
 Internally TextcaptchaCache wraps
 [Rails.cache](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html)
-and all cache keys are namespaced.
+and all cache keys are name spaced.
 
-On saving, validate_textcaptcha is called on @model.validate checking that the
-@model.textcaptcha_answer matches one of the possible answers (retrieved from
-the cache).  By default, this validation is _only_ carried out on new records,
-i.e. never on edit, only on create.  All attempted answers are case-insensitive
+On saving, `validate_textcaptcha` is called on @model.validate checking that the
+`@model.textcaptcha_answer` matches one of the possible answers (retrieved from
+the cache). By default, this validation is _only_ carried out on new records,
+i.e. never on update, only on create. All attempted answers are case-insensitive
 and have trailing/leading white-space removed.
 
 Regardless of a correct, or incorrect answer the possible answers are cleared
-from the cache and a new random key is generated and assigned.  An incorrect
-answer will cause a new question to be prompted.  After one correct answer, the
+from the cache and a new random key is generated and assigned. An incorrect
+answer will cause a new question to be prompted. After one correct answer, the
 answer and a mutating key are sent on further form requests, and no question is
 presented in the form.
 
 If an error or timeout occurs during API fetching, ActsAsTextcaptcha will fall
-back to choose a random logic question defined in your options (see above).  If
+back to choose a random logic question defined in your options (see above). If
 the web service fails or no API key is specified AND no alternate questions are
 configured, the @model will not require textcaptcha checking and will pass as
 valid.
 
 For more details on the code please check the
 [documentation](http://rdoc.info/projects/matthutchinson/acts_as_textcaptcha).
-Tests are written with [MiniTest](https://rubygems.org/gems/minitest).  Pull
+Tests are written with [MiniTest](https://rubygems.org/gems/minitest). Pull
 requests and bug reports are welcome.
 
 ## Requirements
 
 What do you need?
 
-* [Rails](http://github.com/rails/rails) >= 3.0.0  (including Rails 4)
-* [Rails.cache](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html) - some basic cache configuration is necessary
-* [Ruby](http://ruby-lang.org/) >= 2.0.0 (tested with stable versions of 2.0, 2.1, 2.2, 2.3) - 1.8/1.9 support ended at version 4.1.1
-* [Text CAPTCHA API key](http://textcaptcha.com/register) (_optional_, since you can define your own logic questions)
-* [MiniTest](https://rubygems.org/gems/minitest) (_optional_ if you want to run the tests)
-* [SimpleCov](https://rubygems.org/gems/simplecov) (_optional_ if you want to run the tests with code coverage reporting)
+* [Rails](http://github.com/rails/rails) >= 3  (including Rails 4 & 5)
+* [Rails.cache](http://guides.rubyonrails.org/caching_with_rails.html#cache-stores) - a basic cache configuration is necessary
+* [Ruby](http://ruby-lang.org/) >= 2.1
 
-*Note*: The built-in
+*NOTE:* The built-in
 [TextcaptchaCache](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_cache.rb)
 class directly wraps the
-[Rails.cache](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html)
-object.
+[Rails.cache](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html).
+An alternative TextcaptchaCache implementation will be necessary if
+`Rails.cache` is not available.
+
 
-## Rails 2 support
+## Rails 2 Support
 
-Support for Rails 2 was dropped with the release of v4.1.0. If you would like to
-continue to use this gem with an older version of Rails (>= 2.3.8), please lock
-the version to `4.0.0`. Like so;
+Support for Rails 2 was dropped with the release of `v4.1.0`. If you would like
+to continue to use this gem with an older version of Rails (>= 2.3.8), please
+lock your Gemfile with version `4.0.0`. Like so;
 
     # in your Gemfile
     gem 'acts_as_textcaptcha', '=4.0.0'
 
-    # or in environment.rb
+    # or in config/environment.rb
     config.gem 'acts_as_textcaptcha', :version => '=4.0.0'
 
 Check out the
 [README](https://github.com/matthutchinson/acts_as_textcaptcha/tree/v4.0.0) for
-this release for more information.
+this release for further instructions.
 
 ## Links
 
-* [Demo](http://textcaptcha.herokuapp.com)
+* [Demo](https://acts-as-textcaptcha-demo.herokuapp.com)
 * [Travis CI](http://travis-ci.org/#!/matthutchinson/acts_as_textcaptcha)
 * [Test Coverage](https://coveralls.io/r/matthutchinson/acts_as_textcaptcha?branch=master)
 * [Code Climate](https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha)
@@ -263,14 +275,14 @@ this release for more information.
 ## Who's who?
 
 * [ActsAsTextcaptcha](http://github.com/matthutchinson/acts_as_textcaptcha) and [little robot drawing](http://www.flickr.com/photos/hiddenloop/4541195635/) by [Matthew Hutchinson](http://matthewhutchinson.net)
-* [Text CAPTCHA](http://textcaptcha.com) API and service by [Rob Tuley](http://openknot.com/me/) at [Openknot](http://openknot.com)
+* [TextCaptcha](http://textcaptcha.com) API and service by [Rob Tuley](https://twitter.com/robtuley)
 
 ## Usage
 
 This gem is used in a number of production websites and apps. It was originally
-extracted from code developed for [Bugle](http://bugleblogs.com).  If you're
-happily using acts_as_textcaptcha in production, let me know and I'll add you to
-this list!
+extracted from code developed for [Bugle](http://bugleblogs.com). If you're
+happily using acts_as_textcaptcha in production, please let me know and I'll add
+you to this list!
 
 * [matthewhutchinson.net](http://matthewhutchinson.net)
 * [pmFAQtory.com](http://pmfaqtory.com)

data/Rakefile

@@ -1,7 +1,9 @@
-gem 'rdoc'
-
+require 'rubygems'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+
+gem 'rdoc'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
@@ -22,9 +24,9 @@ end
 # rdoc tasks
 require 'rdoc/task'
 RDoc::Task.new do |rd|
-  rd.main     = "README.rdoc"
+  rd.main     = "README.md"
   rd.title    = 'acts_as_textcaptcha'
   rd.rdoc_dir = 'doc'
   rd.options  << "--all"
-  rd.rdoc_files.include("README.rdoc", "LICENSE", "lib/**/*.rb")
+  rd.rdoc_files.include("README.md", "LICENSE.txt", "lib/**/*.rb")
 end

data/acts_as_textcaptcha.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # always test against latest rails version
-  s.add_development_dependency('rails', '~> 4.2.6')
+  s.add_development_dependency('rails', '~> 5.1.4')
 
   s.add_development_dependency('mime-types')
   s.add_development_dependency('bundler')
@@ -41,4 +41,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('webmock')
   s.add_development_dependency('coveralls')
+  s.add_development_dependency('appraisal')
 end

data/gemfiles/rails_3.gemfile

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

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_5.gemfile

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

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -12,12 +12,9 @@ module ActsAsTextcaptcha
       cattr_accessor :textcaptcha_config
       attr_accessor  :textcaptcha_question, :textcaptcha_answer, :textcaptcha_key
 
-      if respond_to?(:accessible_attributes)
-        if accessible_attributes.nil? && respond_to?(:attr_protected)
-          attr_protected :textcaptcha_question
-        elsif respond_to?(:attr_accessible)
-          attr_accessible :textcaptcha_answer, :textcaptcha_key
-        end
+      # Rails 3, ensure these attrs are accessible
+      if respond_to?(:accessible_attributes) && respond_to?(:attr_accessible)
+        attr_accessible :textcaptcha_answer, :textcaptcha_key
       end
 
       validate :validate_textcaptcha, :if => :perform_textcaptcha?

data/lib/acts_as_textcaptcha/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTextcaptcha
-  VERSION = "4.1.3"
+  VERSION = "4.2.0"
 end

data/test/test_helper.rb

@@ -2,6 +2,9 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)+'./../lib/acts_as_tex
 
 ENV['RAILS_ENV'] = 'test'
 
+# ensure tmp dir exists
+FileUtils.mkdir_p './tmp'
+
 # confgure test coverage reporting
 if ENV['COVERAGE']
   require 'simplecov'
@@ -20,18 +23,20 @@ end
 
 require 'minitest/autorun'
 require 'webmock/minitest'
-
 require 'rails/all'
-
 require 'acts_as_textcaptcha'
 require './test/test_models'
 
 # load and initialize test db schema
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'tmp/test_db/acts_as_textcaptcha.sqlite3.db')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'tmp/acts_as_textcaptcha_test.sqlite3.db')
 load(File.dirname(__FILE__) + "/schema.rb")
 
-# initialize a Rails.cache (use a basic memory store in tests)
-Rails.cache = ActiveSupport::Cache::MemoryStore.new
+# initialize the Rails cache (use a basic memory store in tests)
+if Rails.version >= '4'
+  Rails.cache = ActiveSupport::Cache::MemoryStore.new
+else
+  RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
+end
 
 # additional helper methods for use in tests
 def find_in_cache(key)

data/test/test_models.rb

@@ -1,34 +1,37 @@
 # models for use in tests
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
 
-class Widget < ActiveRecord::Base
+class Widget < ApplicationRecord
   # uses textcaptcha.yml file for configuration
   acts_as_textcaptcha
 end
 
-class Comment < ActiveRecord::Base
+class Comment < ApplicationRecord
   # inline options (symbol keys) with api_key only
   acts_as_textcaptcha :api_key => '8u5ixtdnq9csc84cok0owswgo'
 end
 
-class FastComment < ActiveRecord::Base
+class FastComment < ApplicationRecord
   # inline options with super fast (0.006 seconds) cache expiry time
   acts_as_textcaptcha :cache_expiry_minutes => '0.0001',
                       :questions => [{ :question => '1+1', :answers => '2,two' }]
 end
 
-class Review < ActiveRecord::Base
+class Review < ApplicationRecord
   # inline options with all possible options
   acts_as_textcaptcha :api_key   => '8u5ixtdnq9csc84cok0owswgo',
                       :questions => [{ :question => 'The green hat is what color?', :answers => 'green' }]
 end
 
-class MovieReview < ActiveRecord::Base
+class MovieReview < ApplicationRecord
   # inline options with all possible options
   acts_as_textcaptcha 'api_key'   => '8u5ixtdnq9csc84cok0owswgo',
                       'questions' => [{ 'Question' => 'The green hat is what color?', 'answers' => nil }]
 end
 
-class Note < ActiveRecord::Base
+class Note < ApplicationRecord
   # inline options (string keys) with user defined questions only (no textcaptcha service)
   acts_as_textcaptcha 'questions' => [{ 'question' => '1+1', 'answers' => '2,two' }]
 
@@ -48,7 +51,7 @@ class Contact
   acts_as_textcaptcha :questions => [{ :question => 'one+1', :answers => "2,two,апельсин" }]
 end
 
-class StrongAccessibleWidget < ActiveRecord::Base
+class StrongAccessibleWidget < ApplicationRecord
 
   # stub out attr_accessbile interface for testing
   def self.accessible_attributes(role = :default); end

data/test/textcaptcha_api_test.rb

@@ -30,17 +30,17 @@ describe 'TextcaptchaApi' do
       URI::InvalidURIError
     ].each do |error|
        stub_request(:get, "http://textcaptcha.com/api/xyz").to_raise(error)
-       ActsAsTextcaptcha::TextcaptchaApi.fetch('xyz').must_equal nil
+       assert_nil ActsAsTextcaptcha::TextcaptchaApi.fetch('xyz')
      end
   end
 
   it 'should return nil when body cannot be parsed as XML' do
     stub_request(:get, "http://textcaptcha.com/api/jibber").to_return(:body => 'here be gibberish')
-    ActsAsTextcaptcha::TextcaptchaApi.fetch('jibber').must_equal nil
+    assert_nil ActsAsTextcaptcha::TextcaptchaApi.fetch('jibber')
   end
 
   it 'should return nil when body is empty' do
     stub_request(:get, "http://textcaptcha.com/api/empty").to_return(:body => '')
-    ActsAsTextcaptcha::TextcaptchaApi.fetch('empty').must_equal nil
+    assert_nil ActsAsTextcaptcha::TextcaptchaApi.fetch('empty')
   end
 end

data/test/textcaptcha_cache_test.rb

@@ -20,6 +20,6 @@ describe 'TextcaptchaCache' do
     @cache.read('mykey').must_equal [1,2,3]
     @cache.delete('mykey')
 
-    @cache.read('mykey').must_equal nil
+    assert_nil @cache.read('mykey')
   end
 end

data/test/textcaptcha_helper_test.rb

@@ -36,8 +36,8 @@ describe 'TextcaptchaHelper' do
     html = render_template
 
     assert_match(/\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html)
-    assert_match(/\<input value\=\"\" type\=\"text\" name\=\"note\[textcaptcha_answer\]\" id\=\"note_textcaptcha_answer\" \/\>/, html)
-    assert_match(/\<input type\=\"hidden\" value\=\"([0-9a-f]{32})\" name\=\"note\[textcaptcha_key\]\" id\=\"note_textcaptcha_key\" \/\>/, html)
+    assert_match(/\<input(.*)name\=\"note\[textcaptcha_answer\]\"(.*)\/\>/, html)
+    assert_match(/\<input(.*)name\=\"note\[textcaptcha_key\]\"(.*)\/\>/, html)
   end
 
   it 'should render hidden answer and textcaptcha_key when only answer is present' do
@@ -46,8 +46,8 @@ describe 'TextcaptchaHelper' do
     html = render_template
 
     refute_match(/\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html)
-    assert_match(/\<input type\=\"hidden\" value\=\"2\" name\=\"note\[textcaptcha_answer\]\" id\=\"note_textcaptcha_answer\" \/\>/, html)
-    assert_match(/\<input type\=\"hidden\" value\=\"([0-9a-f]{32})\" name\=\"note\[textcaptcha_key\]\" id\=\"note_textcaptcha_key\" \/\>/, html)
+    assert_match(/\<input(.*)name\=\"note\[textcaptcha_answer\]\"(.*)\/\>/, html)
+    assert_match(/\<input(.*)name\=\"note\[textcaptcha_key\]\"(.*)\/\>/, html)
   end
 
   it 'should not render any question or answer when perform_textcaptcha? is false' do

data/test/textcaptcha_test.rb

@@ -131,8 +131,8 @@ describe 'Textcaptcha' do
 
       stub_request(:get, %r{http://textcaptcha.com/api/}).to_raise(SocketError)
       @comment.textcaptcha
-      @comment.textcaptcha_question.must_equal nil
-      @comment.textcaptcha_key.must_equal nil
+      assert_nil @comment.textcaptcha_question
+      assert_nil @comment.textcaptcha_key
     end
 
     it 'should not generate any question or answer when user defined questions set incorrectly' do
@@ -140,8 +140,8 @@ describe 'Textcaptcha' do
 
       stub_request(:get, %r{http://textcaptcha.com/api/}).to_raise(SocketError)
       @comment.textcaptcha
-      @comment.textcaptcha_question.must_equal nil
-      @comment.textcaptcha_key.must_equal nil
+      assert_nil @comment.textcaptcha_question
+      assert_nil @comment.textcaptcha_key
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: |-
   Simple question/answer based spam protection for your Rails models.
     You can define your own logic questions and/or fetch questions from the textcaptcha.com API.
@@ -150,6 +164,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -160,7 +175,9 @@ files:
 - acts_as_textcaptcha.gemspec
 - bin/console
 - config/textcaptcha.yml
-- init.rb
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.gemfile
 - lib/acts_as_textcaptcha.rb
 - lib/acts_as_textcaptcha/framework/rails.rb
 - lib/acts_as_textcaptcha/textcaptcha.rb
@@ -197,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Spam protection for your models via logic questions and the textcaptcha.com

data/init.rb

@@ -1,2 +0,0 @@
-# this file is required to allow the gem to work as a rails plugin
-require './vendor/plugins/acts_as_textcaptcha/lib/acts_as_textcaptcha'