acts_as_textcaptcha 4.5.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e756b5583199fa18a33fa9ca992d48acebffd43d290948a5fa5b857fddb6f2d
-  data.tar.gz: 31ed6774f374b928be23b38b725c37d7bb5a163af6522d4e6365ba99be573cd5
+  metadata.gz: 97a85cf9e199655854243a2a751cd00e4c9c8b45b19eb6ae0b14293b7c1964b2
+  data.tar.gz: a26d0dbfb3a8a6a278099879f432ea2928a4add8388ba818421aaa665482f463
 SHA512:
-  metadata.gz: 77b9415ca1476acbf17f839675d6d97371fe3641d5512be3aed86d058acfbde2e4a41bc73a2c6be370c34f963b70ff0e2468f8393326a108d4c458bbe87cfc62
-  data.tar.gz: c6309e86be034e61672ad0193d39657c2bf21a2a5bcd9e714cbcc91bb5ab4d0fc397dfa57542ff50604a5b8a1383f1b74613702d6f348bca849eba6f999967df
+  metadata.gz: f5756a2a22abc5bceae0a7303cb2f1a13213307d4b02a8e00cc8704ee372e16758f583da250e309858ff52bb4421559cba099459f95c2de2bb41c65813dee17b
+  data.tar.gz: 88acda928cfd9789e5d9334ef2644b2449066024f9f3e6f0e4c2b90ca343e6c298f06f9c82921c8be408a1eb4a187fbdd95811538c640a3b56aa7266366b2b61

data/.github/workflows/build.yml

@@ -0,0 +1,40 @@
+name: Tests
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby-version:
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+        gemfile:
+          - Gemfile
+          - gemfiles/rails_6.gemfile
+        exclude:
+        - ruby-version: "3.4"
+          gemfile: gemfiles/rails_6.gemfile
+    runs-on: ubuntu-latest
+    name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
+    continue-on-error: true
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/push_gem.yml

@@ -0,0 +1,25 @@
+name: Publish gem to RubyGems.org
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - uses: rubygems/release-gem@v1

data/Appraisals

@@ -1,14 +1,7 @@
-appraise "rails-4" do
-  gem "rails", "4.2.11.3"
-  gem "sqlite3", "~> 1.3.5"
-end
-
-appraise "rails-5" do
-  gem "rails", "5.2.4.4"
-  gem "sqlite3", "~> 1.4.2"
+appraise "rails-6" do
+  gem "rails", "6.1.7.8"
 end
 
-appraise "rails-6" do
-  gem "rails", "6.0.3.4"
-  gem "sqlite3", "~> 1.4.2"
+appraise "rails-7" do
+  gem "rails", "7.2.0"
 end

data/CHANGELOG.md

@@ -9,6 +9,18 @@ adheres to [Semantic Versioning][Semver].
 
 - Your contribution here!
 
