Support Rails 8 (#48)

Add rails 8 support

Co-authored-by: Valter Santos <[email protected]>

Author: ric2b

.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: cimg/ruby:3.1.6
+      - image: cimg/ruby:3.2.5
     working_directory: ~/rails-multitenant
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-3.1.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-3.1.6-
+            - v1-gems-ruby-3.2.5-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-3.2.5-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-3.1.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-3.2.5-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -76,3 +76,11 @@ workflows:
                 - 3.1.6
                 - 3.2.5
                 - 3.3.5
+      - test:
+          matrix:
+            parameters:
+              gemfile:
+                - gemfiles/rails_8.0.gemfile
+              ruby_version:
+                - 3.2.5
+                - 3.3.5

Appraisals

@@ -3,6 +3,7 @@
 appraise 'rails-7.0' do
   gem 'activerecord', '~> 7.0.8'
   gem 'activesupport', '~> 7.0.8'
+  gem 'sqlite3', '~> 1.7'
 end
 
 appraise 'rails-7.1' do
@@ -14,3 +15,8 @@ appraise 'rails-7.2' do
   gem 'activerecord', '~> 7.2.1'
   gem 'activesupport', '~> 7.2.1'
 end
+
+appraise 'rails-8.0' do
+  gem 'activerecord', '~> 8.0.0'
+  gem 'activesupport', '~> 8.0.0'
+end

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.21.0
+- Add support for Rails 8.0
+
 ## 0.20.0
 * Rails 7.2 support
 * Drop unsupported rails version 6.1

gemfiles/rails_7.0.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.4"
-gem "activesupport", "~> 7.0.4"
+gem "activerecord", "~> 7.0.8"
+gem "activesupport", "~> 7.0.8"
+gem "sqlite3", "~> 1.7"
 
 gemspec path: "../"

gemfiles/rails_7.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.1.0"
-gem "activesupport", "~> 7.1.0"
+gem "activerecord", "~> 7.1.4"
+gem "activesupport", "~> 7.1.4"
 
 gemspec path: "../"

gemfiles/rails_8.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.0.0"
+gem "activesupport", "~> 8.0.0"
+
+gemspec path: "../"

lib/rails_multitenant/multitenant_model.rb

@@ -33,14 +33,10 @@ def multitenant_on(context_entity_id_field, required: true)
       def multitenant_on_model(context_entity, required: true)
         multitenant_on("#{context_entity}_id".to_sym, required: required)
 
-        if ActiveRecord::VERSION::MAJOR < 5
-          belongs_to(context_entity)
-        else
-          # Rails 5 added required validation to belongs_to associations and
-          # an `optional` setting to disable it. We already do validation on
-          # the foreign key so we always disable the native Rails validation.
-          belongs_to(context_entity, optional: true)
-        end
+        # Rails 5 added required validation to belongs_to associations and
+        # an `optional` setting to disable it. We already do validation on
+        # the foreign key so we always disable the native Rails validation.
+        belongs_to(context_entity, optional: true)
       end
 
       def validates_multitenant_uniqueness_of(*attr_names)

lib/rails_multitenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMultitenant
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

rails_multitenant.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'activerecord', '>= 7.0', '< 7.3'
-  spec.add_dependency 'activesupport', '>= 7.0', '< 7.3'
+  spec.add_dependency 'activerecord', '>= 7.0', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.1'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'coveralls'
@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.27.1'
   spec.add_development_dependency 'simplecov', '~> 0.15.1'
-  spec.add_development_dependency 'sqlite3', '~> 1.6.0'
+  spec.add_development_dependency 'sqlite3', '~> 2.1'
 end

spec/spec_helper.rb

@@ -12,7 +12,6 @@
 end
 
 require 'active_record'
-ActiveRecord::Base.belongs_to_required_by_default = true if ActiveRecord::VERSION::MAJOR >= 5
 
 require 'logger'
 require 'database_cleaner'