rails_multisite 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b6e5b2d0e1ca292a9ab4b32619f7b090cc8f6cd7f7e961dd8d84b6d8eb5327
-  data.tar.gz: 24fb6fe44ef528dd8dbfdd1e79ef2b70d8c41f53d133a23ec457fea9743423fc
+  metadata.gz: add7672e986dbdd0ce0f0218a8fa8bdc47bc2d3fcf249713815168d1948bcb7d
+  data.tar.gz: ab260853b44b22769750544cf1074be4e395eb9970e06355c6379c84a790782d
 SHA512:
-  metadata.gz: 597ff3dce81db99a341eb8fd10a656bc789b6f6dcc540e580b53b9e7ea8a392c006255f37bd249731412e71b883497479cd18e168871c7ee8260df712dc48d71
-  data.tar.gz: a6dd8debbb37fba683da03fb7cf71a95c757a8ce2e9393ecbb211cfc64b407f7a78adc3bfcc357efb4049c9e60b733aa62ad6a704a7b3e31b875bef7f297ba6c
+  metadata.gz: 59870af95574bfac059ed5f51778d2dea7e88824471e00be8fdb3fbe67e6ffded38432aa1c1c45daf4c92c8420c675b2bbe283ffd740a76acef4ce0ee6dab801
+  data.tar.gz: abfeb349711a8bdb66195ada55f7d441ced7da0fc1d4fe6b702a45d7d24a1b55e5a2f1a834cff708870caeb183acf84c9ac3544d1f1382cd6283a272b7fa5270

data/lib/rails_multisite/connection_management.rb

@@ -10,6 +10,8 @@ module RailsMultisite
   class ConnectionManagement
     DEFAULT = 'default'
 
+    cattr_accessor :connection_handlers, default: {}
+
     def self.default_config_filename
       File.absolute_path(Rails.root.to_s + "/config/multisite.yml")
     end
@@ -134,7 +136,9 @@ module RailsMultisite
 
     def self.handler_key(spec)
       @handler_key_suffix ||= begin
-        if ActiveRecord::Base.respond_to?(:writing_role)
+        if ActiveRecord.respond_to?(:writing_role)
+          "_#{ActiveRecord.writing_role}"
+        elsif ActiveRecord::Base.respond_to?(:writing_role)
           "_#{ActiveRecord::Base.writing_role}"
         else
           ""
@@ -154,20 +158,12 @@ module RailsMultisite
       end
     end
 
-    attr_reader :config_filename, :db_spec_cache, :connection_handlers
+    attr_reader :config_filename, :db_spec_cache
     attr_writer :default_connection_handler
 
     def initialize(config_filename)
       @config_filename = config_filename
 
-      @connection_handlers = begin
-        if ActiveRecord::Base.respond_to?(:connection_handlers)
-          ActiveRecord::Base.connection_handlers
-        else
-          {}
-        end
-      end
-
       @db_spec_cache = {}
       @default_spec = ConnectionSpecification.default
       @default_connection_handler = ActiveRecord::Base.connection_handler
@@ -218,7 +214,7 @@ module RailsMultisite
       @db_spec_cache = new_db_spec_cache
 
       # Clean up connection handler cache.
-      removed_specs.each { |s| @connection_handlers.delete(handler_key(s)) }
+      removed_specs.each { |s| connection_handlers.delete(handler_key(s)) }
     end
 
     def reload
@@ -246,11 +242,11 @@ module RailsMultisite
       spec ||= @default_spec
       handler = nil
       if spec != @default_spec
-        handler = @connection_handlers[handler_key(spec)]
+        handler = connection_handlers[handler_key(spec)]
         unless handler
           handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
           handler_establish_connection(handler, spec)
-          @connection_handlers[handler_key(spec)] = handler
+          connection_handlers[handler_key(spec)] = handler
         end
       else
         handler = @default_connection_handler

data/lib/rails_multisite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 #
 module RailsMultisite
-  VERSION = "4.0.1"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,55 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.0'
 description: Multi tenancy support for Rails
 email:
 - sam.saffron@gmail.com
@@ -81,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Multi tenancy support for Rails