riboseinc · HassanAkbar · Mar 27, 2023 · Mar 27, 2023 · Mar 27, 2023 · Mar 27, 2023
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/lib/activeid.rb 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 → lib/activeid/all.rb b/lib/active_id/all.rb → 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 → lib/activeid/connection_patches.rb b/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
 

diff --git a/lib/active_id/model.rb → lib/activeid/model.rb b/lib/active_id/model.rb → lib/activeid/model.rb
diff --git a/lib/active_id/railtie.rb → lib/activeid/railtie.rb b/lib/active_id/railtie.rb → 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 → lib/activeid/type.rb b/lib/active_id/type.rb → lib/activeid/type.rb
diff --git a/lib/active_id/utils.rb → lib/activeid/utils.rb b/lib/active_id/utils.rb → lib/activeid/utils.rb
diff --git a/lib/active_id/version.rb → lib/activeid/version.rb b/lib/active_id/version.rb → lib/activeid/version.rb
diff --git 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 }