Merge pull request #85 from PlayerData/ruby-3

Author: mrcasals

.github/workflows/ci.yml

@@ -18,14 +18,25 @@ jobs:
     strategy:
       matrix:
         ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 2.7]
-        activemodel: [3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0]
+        activemodel: [3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1]
+        include:
+          - ruby: 3.0
+            activemodel: 6.0
+          - ruby: 3.0
+            activemodel: 6.1
         exclude:
           - ruby: 2.2
             activemodel: 6.0
           - ruby: 2.3
             activemodel: 6.0
           - ruby: 2.4
             activemodel: 6.0
+          - ruby: 2.2
+            activemodel: 6.1
+          - ruby: 2.3
+            activemodel: 6.1
+          - ruby: 2.4
+            activemodel: 6.1
       fail-fast: true
     env:
       ACTIVE_MODEL_VERSION: ${{ matrix.activemodel }}

Gemfile

@@ -10,7 +10,3 @@ active_model_opts =
   end
 
 gem 'activemodel', active_model_opts
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-end

lib/active_model/validations/date_validator.rb

@@ -59,19 +59,19 @@ def validate_each(record, attr_name, value)
         end
 
         if value_before_type_cast.present? && value.nil?
-          record.errors.add(attr_name, :not_a_date, options)
+          record.errors.add(attr_name, :not_a_date, **options)
           return
         end
 
         return if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
 
         unless value
-          record.errors.add(attr_name, :not_a_date, options)
+          record.errors.add(attr_name, :not_a_date, **options)
           return
         end
 
         unless is_time?(value)
-          record.errors.add(attr_name, :not_a_date, options)
+          record.errors.add(attr_name, :not_a_date, **options)
           return
         end
 
@@ -94,7 +94,7 @@ def validate_each(record, attr_name, value)
           end
 
           unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            record.errors.add(attr_name, :"date_#{option}", options.merge(
+            record.errors.add(attr_name, :"date_#{option}", **options.merge(
                 value: original_value,
                 date:  (I18n.localize(original_option_value) rescue original_option_value)
             ))