acts_as_textcaptcha 4.5.1 → 4.5.2

data/.simplecov

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 SimpleCov.start do
-  add_filter '/test/'
-  add_filter '/vendor/'
+  add_filter "/test/"
+  add_filter "/vendor/"
 end
 
 SimpleCov.at_exit do

data/.travis.yml

@@ -1,33 +1,31 @@
 sudo: false
 language: ruby
-script: 'bundle exec rake test'
 gemfile:
-  - gemfiles/rails_3.gemfile
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
 
 rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/rails_6.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails_3.gemfile
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       gemfile: gemfiles/rails_4.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_3.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_4.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_5.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_4.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_5.gemfile
 
 deploy:
   provider: rubygems
@@ -40,12 +38,10 @@ deploy:
 env:
   global:
     - CC_TEST_REPORTER_ID=3ff570478529bcdd11ef42d33229702118aa36b17a3de01c3f6d5a9c58fc7a4c
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
+  - ./cc-test-reporter before-build - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 after_script:
-  - ./cc-test-reporter after-build
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -t simplecov

data/Appraisals

@@ -1,19 +1,14 @@
-appraise "rails-3" do
-  gem "rails", "3.2.22.5"
-  gem "sqlite3", "~> 1.3.5"
-end
-
 appraise "rails-4" do
-  gem "rails", "4.2.11.1"
+  gem "rails", "4.2.11.3"
   gem "sqlite3", "~> 1.3.5"
 end
 
 appraise "rails-5" do
-  gem "rails", "5.2.4.1"
+  gem "rails", "5.2.4.4"
   gem "sqlite3", "~> 1.4.2"
 end
 
 appraise "rails-6" do
-  gem "rails", "6.0.2.1"
+  gem "rails", "6.0.3.4"
   gem "sqlite3", "~> 1.4.2"
 end

data/CHANGELOG.md

@@ -9,6 +9,13 @@ adheres to [Semantic Versioning][Semver].
 
 - Your contribution here!
 
+## [4.5.2] - 2021-01-28
+### Changed
+- CI covers Latest Rails version 6,5,4 and Ruby 3,2.7,2.6,2.5
+### Removed
+- Support for Ruby < 2.5 (EOL versions not supported)
+- No longer testing against Rails 3 in CI
+
 ## [4.5.1] - 2020-01-28
 ### Fixed
 - add Rails Railtie to fix rake task loading
@@ -88,7 +95,8 @@ adheres to [Semantic Versioning][Semver].
 - README updated.
 - Test coverage improved.
 
