rails_multisite 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0147d2b57bef0b6daf4cd53adac973cd87dd1a7727c152a7241a29d36e44ef
-  data.tar.gz: b8c1c8994c145bc3545527469dc8431f2d9b0226d2e4773de427397603cc99d9
+  metadata.gz: 42d7959bbb9536ba5902f2532aa20c14db3365de98bf8b6b20c0612c12be583e
+  data.tar.gz: bc05e6e85d428d3b4785b58e3468d884df30224a47f63f032620e66d854abb57
 SHA512:
-  metadata.gz: b294e10922a81cc55cab1514edc26cfc4bcb0ce575b89267cb523f4d4b6666a8486cef62637c8569a0aff0d3b79ce8287a2f43b214582fb9f029bad41881d5f6
-  data.tar.gz: 727deaa92d13b9c26d4a9482f4c36ab772e05e63eacff8e27f972fa61c581fdff9e0d63590a22fdc8160a21754a595ad3a7420a950788db2e35af54c73fd06fd
+  metadata.gz: e3fc63f60cd559f3ed57895a30620b0cc7b2a0de8a19124a40f8e79f04985805eac39d95edb0873c907ca4488badc2985ddade7b07851d5205226a5cb61621ef
+  data.tar.gz: 960da8f7bbe5534911f6269ff493250e6520b927d238299ad17efcdc5f0b357b02cd11267433fb618e4d3853a0ab159b4ab3c9f0fcd0680783928549239343c8

data/lib/rails_multisite/connection_management/null_instance.rb

@@ -14,7 +14,10 @@ module RailsMultisite
       def default_connection_handler=(_connection_handler)
       end
 
-      def establish_connection(_opts)
+      def establish_connection(db: nil, host: nil, raise_on_missing: true)
+        if !host && !has_db?(db.to_s) && raise_on_missing
+          raise UnknownSiteError.new(db)
+        end
       end
 
       def reload
@@ -44,16 +47,18 @@ module RailsMultisite
         env["HTTP_HOST"]
       end
 
-      def with_connection(db = DEFAULT, &blk)
+      def with_connection(db = DEFAULT, raise_on_missing: true, &blk)
+        raise UnknownSiteError.new(db) if !has_db?(db.to_s) && raise_on_missing
+
         connected = ActiveRecord::Base.connection_pool.connected?
         result = blk.call(db)
-        unless connected
+        if !connected
           ActiveRecord::Base.connection_handler.clear_active_connections!
         end
         result
       end
 
-      def with_hostname(hostname, &blk)
+      def with_hostname(hostname, raise_on_missing: true, &blk)
         blk.call(hostname)
       end
     end

data/lib/rails_multisite/connection_management.rb

@@ -4,6 +4,12 @@ require "rails_multisite/connection_management/connection_specification"
 require "rails_multisite/connection_management/null_instance"
 
 module RailsMultisite
+  class UnknownSiteError < StandardError
+    def initialize(db)
+      super("ERROR: #{db} not found!")
+    end
+  end
+
   class ConnectionManagement
     DEFAULT = "default"
 
@@ -149,18 +155,20 @@ module RailsMultisite
       db == DEFAULT || !!db_spec_cache[db]
     end
 
-    def establish_connection(opts)
-      opts[:db] = opts[:db].to_s
+    def establish_connection(db: nil, host: nil, raise_on_missing: true)
+      db = db.to_s
 
-      if opts[:db] != DEFAULT
-        spec = connection_spec(opts)
-
-        if (!spec && opts[:raise_on_missing])
-          raise "ERROR: #{opts[:db]} not found!"
+      spec =
+        if db == DEFAULT
+          @default_spec
+        elsif (found = connection_spec(db: db, host: host))
+          found
+        elsif raise_on_missing
+          raise UnknownSiteError.new(host || db)
+        else
+          @default_spec
         end
-      end
 
-      spec ||= @default_spec
       handler = nil
       if spec != @default_spec
         handler = connection_handlers[handler_key(spec)]
@@ -176,18 +184,20 @@ module RailsMultisite
       ActiveRecord::Base.connection_handler = handler
     end
 
-    def with_hostname(hostname)
+    def with_hostname(hostname, raise_on_missing: true)
       old = current_hostname
       connected = ActiveRecord::Base.connection_pool.connected?
 
-      establish_connection(host: hostname) unless connected && hostname == old
+      if !(connected && hostname == old)
+        establish_connection(host: hostname, raise_on_missing: raise_on_missing)
+      end
       rval = yield hostname
 
-      unless connected && hostname == old
+      if !(connected && hostname == old)
         ActiveRecord::Base.connection_handler.clear_active_connections!
 
-        establish_connection(host: old)
-        unless connected
+        establish_connection(host: old, raise_on_missing: false)
+        if !connected
           ActiveRecord::Base.connection_handler.clear_active_connections!
         end
       end
@@ -195,17 +205,19 @@ module RailsMultisite
       rval
     end
 
-    def with_connection(db = DEFAULT)
+    def with_connection(db = DEFAULT, raise_on_missing: true)
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
 
-      establish_connection(db: db) unless connected && db == old
+      if !(connected && db == old)
+        establish_connection(db: db, raise_on_missing: raise_on_missing)
+      end
       rval = yield db
 
-      unless connected && db == old
+      if !(connected && db == old)
         ActiveRecord::Base.connection_handler.clear_active_connections!
 
-        establish_connection(db: old)
+        establish_connection(db: old, raise_on_missing: false)
         unless connected
           ActiveRecord::Base.connection_handler.clear_active_connections!
         end

data/lib/rails_multisite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Sam Saffron