add support for Ruby 3.0

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
  - name: Set up Ruby
  uses: ruby/setup-ruby@v1
  with:
- ruby-version: "2.7"
+ ruby-version: "3.0"
 
  - name: Build
  run: |
@@ -31,8 +31,15 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- ruby: ["2.7"]
- activemodel: ["6.1", "6.0", "5.2", "5.1", "5.0"]
+ ruby: ["3.0"]
+ activemodel: ["6.1", "6.0"]
+ include:
+ - activemodel: "5.2"
+ ruby: "2.7"
+ - activemodel: "5.1"
+ ruby: "2.7"
+ - activemodel: "5.0"
+ ruby: "2.7"
 
  steps:
  - uses: actions/checkout@v2
@@ -58,7 +65,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- ruby: ["2.6", "2.5", "jruby-9.2.11.1"]
+ ruby: ["2.7", "2.6", "2.5", "jruby-9.2.11.1"]
  activemodel: ["5.2"]
 
  steps:

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## Changed
 
-- drop support for Ruby < 2.5
-- drop support for Rails < 5.0
+- drop support for Ruby < 2.5, added support for Ruby 3.0
+- drop support for Rails < 5.0, added support for Rails 6.1
 - [#398][] - Predicate methods have been removed.
  ([how to upgrade](#predicate-methods))
 - [#412][] - Filters will now treat blank string values as `nil`

lib/active_interaction/base.rb

@@ -313,8 +313,8 @@ def populate_filters(inputs)
 
  def type_check
  run_callbacks(:type_check) do
- Validation.validate(self, self.class.filters, inputs).each do |error|
- errors.add(*error)
+ Validation.validate(self, self.class.filters, inputs).each do |attr, type, kwargs = {}|
+ errors.add(attr, type, **kwargs)
  end
  end
  end

lib/active_interaction/errors.rb

@@ -150,7 +150,7 @@ def merge_detail!(attribute, detail, message)
  options = detail.dup
  error = options.delete(:error)
 
- add(attribute, error, options.merge(message: message)) unless added?(attribute, error, options)
+ add(attribute, error, **options.merge(message: message)) unless added?(attribute, error, **options)
  else
  merge_message!(attribute, message)
  end