acts_as_textcaptcha 4.5.2 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e756b5583199fa18a33fa9ca992d48acebffd43d290948a5fa5b857fddb6f2d
-  data.tar.gz: 31ed6774f374b928be23b38b725c37d7bb5a163af6522d4e6365ba99be573cd5
+  metadata.gz: 7cd97fc4b0edc1a595beef3a1e871ff8b5937e6edfdea0dfa03ca530d691b326
+  data.tar.gz: 8336141cfe3f343e3947bf535c1c272780e5fde2cef8aae361b744eaa742fc42
 SHA512:
-  metadata.gz: 77b9415ca1476acbf17f839675d6d97371fe3641d5512be3aed86d058acfbde2e4a41bc73a2c6be370c34f963b70ff0e2468f8393326a108d4c458bbe87cfc62
-  data.tar.gz: c6309e86be034e61672ad0193d39657c2bf21a2a5bcd9e714cbcc91bb5ab4d0fc397dfa57542ff50604a5b8a1383f1b74613702d6f348bca849eba6f999967df
+  metadata.gz: cd6b5ac95853b10106180ba45b8ec003470479f099908f79d3aede8143df3026eaa331668605ab64f74cee152f4a6eefe9d169df450b7a8c1ead66a0152f2df0
+  data.tar.gz: 65a7bb0302f22b8d583a918002b5fe1c6b2ffaa5ad68ddbb8df1dbc0cde1a549cf007326cad0e6ae6b4c97ded7a9b28b4d9ced4f5afcea10596013fb51aacac3

data/.travis.yml

@@ -4,12 +4,14 @@ gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
+  - gemfiles/rails_7.gemfile
 
 rvm:
   - 2.5.8
   - 2.6.6
   - 2.7.2
   - 3.0.0
+  - 3.1.0
   - ruby-head
 
 matrix:
@@ -20,12 +22,20 @@ matrix:
       gemfile: gemfiles/rails_4.gemfile
     - rvm: 3.0.0
       gemfile: gemfiles/rails_4.gemfile
+    - rvm: 3.1.0
+      gemfile: gemfiles/rails_4.gemfile
     - rvm: 3.0.0
       gemfile: gemfiles/rails_5.gemfile
+    - rvm: 3.1.0
+      gemfile: gemfiles/rails_5.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_4.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_5.gemfile
+    - rvm: 2.5.8
+      gemfile: gemfiles/rails_7.gemfile
+    - rvm: 2.6.6
+      gemfile: gemfiles/rails_7.gemfile
 
 deploy:
   provider: rubygems

data/Appraisals

@@ -12,3 +12,8 @@ appraise "rails-6" do
   gem "rails", "6.0.3.4"
   gem "sqlite3", "~> 1.4.2"
 end
+
+appraise "rails-7" do
+  gem "rails", "7.0.2.2"
+  gem "sqlite3", "~> 1.4.2"
+end

data/CHANGELOG.md

@@ -9,6 +9,11 @@ adheres to [Semantic Versioning][Semver].
 
 - Your contribution here!
 
+## [4.6.0] - 2022-02-14
+### Changed
+- CI covers Latest Rails version 7 and Ruby 3.1
+- Use `YAML.safe_load` and allow aliases
+
 ## [4.5.2] - 2021-01-28
 ### Changed
 - CI covers Latest Rails version 6,5,4 and Ruby 3,2.7,2.6,2.5
@@ -95,7 +100,8 @@ adheres to [Semantic Versioning][Semver].
 - README updated.
 - Test coverage improved.
 
-[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.2...HEAD
+[Unreleased]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.6.0...HEAD
+[4.6.0]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.5.2...v4.6.0
 [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

data/README.md

@@ -59,7 +59,26 @@ def new
 end
 ```
 
-Add the question and answer fields to your form using the
+Make sure these textcaptcha params
+(`:textcaptcha_answer, :textcaptcha_key`) are permitted in your create (or update) action:
+
+```ruby
+def create
+  @comment = Comment.create(commment_params)
+  # ... etc
+end
+
+private
+
+def commment_params
+  params.require(:comment).permit(:textcaptcha_answer, :textcaptcha_key, :name, :comment_text)
+end
+```
+
+**NOTE**: if the captcha is submitted incorrectly, a new captcha will be
+automatically generated on the `@comment` object.
+
+Next, add the question and answer fields to your form using the
 `textcaptcha_fields` helper. Arrange the HTML within this block as you like.
 
 ```ruby
@@ -79,12 +98,11 @@ 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
+# e.g. in 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.
+You can run `rails dev:cache` on to enable a memory store cache in the development environment.
 
 ## Configuration
 

data/acts_as_textcaptcha.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
     "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"
+    "allowed_push_host" => "https://rubygems.org",
+    "rubygems_mfa_required" => "true"
   }
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -54,7 +55,7 @@ Gem::Specification.new do |spec|
   # testing
   spec.add_development_dependency("appraisal")
   spec.add_development_dependency("minitest")
-  spec.add_development_dependency("rails", "~> 6.0.3.4")
+  spec.add_development_dependency("rails", "~> 7.0.2.2")
   spec.add_development_dependency("simplecov", "~> 0.19.1")
   spec.add_development_dependency("sqlite3")
   spec.add_development_dependency("webmock")

data/gemfiles/rails_6.gemfile

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

data/gemfiles/rails_7.gemfile

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

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -122,17 +122,15 @@ module ActsAsTextcaptcha
 
     private
 
-    # 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]
+        YAML.safe_load(ERB.new(read_textcaptcha_config).result, aliases: true)[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 || "."}/config/textcaptcha.yml")

data/lib/acts_as_textcaptcha/textcaptcha_config.rb

@@ -41,7 +41,7 @@ module ActsAsTextcaptcha
 
     def self.create(path: "./config/textcaptcha.yml")
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, "w") { |f| f.write(YAML) }
+      File.write(path, YAML)
     end
   end
 end

data/lib/acts_as_textcaptcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsTextcaptcha
-  VERSION = "4.5.2"
+  VERSION = "4.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.6.0
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
+        version: 7.0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
+        version: 7.0.2.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
+- gemfiles/rails_7.gemfile
 - lib/acts_as_textcaptcha.rb
 - lib/acts_as_textcaptcha/errors.rb
 - lib/acts_as_textcaptcha/framework/rails.rb
@@ -217,6 +218,7 @@ metadata:
   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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--title"
@@ -237,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A text-based logic question captcha for Rails