Merge 289f9b7 into 35f1924

DavyJonesLocker · Sep 6, 2023 · 2157a7b · 2157a7b
2 parents 35f1924 + 289f9b7
commit 2157a7b
Show file tree

Hide file tree

Showing 17 changed files with 120 additions and 74 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,7 +1,11 @@
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -19,7 +19,7 @@ jobs:
         ruby-version: ['3.2']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -18,17 +18,14 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
-        gemfile: [ csv_21.0, mongoid_8.0 ]
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        gemfile: [ csv_22.0, mongoid_8.0 ]
         experimental: [false]
 
         include:
           - ruby-version: 'head'
             gemfile: mongoid_edge
             experimental: true
-          - ruby-version: '2.6'
-            gemfile: csv_edge
-            experimental: true
           - ruby-version: '2.7'
             gemfile: csv_edge
             experimental: true
@@ -44,9 +41,6 @@ jobs:
           - ruby-version: 'head'
             gemfile: csv_edge
             experimental: true
-          - ruby-version: '2.6'
-            gemfile: mongoid_edge
-            experimental: true
           - ruby-version: '2.7'
             gemfile: mongoid_edge
             experimental: true
@@ -69,7 +63,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,12 +1,13 @@
 require:
   - rubocop-minitest
+  - rubocop-packaging
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:
-  TargetRailsVersion: 5.2
-  TargetRubyVersion: 2.6
+  TargetRailsVersion: 6.1
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'gemfiles/**/*'

diff --git a/Appraisals b/Appraisals
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-appraise 'csv-21.0' do
-  gem 'client_side_validations', '~> 21.0'
+appraise 'csv-22.0' do
+  gem 'client_side_validations', '~> 22.0'
 end
 
 appraise 'csv-edge' do

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 14.0.0 / 2023-09-06
+
+* [FEATURE] Drop Ruby 2.6 support
+* [FEATURE] Drop Client Side Validations < 22.0 compatibility
+* [ENHANCEMENT] Update development dependencies
+
 ## 13.0.0 / 2022-09-18
 
 * [FEATURE] Drop Ruby 2.5 support

diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,19 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rubocop', '~> 1.41'
-gem 'rubocop-minitest', '~> 0.30.0'
-gem 'rubocop-performance', '~> 1.15'
-gem 'rubocop-rails', '~> 2.17'
-gem 'rubocop-rake', '~> 0.6.0'
+gem 'appraisal'
+gem 'byebug'
+gem 'database_cleaner-mongoid'
+gem 'm'
+gem 'minitest'
+gem 'mocha'
+gem 'rake'
+gem 'rubocop'
+gem 'rubocop-minitest'
+gem 'rubocop-packaging'
+gem 'rubocop-performance'
+gem 'rubocop-rails'
+gem 'rubocop-rake'
+gem 'simplecov'
+gem 'simplecov-lcov'
+gem 'sinatra'
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Geremia Taglialatela, Brian Cardarella
+Copyright (c) 2023 Geremia Taglialatela, Brian Cardarella
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/client_side_validations-mongoid.gemspec b/client_side_validations-mongoid.gemspec
@@ -17,26 +17,16 @@ Gem::Specification.new do |spec|
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.metadata['bug_tracker_uri'] = 'https://github.com/DavyJonesLocker/client_side_validations-simple_form/issues'
-  spec.metadata['changelog_uri']   = 'https://github.com/DavyJonesLocker/client_side_validations-simple_form/blob/main/CHANGELOG.md'
-  spec.metadata['source_code_uri'] = 'https://github.com/DavyJonesLocker/client_side_validations-simple_form'
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/DavyJonesLocker/client_side_validations-mongoid/issues'
+  spec.metadata['changelog_uri']   = 'https://github.com/DavyJonesLocker/client_side_validations-mongoid/blob/main/CHANGELOG.md'
+  spec.metadata['source_code_uri'] = 'https://github.com/DavyJonesLocker/client_side_validations-mongoid'
 
-  spec.files         = `git ls-files -z -- {CHANGELOG.md,LICENSE.md,README.md,lib}`.split("\x0")
+  spec.files         = Dir.glob('{CHANGELOG.md,LICENSE.md,README.md,lib/**/*.rb}', File::FNM_DOTMATCH)
   spec.require_paths = ['lib']
 
   spec.platform              = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency 'client_side_validations', '~> 21.0'
+  spec.add_dependency 'client_side_validations', '~> 22.0'
   spec.add_dependency 'mongoid', '>= 8.0', '< 9'
