From ad1e12bea11986d6144d376d5185789a0b47e957 Mon Sep 17 00:00:00 2001 From: Mathieu Jobin Date: Fri, 25 Nov 2022 15:02:37 +0900 Subject: [PATCH 1/8] update Errors#add method signatured as updated in Rails 6.0 d9011e39357300fe78720227af4c13b4bc4ac4dd --- lib/validation_group.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From d38f7ae975aba90a6e0120eb9318f91e9899ebe1 Mon Sep 17 00:00:00 2001 From: Mathieu Jobin Date: Fri, 25 Nov 2022 16:58:37 +0900 Subject: [PATCH 2/8] bump version, ensure test coverage does not go down --- .gitignore | 1 + test/test_helper.rb | 4 +++- validation_group.gemspec | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) 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/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 b4462db..764b5ea 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.1" 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' From 1e3e88d1a83258a410cad8b6eca6dff10e41d88b Mon Sep 17 00:00:00 2001 From: Mathieu Jobin Date: Fri, 25 Nov 2022 17:24:07 +0900 Subject: [PATCH 3/8] add ruby 3.2 to the build matrix --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From 87d8a40cef288e8c9bea89e9c1a219f28a29717d Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Fri, 9 Dec 2022 13:59:28 -0800 Subject: [PATCH 4/8] Bump version to 0.2.2 --- validation_group.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation_group.gemspec b/validation_group.gemspec index b1c15fb..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.1" + s.version = "0.2.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Alex Kira"] From 11561a15df35d8e5fa09fb9dc8f49336c28c22b2 Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Fri, 9 Dec 2022 14:04:49 -0800 Subject: [PATCH 5/8] Update gem-push.yml --- .github/workflows/gem-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 0d41a4d..fc7f39f 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 2.6 + - name: Set up Ruby 3.2 uses: actions/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: 3.2 - name: Publish to RubyGems run: | From a71959c8b098c203950d5ee0460dba244b6c7722 Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Fri, 9 Dec 2022 14:09:35 -0800 Subject: [PATCH 6/8] Update gem-push.yml --- .github/workflows/gem-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index fc7f39f..179df2a 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Ruby 3.2 - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: 3.2 From 24b00efe3ca59bca6c77a21b502b74b7cb61d54a Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Fri, 9 Dec 2022 14:12:15 -0800 Subject: [PATCH 7/8] Update gem-push.yml --- .github/workflows/gem-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 179df2a..679f9e3 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -14,7 +14,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Set up Ruby 3.2 uses: ruby/setup-ruby@v1 with: From 7ede661bcd51069b7c90c50945daf651a394d391 Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Fri, 9 Dec 2022 14:14:19 -0800 Subject: [PATCH 8/8] Update gem-push.yml --- .github/workflows/gem-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 679f9e3..fb5ae05 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Ruby 3.2 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: '3.2' - name: Publish to RubyGems run: |