extract union_of

keygen-sh · Sep 13, 2024 · bbf00a7 · bbf00a7
1 parent 9dd5a10
commit bbf00a7
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 1,812 deletions.
diff --git a/Gemfile b/Gemfile
@@ -58,6 +58,7 @@ gem 'active_record_distinct_on', '~> 1.6'
 gem 'activerecord_where_assoc', '~> 1.1.4'
 gem 'ar_lazy_preload', '~> 2.0'
 gem 'strong_migrations'
+gem 'union_of'
 
 # Pattern matching
 gem 'rails-pattern_matching'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -497,6 +497,8 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uniform_notifier (1.16.0)
+    union_of (1.0.0)
+      rails (>= 7.0)
     uri (0.12.2)
     verbose_migrations (1.0.1)
       rails (>= 6.0)
@@ -588,6 +590,7 @@ DEPENDENCIES
   timecop (~> 0.9.5)
   tracer
   typed_params (~> 1.2.5)
+  union_of
   uri (>= 0.12.2)
   verbose_migrations
   webmock (~> 3.14.0)

diff --git a/app/models/account.rb b/app/models/account.rb
@@ -3,7 +3,6 @@
 class Account < ApplicationRecord
   include Keygen::PortableClass
   include NullAssociation::Concern
-  include UnionOf::Macro
   include Welcomeable
   include Limitable
   include Orderable

diff --git a/app/models/license.rb b/app/models/license.rb
@@ -2,7 +2,6 @@
 
 class License < ApplicationRecord
   include Envented::Callbacks
-  include UnionOf::Macro
   include Keygen::PortableClass
   include Denormalizable
   include Environmental

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -4,7 +4,6 @@ class User < ApplicationRecord
   MINIMUM_ADMIN_COUNT = 1
 
   include Keygen::PortableClass
-  include UnionOf::Macro
   include PasswordResettable
   include Environmental
   include Accountable

diff --git a/config/initializers/union_of.rb b/config/initializers/union_of.rb