From 132c04ab11e0847781b1698253c3a45126cda954 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 16:14:39 +0500
Subject: [PATCH 1/8] feat: adding support for rails 6 and 7

---
 .github/workflows/tests.yml                       |  3 +++
 activeid.gemspec                                  |  6 +++---
 examples/name_based_uuids.rb                      |  2 +-
 examples/registering_active_record_type.rb        |  2 +-
 examples/storing_uuids_as_binaries.rb             |  2 +-
 examples/storing_uuids_as_strings.rb              |  2 +-
 examples/storing_uuids_natively.rb                |  2 +-
 examples/time_based_uuids.rb                      |  2 +-
 examples/using_migrations.rb                      |  6 +++---
 gemfiles/Rails-6_0.gemfile                        |  8 ++++++++
 gemfiles/Rails-6_1.gemfile                        |  8 ++++++++
 gemfiles/Rails-7_0.gemfile                        |  8 ++++++++
 lib/active_id.rb                                  | 12 ------------
 lib/activeid.rb                                   | 12 ++++++++++++
 lib/{active_id => activeid}/all.rb                |  2 +-
 lib/{active_id => activeid}/connection_patches.rb |  3 ++-
 lib/{active_id => activeid}/model.rb              |  0
 lib/{active_id => activeid}/railtie.rb            |  2 +-
 lib/{active_id => activeid}/type.rb               |  0
 lib/{active_id => activeid}/utils.rb              |  0
 lib/{active_id => activeid}/version.rb            |  0
 spec/spec_helper.rb                               |  4 ++--
 22 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 gemfiles/Rails-6_0.gemfile
 create mode 100644 gemfiles/Rails-6_1.gemfile
 create mode 100644 gemfiles/Rails-7_0.gemfile
 delete mode 100644 lib/active_id.rb
 create mode 100644 lib/activeid.rb
 rename lib/{active_id => activeid}/all.rb (54%)
 rename lib/{active_id => activeid}/connection_patches.rb (92%)
 rename lib/{active_id => activeid}/model.rb (100%)
 rename lib/{active_id => activeid}/railtie.rb (89%)
 rename lib/{active_id => activeid}/type.rb (100%)
 rename lib/{active_id => activeid}/utils.rb (100%)
 rename lib/{active_id => activeid}/version.rb (100%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 06a32fc..7e1890a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,9 @@ jobs:
           - 2.4
           - jruby
         gemfile:
+          - Rails-7_0
+          - Rails-6_1
+          - Rails-6_0
           - Rails-5_2
           - Rails-5_1
           - Rails-5_0
diff --git a/activeid.gemspec b/activeid.gemspec
index 91c71ab..8002bd5 100644
--- a/activeid.gemspec
+++ b/activeid.gemspec
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 $:.push File.expand_path("../lib", __FILE__)
-require "active_id/version"
+require "activeid/version"
 
 Gem::Specification.new do |s|
   s.name        = "activeid"
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
   else
     s.add_development_dependency "mysql2"
     s.add_development_dependency "pg"
-    s.add_development_dependency "sqlite3", "~> 1.3.6"
+    s.add_development_dependency "sqlite3", "~> 1.4.0"
   end
 
-  s.add_runtime_dependency "activerecord", ">= 5.0", "< 6.0"
+  s.add_runtime_dependency "activerecord", ">= 5.0", "< 7.1"
   s.add_runtime_dependency "uuidtools"
 end
diff --git a/examples/name_based_uuids.rb b/examples/name_based_uuids.rb
index 9cb0d2a..7c57136 100644
--- a/examples/name_based_uuids.rb
+++ b/examples/name_based_uuids.rb
@@ -6,7 +6,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/registering_active_record_type.rb b/examples/registering_active_record_type.rb
index ef08a34..d7bfd55 100644
--- a/examples/registering_active_record_type.rb
+++ b/examples/registering_active_record_type.rb
@@ -9,7 +9,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/storing_uuids_as_binaries.rb b/examples/storing_uuids_as_binaries.rb
index 0168b52..b77b3e2 100644
--- a/examples/storing_uuids_as_binaries.rb
+++ b/examples/storing_uuids_as_binaries.rb
@@ -13,7 +13,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/storing_uuids_as_strings.rb b/examples/storing_uuids_as_strings.rb
index 7f7fc8e..b7db886 100644
--- a/examples/storing_uuids_as_strings.rb
+++ b/examples/storing_uuids_as_strings.rb
@@ -5,7 +5,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/storing_uuids_natively.rb b/examples/storing_uuids_natively.rb
index 1fe1d78..4d875e7 100644
--- a/examples/storing_uuids_natively.rb
+++ b/examples/storing_uuids_natively.rb
@@ -15,7 +15,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/time_based_uuids.rb b/examples/time_based_uuids.rb
index 6da1eb9..07681b8 100644
--- a/examples/time_based_uuids.rb
+++ b/examples/time_based_uuids.rb
@@ -7,7 +7,7 @@
 require "bundler/setup"
 Bundler.require :development
 
-require "active_id"
+require "activeid"
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
 
diff --git a/examples/using_migrations.rb b/examples/using_migrations.rb
index 926d5e6..672ad60 100644
--- a/examples/using_migrations.rb
+++ b/examples/using_migrations.rb
@@ -1,14 +1,14 @@
 # Active UUID features a convenience #uuid method, which may be used to create
 # a binary column in database migration.  Since it involves monkey patching,
-# "active_id/all" must be loaded.
+# "activeid/all" must be loaded.
 
 ENV["DB"] ||= "sqlite3"
 
 require "bundler/setup"
 Bundler.require :development
 
-# Note "active_id/all", which registers new column definitions!
-require "active_id/all"
+# Note "activeid/all", which registers new column definitions!
+require "activeid/all"
 
 require_relative "../spec/support/0_logger"
 require_relative "../spec/support/1_db_connection"
diff --git a/gemfiles/Rails-6_0.gemfile b/gemfiles/Rails-6_0.gemfile
new file mode 100644
index 0000000..295150e
--- /dev/null
+++ b/gemfiles/Rails-6_0.gemfile
@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.0.0"
+
+gem "codecov", require: false, group: :test
+gem "simplecov", require: false, group: :test
diff --git a/gemfiles/Rails-6_1.gemfile b/gemfiles/Rails-6_1.gemfile
new file mode 100644
index 0000000..2365bf7
--- /dev/null
+++ b/gemfiles/Rails-6_1.gemfile
@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.0"
+
+gem "codecov", require: false, group: :test
+gem "simplecov", require: false, group: :test
diff --git a/gemfiles/Rails-7_0.gemfile b/gemfiles/Rails-7_0.gemfile
new file mode 100644
index 0000000..b45d58c
--- /dev/null
+++ b/gemfiles/Rails-7_0.gemfile
@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 7.0.0"
+
+gem "codecov", require: false, group: :test
+gem "simplecov", require: false, group: :test
diff --git a/lib/active_id.rb b/lib/active_id.rb
deleted file mode 100644
index f326ee4..0000000
--- a/lib/active_id.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "active_id/version"
-require "active_id/utils"
-require "active_id/model"
-require "active_id/type"
-require "active_id/railtie" if defined?(Rails::Railtie)
-require "pp"
-
-module ActiveID
-  class << self
-    delegate :quote_as_binary, to: Utils
-  end
-end
diff --git a/lib/activeid.rb b/lib/activeid.rb
new file mode 100644
index 0000000..835af1a
--- /dev/null
+++ b/lib/activeid.rb
@@ -0,0 +1,12 @@
+require "activeid/version"
+require "activeid/utils"
+require "activeid/model"
+require "activeid/type"
+require "activeid/railtie" if defined?(Rails::Railtie)
+require "pp"
+
+module ActiveID
+  class << self
+    delegate :quote_as_binary, to: Utils
+  end
+end
diff --git a/lib/active_id/all.rb b/lib/activeid/all.rb
similarity index 54%
rename from lib/active_id/all.rb
rename to lib/activeid/all.rb
index 01ea556..f5cb16d 100644
--- a/lib/active_id/all.rb
+++ b/lib/activeid/all.rb
@@ -1,2 +1,2 @@
-require_relative "../active_id"
+require_relative "../activeid"
 require_relative "connection_patches"
diff --git a/lib/active_id/connection_patches.rb b/lib/activeid/connection_patches.rb
similarity index 92%
rename from lib/active_id/connection_patches.rb
rename to lib/activeid/connection_patches.rb
index 809d443..ecb312b 100644
--- a/lib/active_id/connection_patches.rb
+++ b/lib/activeid/connection_patches.rb
@@ -1,11 +1,12 @@
 require "active_record"
 require "active_support/concern"
+require "active_id/railtie" if defined?(Rails::Railtie)
 
 module ActiveID
   module ConnectionPatches
     module ColumnMethods
       def uuid(*args, **options)
-        args.each { |name| column(name, :uuid, options) }
+        args.each { |name| column(name, :uuid, **options) }
       end
     end
 
diff --git a/lib/active_id/model.rb b/lib/activeid/model.rb
similarity index 100%
rename from lib/active_id/model.rb
rename to lib/activeid/model.rb
diff --git a/lib/active_id/railtie.rb b/lib/activeid/railtie.rb
similarity index 89%
rename from lib/active_id/railtie.rb
rename to lib/activeid/railtie.rb
index b6248e7..8bb1ed2 100644
--- a/lib/active_id/railtie.rb
+++ b/lib/activeid/railtie.rb
@@ -1,4 +1,4 @@
-require "active_id"
+require "activeid"
 require "rails"
 
 module ActiveID
diff --git a/lib/active_id/type.rb b/lib/activeid/type.rb
similarity index 100%
rename from lib/active_id/type.rb
rename to lib/activeid/type.rb
diff --git a/lib/active_id/utils.rb b/lib/activeid/utils.rb
similarity index 100%
rename from lib/active_id/utils.rb
rename to lib/activeid/utils.rb
diff --git a/lib/active_id/version.rb b/lib/activeid/version.rb
similarity index 100%
rename from lib/active_id/version.rb
rename to lib/activeid/version.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f11e6ff..16d4923 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,9 +12,9 @@
 Bundler.require :development
 
 if ENV.fetch("NO_PATCHES", false)
-  require "active_id"
+  require "activeid"
 else
-  require "active_id/all"
+  require "activeid/all"
 end
 
 Dir[File.expand_path("support/**/*.rb", __dir__)].sort.each { |f| require f }

From 138ca516a7b874b084a150ed3313dea5fffc591d Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 16:32:45 +0500
Subject: [PATCH 2/8] removed support for old ruby and rails

- support for ruby version < 2.6 removed
- support for rails version < 5.2 removed
---
 .github/workflows/tests.yml | 4 ----
 activeid.gemspec            | 2 +-
 gemfiles/Rails-5_0.gemfile  | 8 --------
 gemfiles/Rails-5_1.gemfile  | 8 --------
 4 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 gemfiles/Rails-5_0.gemfile
 delete mode 100644 gemfiles/Rails-5_1.gemfile

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7e1890a..89f2b0c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,16 +22,12 @@ jobs:
         ruby:
           - 2.7
           - 2.6
-          - 2.5
-          - 2.4
           - jruby
         gemfile:
           - Rails-7_0
           - Rails-6_1
           - Rails-6_0
           - Rails-5_2
-          - Rails-5_1
-          - Rails-5_0
         backend:
           - sqlite3
           - mysql
diff --git a/activeid.gemspec b/activeid.gemspec
index 8002bd5..bca2378 100644
--- a/activeid.gemspec
+++ b/activeid.gemspec
@@ -37,6 +37,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency "sqlite3", "~> 1.4.0"
   end
 
-  s.add_runtime_dependency "activerecord", ">= 5.0", "< 7.1"
+  s.add_runtime_dependency "activerecord", ">= 5.2", "< 7.1"
   s.add_runtime_dependency "uuidtools"
 end
diff --git a/gemfiles/Rails-5_0.gemfile b/gemfiles/Rails-5_0.gemfile
deleted file mode 100644
index 7b374a2..0000000
--- a/gemfiles/Rails-5_0.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
-
-gem "activerecord", "~> 5.0.0"
-
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
diff --git a/gemfiles/Rails-5_1.gemfile b/gemfiles/Rails-5_1.gemfile
deleted file mode 100644
index 3105c3b..0000000
--- a/gemfiles/Rails-5_1.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
-
-gem "activerecord", "~> 5.1.0"
-
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test

From f2fda517ff1780b97e7565b2ba092240be0a0ae9 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 16:37:51 +0500
Subject: [PATCH 3/8] fixed rubocop errors

---
 .rubocop.yml                | 2 ++
 Gemfile                     | 7 +++++--
 gemfiles/Rails-5_2.gemfile  | 7 +++++--
 gemfiles/Rails-6_0.gemfile  | 7 +++++--
 gemfiles/Rails-6_1.gemfile  | 7 +++++--
 gemfiles/Rails-7_0.gemfile  | 7 +++++--
 gemfiles/Rails-head.gemfile | 7 +++++--
 7 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e150d76..5976c47 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,8 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
+require: rubocop-rails
+
 AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false
diff --git a/Gemfile b/Gemfile
index f80dbeb..4977b0e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in activeid.gemspec
 gemspec
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end
diff --git a/gemfiles/Rails-5_2.gemfile b/gemfiles/Rails-5_2.gemfile
index ac56928..b849bbd 100644
--- a/gemfiles/Rails-5_2.gemfile
+++ b/gemfiles/Rails-5_2.gemfile
@@ -4,5 +4,8 @@ gemspec path: "../"
 
 gem "activerecord", "~> 5.2.0"
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end
diff --git a/gemfiles/Rails-6_0.gemfile b/gemfiles/Rails-6_0.gemfile
index 295150e..e81727a 100644
--- a/gemfiles/Rails-6_0.gemfile
+++ b/gemfiles/Rails-6_0.gemfile
@@ -4,5 +4,8 @@ gemspec path: "../"
 
 gem "activerecord", "~> 6.0.0"
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end
diff --git a/gemfiles/Rails-6_1.gemfile b/gemfiles/Rails-6_1.gemfile
index 2365bf7..d7b7aa5 100644
--- a/gemfiles/Rails-6_1.gemfile
+++ b/gemfiles/Rails-6_1.gemfile
@@ -4,5 +4,8 @@ gemspec path: "../"
 
 gem "activerecord", "~> 6.1.0"
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end
diff --git a/gemfiles/Rails-7_0.gemfile b/gemfiles/Rails-7_0.gemfile
index b45d58c..0908431 100644
--- a/gemfiles/Rails-7_0.gemfile
+++ b/gemfiles/Rails-7_0.gemfile
@@ -4,5 +4,8 @@ gemspec path: "../"
 
 gem "activerecord", "~> 7.0.0"
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end
diff --git a/gemfiles/Rails-head.gemfile b/gemfiles/Rails-head.gemfile
index a19adfc..2cb5185 100644
--- a/gemfiles/Rails-head.gemfile
+++ b/gemfiles/Rails-head.gemfile
@@ -4,5 +4,8 @@ gemspec path: "../"
 
 gem "activerecord", github: "rails/rails"
 
-gem "codecov", require: false, group: :test
-gem "simplecov", require: false, group: :test
+group :test do
+  gem "codecov", require: false
+  gem "simplecov", require: false
+  gem "rubocop-rails", require: false
+end

From 1b128ec91fc05686ce764c1b11161f7b5f2c56b7 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 16:40:45 +0500
Subject: [PATCH 4/8] adding rubocop-performance for rubocop

---
 .rubocop.yml                | 6 +++++-
 Gemfile                     | 1 +
 gemfiles/Rails-5_2.gemfile  | 1 +
 gemfiles/Rails-6_0.gemfile  | 1 +
 gemfiles/Rails-6_1.gemfile  | 1 +
 gemfiles/Rails-7_0.gemfile  | 1 +
 gemfiles/Rails-head.gemfile | 1 +
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 5976c47..811b553 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,11 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
-require: rubocop-rails
+# .rubocop.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rails
 
 AllCops:
   DisplayCopNames: false
diff --git a/Gemfile b/Gemfile
index 4977b0e..f1968d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,4 +7,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end
diff --git a/gemfiles/Rails-5_2.gemfile b/gemfiles/Rails-5_2.gemfile
index b849bbd..11d0176 100644
--- a/gemfiles/Rails-5_2.gemfile
+++ b/gemfiles/Rails-5_2.gemfile
@@ -8,4 +8,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end
diff --git a/gemfiles/Rails-6_0.gemfile b/gemfiles/Rails-6_0.gemfile
index e81727a..05ef109 100644
--- a/gemfiles/Rails-6_0.gemfile
+++ b/gemfiles/Rails-6_0.gemfile
@@ -8,4 +8,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end
diff --git a/gemfiles/Rails-6_1.gemfile b/gemfiles/Rails-6_1.gemfile
index d7b7aa5..7fb7235 100644
--- a/gemfiles/Rails-6_1.gemfile
+++ b/gemfiles/Rails-6_1.gemfile
@@ -8,4 +8,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end
diff --git a/gemfiles/Rails-7_0.gemfile b/gemfiles/Rails-7_0.gemfile
index 0908431..2ea84d7 100644
--- a/gemfiles/Rails-7_0.gemfile
+++ b/gemfiles/Rails-7_0.gemfile
@@ -8,4 +8,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end
diff --git a/gemfiles/Rails-head.gemfile b/gemfiles/Rails-head.gemfile
index 2cb5185..9d9c5dc 100644
--- a/gemfiles/Rails-head.gemfile
+++ b/gemfiles/Rails-head.gemfile
@@ -8,4 +8,5 @@ group :test do
   gem "codecov", require: false
   gem "simplecov", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-performance", require: false
 end

From dda15ec9e419f78e37082b9836f22e1e19e46dc4 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 16:42:32 +0500
Subject: [PATCH 5/8] fixing rubocop suggestions

---
 Gemfile                     | 4 ++--
 gemfiles/Rails-5_2.gemfile  | 4 ++--
 gemfiles/Rails-6_0.gemfile  | 4 ++--
 gemfiles/Rails-6_1.gemfile  | 4 ++--
 gemfiles/Rails-7_0.gemfile  | 4 ++--
 gemfiles/Rails-head.gemfile | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index f1968d0..5bf137f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gemspec
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end
diff --git a/gemfiles/Rails-5_2.gemfile b/gemfiles/Rails-5_2.gemfile
index 11d0176..189703f 100644
--- a/gemfiles/Rails-5_2.gemfile
+++ b/gemfiles/Rails-5_2.gemfile
@@ -6,7 +6,7 @@ gem "activerecord", "~> 5.2.0"
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end
diff --git a/gemfiles/Rails-6_0.gemfile b/gemfiles/Rails-6_0.gemfile
index 05ef109..96b5f7e 100644
--- a/gemfiles/Rails-6_0.gemfile
+++ b/gemfiles/Rails-6_0.gemfile
@@ -6,7 +6,7 @@ gem "activerecord", "~> 6.0.0"
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end
diff --git a/gemfiles/Rails-6_1.gemfile b/gemfiles/Rails-6_1.gemfile
index 7fb7235..cd09a22 100644
--- a/gemfiles/Rails-6_1.gemfile
+++ b/gemfiles/Rails-6_1.gemfile
@@ -6,7 +6,7 @@ gem "activerecord", "~> 6.1.0"
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end
diff --git a/gemfiles/Rails-7_0.gemfile b/gemfiles/Rails-7_0.gemfile
index 2ea84d7..c7d3b92 100644
--- a/gemfiles/Rails-7_0.gemfile
+++ b/gemfiles/Rails-7_0.gemfile
@@ -6,7 +6,7 @@ gem "activerecord", "~> 7.0.0"
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end
diff --git a/gemfiles/Rails-head.gemfile b/gemfiles/Rails-head.gemfile
index 9d9c5dc..640cd07 100644
--- a/gemfiles/Rails-head.gemfile
+++ b/gemfiles/Rails-head.gemfile
@@ -6,7 +6,7 @@ gem "activerecord", github: "rails/rails"
 
 group :test do
   gem "codecov", require: false
-  gem "simplecov", require: false
-  gem "rubocop-rails", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
 end

From 36ed4e2169b5346b67e75664d8969adeab414151 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Mon, 27 Mar 2023 17:13:18 +0500
Subject: [PATCH 6/8] fixed ruby version error in test cases

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 89f2b0c..d55577c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -36,6 +36,10 @@ jobs:
           # Allow test failures for some configurations
           - ruby: jruby
             allow-failures: true
+        exclude:
+          # Rails 7 depends on ruby 2.7
+          - ruby: 2.6
+            gemfile: Rails-7_0
 
     env:
       # For Bundler control variables, refer to:

From 83fc6a6da57ab410a114dfbaae9fe02d4bf7d36b Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Tue, 28 Mar 2023 15:34:45 +0500
Subject: [PATCH 7/8] fixing test cases

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d55577c..97f81c7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,7 +81,7 @@ jobs:
             username: root
             password: verysecret
             database: activeid_test
-            encoding: utf8mb4
+            encoding: binary
           EOF
 
       - name: Run tests (with monkey patches)
@@ -98,6 +98,7 @@ jobs:
     services:
       mariadb:
         image: mariadb:latest
+        command: --character-set-server=binary --collation-server=binary
         env:
           MYSQL_ROOT_PASSWORD: verysecret
           MYSQL_DATABASE: activeid_test

From 83ab9ea211d49a99175ea7651c33a99ff0d74202 Mon Sep 17 00:00:00 2001
From: HassanAkbar <hassanakbar2@gmail.com>
Date: Tue, 28 Mar 2023 15:41:05 +0500
Subject: [PATCH 8/8] trying to fix test cases

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 97f81c7..69ea8d3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -98,10 +98,11 @@ jobs:
     services:
       mariadb:
         image: mariadb:latest
-        command: --character-set-server=binary --collation-server=binary
         env:
           MYSQL_ROOT_PASSWORD: verysecret
           MYSQL_DATABASE: activeid_test
+          MARIADB_DEFAULT_CHARACTER_SET: binary
+          MARIADB_DEFAULT_COLLATE: binary
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval=7s