-
-  spec.add_development_dependency 'appraisal', '~> 2.4'
-  spec.add_development_dependency 'byebug', '~> 11.1'
-  spec.add_development_dependency 'database_cleaner-mongoid', '~> 2.0'
-  spec.add_development_dependency 'm', '~> 1.6'
-  spec.add_development_dependency 'minitest', '~> 5.16'
-  spec.add_development_dependency 'mocha', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'simplecov', '~> 0.22.0'
-  spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 end
diff --git a/gemfiles/csv_21.0.gemfile b/gemfiles/csv_21.0.gemfile
diff --git a/gemfiles/csv_22.0.gemfile b/gemfiles/csv_22.0.gemfile
@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "byebug"
+gem "database_cleaner-mongoid"
+gem "m"
+gem "minitest"
+gem "mocha"
+gem "rake"
+gem "rubocop"
+gem "rubocop-minitest"
+gem "rubocop-packaging"
+gem "rubocop-performance"
+gem "rubocop-rails"
+gem "rubocop-rake"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "sinatra"
+gem "client_side_validations", "~> 22.0"
+
+gemspec path: "../"
diff --git a/gemfiles/csv_edge.gemfile b/gemfiles/csv_edge.gemfile
@@ -2,11 +2,22 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.36"
-gem "rubocop-minitest", "~> 0.22.1"
-gem "rubocop-performance", "~> 1.15"
-gem "rubocop-rails", "~> 2.16"
-gem "rubocop-rake", "~> 0.6.0"
+gem "appraisal"
+gem "byebug"
+gem "database_cleaner-mongoid"
+gem "m"
+gem "minitest"
+gem "mocha"
+gem "rake"
+gem "rubocop"
+gem "rubocop-minitest"
+gem "rubocop-packaging"
+gem "rubocop-performance"
+gem "rubocop-rails"
+gem "rubocop-rake"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "sinatra"
 gem "client_side_validations", git: "https://github.com/DavyJonesLocker/client_side_validations.git", branch: "main"
 
 gemspec path: "../"
diff --git a/gemfiles/mongoid_8.0.gemfile b/gemfiles/mongoid_8.0.gemfile
@@ -2,11 +2,22 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.36"
-gem "rubocop-minitest", "~> 0.22.1"
-gem "rubocop-performance", "~> 1.15"
-gem "rubocop-rails", "~> 2.16"
-gem "rubocop-rake", "~> 0.6.0"
+gem "appraisal"
+gem "byebug"
+gem "database_cleaner-mongoid"
+gem "m"
+gem "minitest"
+gem "mocha"
+gem "rake"
+gem "rubocop"
+gem "rubocop-minitest"
+gem "rubocop-packaging"
+gem "rubocop-performance"
+gem "rubocop-rails"
+gem "rubocop-rake"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "sinatra"
 gem "mongoid", "~> 8.0"
 
 gemspec path: "../"
diff --git a/gemfiles/mongoid_edge.gemfile b/gemfiles/mongoid_edge.gemfile
@@ -2,11 +2,22 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.36"
-gem "rubocop-minitest", "~> 0.22.1"
-gem "rubocop-performance", "~> 1.15"
-gem "rubocop-rails", "~> 2.16"
-gem "rubocop-rake", "~> 0.6.0"
+gem "appraisal"
+gem "byebug"
+gem "database_cleaner-mongoid"
+gem "m"
+gem "minitest"
+gem "mocha"
+gem "rake"
+gem "rubocop"
+gem "rubocop-minitest"
+gem "rubocop-packaging"
+gem "rubocop-performance"
+gem "rubocop-rails"
+gem "rubocop-rake"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "sinatra"
 gem "mongoid", git: "https://github.com/mongodb/mongoid.git", branch: "master"
 
 gemspec path: "../"
diff --git a/lib/client_side_validations/mongoid/version.rb b/lib/client_side_validations/mongoid/version.rb
@@ -2,6 +2,6 @@
 
 module ClientSideValidations
   module Mongoid
-    VERSION = '13.0.0'
+    VERSION = '14.0.0'
   end
 end
diff --git a/test/base_helper.rb b/test/base_helper.rb
@@ -21,15 +21,11 @@
 end
 
 require 'rubygems'
-require 'bundler/setup'
 require 'minitest/autorun'
 require 'byebug'
 require 'mocha/minitest'
 require 'rails'
 
 require 'database_cleaner-mongoid'
 
-# MiniTest 4 support
-MiniTest::Test = MiniTest::Unit::TestCase unless defined?(MiniTest::Test)
-
 module ClientSideValidations; end
diff --git a/test/mongoid/cases/test_base.rb b/test/mongoid/cases/test_base.rb
@@ -3,7 +3,7 @@
 require 'mongoid/cases/helper'
 
 module ClientSideValidations
-  class MongoidTestBase < MiniTest::Test
+  class MongoidTestBase < Minitest::Test
     include ::Mongoid::Validatable
 
     def setup