-[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.1...HEAD
+[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.2...HEAD
+[4.5.2]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.1...v4.5.2
 [4.5.1]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.0...v4.5.1
 [4.5.0]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.4.1...v4.5.0
 [4.4.1]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.3.0...v4.4.1

data/Gemfile

@@ -1,2 +1,4 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -9,18 +9,18 @@
 ActsAsTextcaptcha provides spam protection for Rails models with text-based
 logic question captchas. Questions are fetched from [Rob
 Tuley's](https://twitter.com/robtuley)
-[textcaptcha.com](http://textcaptcha.com/). They can be solved easily by humans
+[textcaptcha.com](https://textcaptcha.com/). They can be solved easily by humans
 but are tough for robots to crack.
 
 The gem can also be configured with your own questions; as an alternative, or as
 a fallback to handle any API issues. For reasons on why logic based captchas
-are a good idea visit [textcaptcha.com](http://textcaptcha.com).
+are a good idea visit [textcaptcha.com](https://textcaptcha.com).
 
 ## Requirements
 
-* [Ruby](http://ruby-lang.org/) >= 2.4
-* [Rails](http://github.com/rails/rails) >= 3
-* [Rails.cache](http://guides.rubyonrails.org/caching_with_rails.html#cache-stores)
+* [Ruby](http://ruby-lang.org/) >= 2.5
+* [Rails](http://github.com/rails/rails) >= 4
+* A valid [Rails.cache](http://guides.rubyonrails.org/caching_with_rails.html#cache-stores) (not `:null_store`)
 
 ## Demo
 
@@ -59,7 +59,7 @@ def new
 end
 ```
 
-Finally add the question and answer fields to your form using the
+Add the question and answer fields to your form using the
 `textcaptcha_fields` helper. Arrange the HTML within this block as you like.
 
 ```ruby
@@ -75,6 +75,17 @@ If you'd prefer to construct your own form elements, take a look at the HTML
 produced
 [here](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_helper.rb).
 
+Finally set a valid [cache
+store](https://guides.rubyonrails.org/caching_with_rails.html#cache-stores) (not `:null_store`) for your environments:
+
+```ruby
+# e.g. in each config/environments/*.rb
+config.cache_store = :memory_store
+```
+
+You can run `rails dev:cache` on a modern generated Rails app to enable
+a memory store cache in the development environment.
+
 ## Configuration
 
 The following options are available (only `api_key` is required):
@@ -241,7 +252,7 @@ The code is available as open source under the terms of
 ## 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)
-* [TextCaptcha](http://textcaptcha.com) API and service by [Rob Tuley](https://twitter.com/robtuley)
+* [TextCaptcha](https://textcaptcha.com) API and service by [Rob Tuley](https://twitter.com/robtuley)
 
 ## Links
 

data/Rakefile

@@ -1,13 +1,16 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rake/testtask"
 require "rdoc/task"
+require "rubocop/rake_task"
 
 # generate docs
 RDoc::Task.new do |rd|
-  rd.main     = "README.md"
-  rd.title    = 'ActsAsTextcaptcha'
-  rd.rdoc_dir = 'doc'
-  rd.options  << "--all"
+  rd.main = "README.md"
+  rd.title = "ActsAsTextcaptcha"
+  rd.rdoc_dir = "doc"
+  rd.options << "--all"
   rd.rdoc_files.include("README.md", "LICENSE", "lib/**/*.rb")
 end
 
@@ -18,13 +21,19 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+# run lint
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ["--display-cop-names"]
+end
+
 # run tests with code coverage (default)
 namespace :test do
   desc "Run all tests and features and generate a code coverage report"
   task :coverage do
-    ENV['COVERAGE'] = 'true'
-    Rake::Task['test'].execute
+    ENV["COVERAGE"] = "true"
+    Rake::Task["test"].execute
+    Rake::Task["rubocop"].execute
   end
 end
 
-task :default => ['test:coverage']
+task default: [:rubocop, "test:coverage"]

data/acts_as_textcaptcha.gemspec

@@ -1,34 +1,36 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "acts_as_textcaptcha/version"
 
 Gem::Specification.new do |spec|
-  spec.name     = "acts_as_textcaptcha"
-  spec.version  = ActsAsTextcaptcha::VERSION
-  spec.authors  = ["Matthew Hutchinson"]
-  spec.email    = ["matt@hiddenloop.com"]
+  spec.name = "acts_as_textcaptcha"
+  spec.version = ActsAsTextcaptcha::VERSION
+  spec.authors = ["Matthew Hutchinson"]
+  spec.email = ["matt@hiddenloop.com"]
   spec.homepage = "http://github.com/matthutchinson/acts_as_textcaptcha"
-  spec.license  = 'MIT'
-  spec.summary  = "A text-based logic question captcha for Rails"
+  spec.license = "MIT"
+  spec.summary = "A text-based logic question captcha for Rails"
 
-  spec.description = <<-EOF
+  spec.description = <<-DESCRIPTION
   ActsAsTextcaptcha provides spam protection for Rails models with text-based
   logic question captchas. Questions are fetched from Rob Tuley's
   textcaptcha.com They can be solved easily by humans but are tough for robots
   to crack.
-  EOF
+  DESCRIPTION
 
   spec.metadata = {
-    "homepage_uri"      => "https://github.com/matthutchinson/acts_as_textcaptcha",
-    "changelog_uri"     => "https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/CHANGELOG.md",
-    "source_code_uri"   => "https://github.com/matthutchinson/acts_as_textcaptcha",
-    "bug_tracker_uri"   => "https://github.com/matthutchinson/acts_as_textcaptcha/issues",
+    "homepage_uri" => "https://github.com/matthutchinson/acts_as_textcaptcha",
+    "changelog_uri" => "https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/matthutchinson/acts_as_textcaptcha",
+    "bug_tracker_uri" => "https://github.com/matthutchinson/acts_as_textcaptcha/issues",
     "allowed_push_host" => "https://rubygems.org"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.test_files    = `git ls-files -- {test}/*`.split("\n")
-  spec.bindir        = "bin"
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.test_files = `git ls-files -- {test}/*`.split("\n")
+  spec.bindir = "bin"
   spec.require_paths = ["lib"]
 
   # documentation
@@ -36,21 +38,24 @@ Gem::Specification.new do |spec|
   spec.rdoc_options << "--title" << "ActAsTextcaptcha" << "--main" << "README.md" << "-ri"
 
   # non-gem dependecies
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   # dev gems
-  spec.add_development_dependency('bundler')
+  spec.add_development_dependency("bundler")
+  spec.add_development_dependency("pry-byebug")
   spec.add_development_dependency "rake"
-  spec.add_development_dependency('pry-byebug')
+
+  # Lint
+  spec.add_development_dependency("rubocop")
 
   # docs
-  spec.add_development_dependency('rdoc')
+  spec.add_development_dependency("rdoc")
 
   # testing
-  spec.add_development_dependency('rails', '~> 6.0.2.1')
-  spec.add_development_dependency('minitest')
-  spec.add_development_dependency('sqlite3')
-  spec.add_development_dependency('webmock')
-  spec.add_development_dependency('simplecov')
-  spec.add_development_dependency('appraisal')
+  spec.add_development_dependency("appraisal")
+  spec.add_development_dependency("minitest")
+  spec.add_development_dependency("rails", "~> 6.0.3.4")
+  spec.add_development_dependency("simplecov", "~> 0.19.1")
+  spec.add_development_dependency("sqlite3")
+  spec.add_development_dependency("webmock")
 end

data/gemfiles/rails_4.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.11.1"
+gem "rails", "4.2.11.3"
 gem "sqlite3", "~> 1.3.5"
 
 gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.1"
+gem "rails", "5.2.4.4"
 gem "sqlite3", "~> 1.4.2"
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "6.0.2.1"
+gem "rails", "6.1.1"
 gem "sqlite3", "~> 1.4.2"
 
 gemspec path: "../"

data/lib/acts_as_textcaptcha.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'acts_as_textcaptcha/version'
-require 'acts_as_textcaptcha/errors'
-require 'acts_as_textcaptcha/textcaptcha'
-require 'acts_as_textcaptcha/textcaptcha_config'
-require 'acts_as_textcaptcha/textcaptcha_helper'
-require 'acts_as_textcaptcha/framework/rails'
-require 'acts_as_textcaptcha/railtie' if defined?(Rails::Railtie)
+require "acts_as_textcaptcha/version"
+require "acts_as_textcaptcha/errors"
+require "acts_as_textcaptcha/textcaptcha"
+require "acts_as_textcaptcha/textcaptcha_config"
+require "acts_as_textcaptcha/textcaptcha_helper"
+require "acts_as_textcaptcha/framework/rails"
+require "acts_as_textcaptcha/railtie" if defined?(Rails::Railtie)

data/lib/acts_as_textcaptcha/railtie.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-#
+
 module ActsAsTextcaptcha
   class Railtie < Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__), '/tasks/*.rake')].each { |f| load f }
+      Dir[File.join(File.dirname(__FILE__), "/tasks/*.rake")].each { |f| load f }
     end
   end
 end

data/lib/acts_as_textcaptcha/tasks/textcaptcha.rake

@@ -1,16 +1,17 @@
-require 'rails'
-require 'acts_as_textcaptcha/textcaptcha_config'
+# frozen_string_literal: true
 
-namespace :textcaptcha do
+require "rails"
+require "acts_as_textcaptcha/textcaptcha_config"
 
+namespace :textcaptcha do
   desc "Creates an example textcaptcha config at config/textcaptcha.yml"
   task :config do
-    path = File.join((Rails.root ? Rails.root : '.'), 'config', 'textcaptcha.yml')
+    path = File.join((Rails.root || "."), "config", "textcaptcha.yml")
     if File.exist?(path)
       puts "Ooops, a textcaptcha config file at #{path} already exists ... aborting."
     else
       ActsAsTextcaptcha::TextcaptchaConfig.create(path: path)
-      puts "Done, config generated at #{path}\nEdit this file to add your TextCaptcha API key (see http://textcaptcha.com)."
+      puts "Done, config generated at #{path}\nEdit this file to add your TextCaptcha API key (see https://textcaptcha.com)."
     end
   end
 end

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -1,22 +1,19 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require 'net/http'
-require 'digest/md5'
-require 'acts_as_textcaptcha/textcaptcha_cache'
-require 'acts_as_textcaptcha/textcaptcha_api'
+require "yaml"
+require "net/http"
+require "digest/md5"
+require "acts_as_textcaptcha/textcaptcha_cache"
+require "acts_as_textcaptcha/textcaptcha_api"
 
 module ActsAsTextcaptcha
   module Textcaptcha
-
     def acts_as_textcaptcha(options = nil)
       cattr_accessor :textcaptcha_config
       attr_accessor :textcaptcha_question, :textcaptcha_answer, :textcaptcha_key
 
       # ensure these attrs are accessible (Rails 3)
-      if respond_to?(:accessible_attributes) && respond_to?(:attr_accessible)
-        attr_accessible :textcaptcha_answer, :textcaptcha_key
-      end
+      attr_accessible :textcaptcha_answer, :textcaptcha_key if respond_to?(:accessible_attributes) && respond_to?(:attr_accessible)
 
       self.textcaptcha_config = build_textcaptcha_config(options).symbolize_keys!
 
@@ -26,122 +23,119 @@ module ActsAsTextcaptcha
     end
 
     module InstanceMethods
-
       # override this method to toggle textcaptcha checking, by default this
       # will only allow new records to be protected with textcaptchas
       def perform_textcaptcha?
-        (!respond_to?('new_record?') || new_record?)
+        (!respond_to?("new_record?") || new_record?)
       end
 
       def textcaptcha
-        if perform_textcaptcha? && textcaptcha_config
-          assign_textcaptcha(fetch_q_and_a || config_q_and_a)
-        end
+        assign_textcaptcha(fetch_q_and_a || config_q_and_a) if perform_textcaptcha? && textcaptcha_config
       end
 
-
       private
 
-        def fetch_q_and_a
-          return unless should_fetch?
+      def fetch_q_and_a
+        return unless should_fetch?
 
-          TextcaptchaApi.new(
-            api_key: textcaptcha_config[:api_key],
-            api_endpoint: textcaptcha_config[:api_endpoint],
-            raise_errors: textcaptcha_config[:raise_errors]
-          ).fetch
-        end
+        TextcaptchaApi.new(
+          api_key: textcaptcha_config[:api_key],
+          api_endpoint: textcaptcha_config[:api_endpoint],
+          raise_errors: textcaptcha_config[:raise_errors]
+        ).fetch
+      end
 
-        def should_fetch?
-          textcaptcha_config[:api_key] || textcaptcha_config[:api_endpoint]
-        end
+      def should_fetch?
+        textcaptcha_config[:api_key] || textcaptcha_config[:api_endpoint]
+      end
 
-        def config_q_and_a
-          if textcaptcha_config[:questions]
-            random_question = textcaptcha_config[:questions][rand(textcaptcha_config[:questions].size)].symbolize_keys!
-            answers = (random_question[:answers] || '').split(',').map!{ |answer| safe_md5(answer) }
-            if random_question && answers.present?
-              { 'q' => random_question[:question], 'a' => answers }
-            end
-          end
-        end
+      def config_q_and_a
+        return unless textcaptcha_config[:questions]
 
-        # check textcaptcha, if incorrect, generate a new textcaptcha
-        def validate_textcaptcha
-          valid_answers = textcaptcha_cache.read(textcaptcha_key) || []
-          reset_textcaptcha
-          if valid_answers.include?(safe_md5(textcaptcha_answer))
-            # answer was valid, mutate the key again
-            self.textcaptcha_key = textcaptcha_random_key
-            textcaptcha_cache.write(textcaptcha_key, valid_answers, textcaptcha_cache_options)
-            true
-          else
-            add_textcaptcha_error(too_slow: valid_answers.empty?)
-            textcaptcha
-            false
-          end
-        end
+        random_question = textcaptcha_config[:questions][rand(textcaptcha_config[:questions].size)].symbolize_keys!
+        answers = (random_question[:answers] || "").split(",").map { |answer| safe_md5(answer) }
+        { "q" => random_question[:question], "a" => answers } if random_question && answers.present?
+      end
 
-        def add_textcaptcha_error(too_slow: false)
-          if too_slow
-            errors.add(:textcaptcha_answer, :expired, :message => 'was not submitted quickly enough, try another question instead')
-          else
-            errors.add(:textcaptcha_answer, :incorrect, :message => 'is incorrect, try another question instead')
-          end
+      # check textcaptcha, if incorrect, generate a new textcaptcha
+      def validate_textcaptcha
+        valid_answers = textcaptcha_cache.read(textcaptcha_key) || []
+        reset_textcaptcha
+        if valid_answers.include?(safe_md5(textcaptcha_answer))
+          # answer was valid, mutate the key again
+          self.textcaptcha_key = textcaptcha_random_key
+          textcaptcha_cache.write(textcaptcha_key, valid_answers, textcaptcha_cache_options)
+          true
+        else
+          add_textcaptcha_error(too_slow: valid_answers.empty?)
+          textcaptcha
+          false
         end
+      end
 
-        def reset_textcaptcha
-          if textcaptcha_key
-            textcaptcha_cache.delete(textcaptcha_key)
-            self.textcaptcha_key = nil
-          end
+      def add_textcaptcha_error(too_slow: false)
+        if too_slow
+          errors.add(:textcaptcha_answer, :expired, message: "was not submitted quickly enough, try another question instead")
+        else
+          errors.add(:textcaptcha_answer, :incorrect, message: "is incorrect, try another question instead")
         end
+      end
 
-        def assign_textcaptcha(q_and_a)
-          return unless q_and_a
-          self.textcaptcha_question = q_and_a['q']
-          self.textcaptcha_key = textcaptcha_random_key
-          textcaptcha_cache.write(textcaptcha_key, q_and_a['a'], textcaptcha_cache_options)
+      def reset_textcaptcha
+        if textcaptcha_key
+          textcaptcha_cache.delete(textcaptcha_key)
+          self.textcaptcha_key = nil
         end
+      end
 
-        # strip whitespace pass through mb_chars (a multibyte safe proxy for
-        # strings) then downcase
-        def safe_md5(answer)
-          Digest::MD5.hexdigest(answer.to_s.strip.mb_chars.downcase)
-        end
+      def assign_textcaptcha(q_and_a)
+        return unless q_and_a
 
-        # a random cache key, time based, random
-        def textcaptcha_random_key
-          safe_md5(Time.now.to_i + rand(1_000_000))
-        end
+        self.textcaptcha_question = q_and_a["q"]
+        self.textcaptcha_key = textcaptcha_random_key
+        textcaptcha_cache.write(textcaptcha_key, q_and_a["a"], textcaptcha_cache_options)
+      end
 
-        def textcaptcha_cache_options
-          if textcaptcha_config[:cache_expiry_minutes]
-            { :expires_in => textcaptcha_config[:cache_expiry_minutes].to_f.minutes }
-          else
-            {}
-          end
-        end
+      # strip whitespace pass through mb_chars (a multibyte safe proxy for
+      # strings) then downcase
+      def safe_md5(answer)
+        Digest::MD5.hexdigest(answer.to_s.strip.mb_chars.downcase)
+      end
+
+      # a random cache key, time based, random
+      def textcaptcha_random_key
+        safe_md5(Time.now.to_i + rand(1_000_000))
+      end
 
-        def textcaptcha_cache
-          @@textcaptcha_cache ||= TextcaptchaCache.new
+      def textcaptcha_cache_options
+        if textcaptcha_config[:cache_expiry_minutes]
+          { expires_in: textcaptcha_config[:cache_expiry_minutes].to_f.minutes }
+        else
+          {}
         end
+      end
+
+      def textcaptcha_cache
+        @textcaptcha_cache ||= TextcaptchaCache.new
+      end
     end
 
     private
 
-      def build_textcaptcha_config(options)
-        if options.is_a?(Hash)
-          options
-        else
-          YAML.load(ERB.new(read_textcaptcha_config).result)[Rails.env]
-        end
-      rescue
-        raise ArgumentError.new('could not find any textcaptcha options, in config/textcaptcha.yml or model - run rake textcaptcha:config to generate a template config file')
+    # rubocop:disable Security/YAMLLoad
+    def build_textcaptcha_config(options)
+      if options.is_a?(Hash)
+        options
+      else
+        YAML.load(ERB.new(read_textcaptcha_config).result)[Rails.env]
       end
+    rescue StandardError
+      raise ArgumentError, "could not find any textcaptcha options, in config/textcaptcha.yml or model - run rake textcaptcha:config to generate a template config file"
+    end
+    # rubocop:enable Security/YAMLLoad
 
-      def read_textcaptcha_config
-        File.read("#{Rails.root ? Rails.root : '.'}/config/textcaptcha.yml")
-      end
+    def read_textcaptcha_config
+      File.read("#{Rails.root || "."}/config/textcaptcha.yml")
+    end
   end
 end