+## [4.7.0] - 2024-10-03
+### Changed
+- CI covers Latest Rails version 7, 6 and Ruby 3.1 -> 3.4
+- Removed Apprasial
+- Added GH workflow
+- Dropped rubocop, simplecov
+
+## [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 +107,9 @@ 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.7.0...HEAD
+[4.7.0]: https://github.com/matthutchinson/acts_as_textcaptcha/compare/v4.6.0...v4.7.0
+[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

@@ -1,10 +1,8 @@
 ## ActAsTextcaptcha
 
+[![Build](https://img.shields.io/github/actions/workflow/status/matthutchinson/acts_as_textcaptcha/build.yml?branch=main&style=flat)](https://github.com/matthutchinson/acts_as_textcaptcha/actions/workflows/build.yml)
 [![Gem](https://img.shields.io/gem/v/acts_as_textcaptcha.svg?style=flat)](http://rubygems.org/gems/acts_as_textcaptcha)
-[![Travis](https://img.shields.io/travis/com/matthutchinson/acts_as_textcaptcha/master.svg?style=flat)](https://travis-ci.com/matthutchinson/acts_as_textcaptcha)
 [![Depfu](https://img.shields.io/depfu/matthutchinson/acts_as_textcaptcha.svg?style=flat)](https://depfu.com/github/matthutchinson/acts_as_textcaptcha)
-[![Maintainability](https://api.codeclimate.com/v1/badges/c67969dd7b921477bdcc/maintainability)](https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/c67969dd7b921477bdcc/test_coverage)](https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha/test_coverage)
 
 ActsAsTextcaptcha provides spam protection for Rails models with text-based
 logic question captchas. Questions are fetched from [Rob
@@ -18,16 +16,13 @@ are a good idea visit [textcaptcha.com](https://textcaptcha.com).
 
 ## Requirements
 
-* [Ruby](http://ruby-lang.org/) >= 2.5
-* [Rails](http://github.com/rails/rails) >= 4
+* [Ruby](http://ruby-lang.org/) >= 3.1
+* [Rails](http://github.com/rails/rails) >= 6.1
 * A valid [Rails.cache](http://guides.rubyonrails.org/caching_with_rails.html#cache-stores) (not `:null_store`)
 
 ## Demo
 
-Try a [working demo here](https://acts-as-textcaptcha-demo.herokuapp.com)!
-Or one-click deploy your own [demo app](https://github.com/matthutchinson/acts_as_textcaptcha_demo) to Heroku.
-
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://www.heroku.com/deploy?template=https://github.com/matthutchinson/acts_as_textcaptcha_demo/tree/master)
+Try a [working demo here](https://acts-as-textcaptcha.hiddenloop.dev)!
 
 ## Installation
 
@@ -59,7 +54,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 +93,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
 
@@ -192,8 +205,7 @@ The API may be unresponsive or return an unexpected response. If you've set
 ## Development
 
 Check out this repo and run `bin/setup`, this will install gem dependencies and
-generate docs. Use `bundle exec rake` to run tests and generate a coverage
-report.
+generate docs. Use `bundle exec rake` to run tests.
 
 You can also run `bin/console` for an interactive prompt to experiment with the
 code.
@@ -239,10 +251,11 @@ Covenant](http://contributor-covenant.org) code of conduct. See
 [here](https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/CODE_OF_CONDUCT.md)
 for more details.
 
-## Todo
+## Ideas
 
+* Check if AI models can beat this approach
 * Allow translatable user supplied questions and answers in config
-* Allow `Net::HTTP` to be swapped out for any another HTTP client.
+* Allow `Net::HTTP` to be swapped out for any HTTP client.
 
 ## License
 
@@ -256,10 +269,8 @@ The code is available as open source under the terms of
 
 ## Links
 
-* [Demo](https://acts-as-textcaptcha-demo.herokuapp.com)
-* [Travis CI](http://travis-ci.com/matthutchinson/acts_as_textcaptcha)
-* [Maintainability](https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha/maintainability)
-* [Test Coverage](https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha/test_coverage)
+* [CI](https://github.com/matthutchinson/acts_as_textcaptcha/actions/workflows/build.yml)
+* [Demo](https://acts-as-textcaptcha.hiddenloop.dev)
 * [RDoc](http://rdoc.info/projects/matthutchinson/acts_as_textcaptcha)
 * [Wiki](http://wiki.github.com/matthutchinson/acts_as_textcaptcha/)
 * [Issues](http://github.com/matthutchinson/acts_as_textcaptcha/issues)

data/Rakefile

@@ -3,7 +3,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rdoc/task"
-require "rubocop/rake_task"
 
 # generate docs
 RDoc::Task.new do |rd|
@@ -21,19 +20,4 @@ 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
-    Rake::Task["rubocop"].execute
-  end
-end
-
-task default: [:rubocop, "test:coverage"]
+task default: ["test"]

data/acts_as_textcaptcha.gemspec

@@ -25,11 +25,11 @@ 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)/}) }
-  spec.test_files = `git ls-files -- {test}/*`.split("\n")
   spec.bindir = "bin"
   spec.require_paths = ["lib"]
 
@@ -38,24 +38,18 @@ Gem::Specification.new do |spec|
   spec.rdoc_options << "--title" << "ActAsTextcaptcha" << "--main" << "README.md" << "-ri"
 
   # non-gem dependecies
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 3.1"
 
   # dev gems
   spec.add_development_dependency("bundler")
-  spec.add_development_dependency("pry-byebug")
   spec.add_development_dependency "rake"
 
-  # Lint
-  spec.add_development_dependency("rubocop")
-
   # docs
   spec.add_development_dependency("rdoc")
 
   # testing
-  spec.add_development_dependency("appraisal")
+  spec.add_development_dependency("rails", "~> 7.2")
   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_6.gemfile

@@ -1,8 +1,6 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "rails", "6.1.1"
-gem "sqlite3", "~> 1.4.2"
+gem "rails", "6.1.7.8"
+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_api.rb

@@ -7,11 +7,8 @@ module ActsAsTextcaptcha
     BASE_URL = "http://textcaptcha.com"
 
     def initialize(api_key: nil, api_endpoint: nil, raise_errors: false)
-      self.uri = if api_endpoint
-                   URI(api_endpoint)
-                 else
-                   URI("#{BASE_URL}/#{api_key}.json")
-                 end
+      self.uri = URI(api_endpoint || "#{BASE_URL}/#{api_key}.json")
+
       self.raise_errors = raise_errors || false
     rescue URI::InvalidURIError => e
       raise ApiKeyError.new(api_key, e)

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.7.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.7.0
 platform: ruby
 authors:
 - Matthew Hutchinson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -177,10 +121,10 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
-- ".rubocop.yml"
 - ".simplecov"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -193,9 +137,6 @@ files:
 - acts_as_textcaptcha.gemspec
 - bin/console
 - bin/setup
-- gemfiles/rails_3.gemfile
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
 - lib/acts_as_textcaptcha.rb
 - lib/acts_as_textcaptcha/errors.rb
@@ -217,7 +158,8 @@ 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
-post_install_message:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options:
 - "--title"
 - ActAsTextcaptcha
@@ -230,15 +172,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: A text-based logic question captcha for Rails
 test_files: []