Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ jobs:
strategy:
fail-fast: false
matrix:
gemfile: ["rails-7.0.x"]
ruby: [3.1]
gemfile: ["rails-7.0.x", "rails-8.0.x"]
ruby: [3.2, 3.3]
include:
- gemfile: rails-7.0.x
ruby: '3.1'
- gemfile: rails-7.0.x
ruby: '3.0'
- gemfile: rails-7.0.x
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gem-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
pkg
rdoc
coverage
gemfiles/*.lock
*.log
5 changes: 5 additions & 0 deletions gemfiles/Gemfile.rails-8.0.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

gemspec path: '../'

gem 'activerecord', '~> 8.0.4'
4 changes: 2 additions & 2 deletions lib/validation_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
5 changes: 3 additions & 2 deletions validation_group.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |s|
s.name = "validation_group"
s.version = "0.2.0"
s.version = "0.2.3"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Alex Kira"]
Expand All @@ -15,9 +15,10 @@ Gem::Specification.new do |s|
s.summary = "Validation groups for ActiveRecord"
s.test_files = ["test/validation_group_test.rb"]

s.add_runtime_dependency 'activerecord', '> 5.2', '< 8'
s.add_runtime_dependency 'activerecord', '> 5.2', '< 8.1'
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'

Expand Down
Loading