feat: adding support for rails 6 and 7

.github/workflows/tests.yml

@@ -22,13 +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
@@ -37,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:
@@ -78,7 +81,7 @@ jobs:
             username: root
             password: verysecret
             database: activeid_test
-            encoding: utf8mb4
+            encoding: binary
           EOF
 
       - name: Run tests (with monkey patches)
@@ -98,6 +101,8 @@ jobs:
         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

.rubocop.yml

@@ -4,6 +4,12 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
+# .rubocop.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false

Gemfile

@@ -3,5 +3,9 @@ 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 "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

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.2", "< 7.1"
   s.add_runtime_dependency "uuidtools"
 end

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"

gemfiles/Rails-5_2.gemfile

@@ -4,5 +4,9 @@ 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 "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

gemfiles/Rails-6_0.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.0.0"
+
+group :test do
+  gem "codecov", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

gemfiles/Rails-6_1.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.0"
+
+group :test do
+  gem "codecov", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

gemfiles/Rails-7_0.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 7.0.0"
+
+group :test do
+  gem "codecov", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

gemfiles/Rails-head.gemfile

@@ -4,5 +4,9 @@ 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 "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "simplecov", require: false
+end

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

lib/active_id/all.rb → lib/activeid/all.rb

@@ -1,2 +1,2 @@
-require_relative "../active_id"
+require_relative "../activeid"
 require_relative "connection_patches"

lib/active_id/connection_patches.rb → 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
 

lib/active_id/railtie.rb → lib/activeid/railtie.rb

@@ -1,4 +1,4 @@
-require "active_id"
+require "activeid"
 require "rails"
 
 module ActiveID

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 }