diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da7e3e7..1ad91aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,10 @@ jobs: fail-fast: false matrix: gemfile: ["rails-7.0.x"] - ruby: [3.1] + ruby: [3.2] include: + - gemfile: rails-7.0.x + ruby: '3.1' - gemfile: rails-7.0.x ruby: '3.0' - gemfile: rails-7.0.x diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 0d41a4d..fb5ae05 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -14,11 +14,11 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 - - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + - uses: actions/checkout@v2 + - name: Set up Ruby 3.2 + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: '3.2' - name: Publish to RubyGems run: | diff --git a/.gitignore b/.gitignore index 7f63077..a660c32 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ pkg rdoc coverage +gemfiles/*.lock *.log diff --git a/lib/validation_group.rb b/lib/validation_group.rb index 8cb1e83..baf5833 100644 --- a/lib/validation_group.rb +++ b/lib/validation_group.rb @@ -87,8 +87,8 @@ def valid?(group=nil) end end - module Errors # included in ActiveRecord::Errors - def add(attribute, msg = nil, *args, &block) + module Errors # included in ActiveModel::Errors + def add(attribute, type = :invalid, **options) # jeffp: setting @current_validation_fields and use of should_validate? optimizes code add_error = @base.respond_to?(:should_validate?) ? @base.should_validate?(attribute.to_sym) : true super if add_error diff --git a/test/test_helper.rb b/test/test_helper.rb index dfd1a81..52ed065 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,8 +1,10 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'rubygems' +require 'simplecov' +SimpleCov.minimum_coverage 89 +SimpleCov.start 'rails' -gem 'activerecord', ENV['AR_VERSION'] ? "=#{ENV['AR_VERSION']}" : '>=2.1.0' require 'active_record' require 'test/unit' require 'validation_group' diff --git a/validation_group.gemspec b/validation_group.gemspec index 0a3b9cf..9e6de6c 100644 --- a/validation_group.gemspec +++ b/validation_group.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = "validation_group" - s.version = "0.2.0" + s.version = "0.2.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Alex Kira"] @@ -18,6 +18,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'activerecord', '> 5.2', '< 8' s.add_development_dependency 'bundler', '> 1.17' s.add_development_dependency 'rake', '> 0.8' + s.add_development_dependency 'simplecov' s.add_development_dependency 'sqlite3' s.add_development_dependency 'test-unit'