rails_multisite 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e38f660f7fbb4a5505adeb4d46f73a02f290cc65f9f566a03fc4fc7051e68392
-  data.tar.gz: 90242e454a09c2faed90d8561ac6b3de61c0d723344ac107e1fc89e23c20f0cd
+  metadata.gz: ee4885d481591f47f16a367e206e103af5ef3ea1504d65e0c34f97fa8766b91f
+  data.tar.gz: b6dc6f7d07e5ced80e7da754f5940b30a42a60d02e859afc8c949ffdf24f8b60
 SHA512:
-  metadata.gz: 8a9bccdd03ddb205a20325ed127cc0e40b6e7c790147334ac9154350f5bc802e0462893541a39ab1ac0c54939d3cabadd7af455af5c779b882d93d5a4b5e4037
-  data.tar.gz: 7b0065714791944b3cabf2673f93a18277ec2cc721d85e8b5609ab94b7ff5928f8adf1500219aad4f659c27f5774e465739960c5a84468d6a0759ac07862c43b
+  metadata.gz: c9d34362e98ddce5e8f771233ad43a803cf66e71bcd546dedaee3ae4a06991149f2e07d9e6024cbc111ee3166db7c193772cfdf7c78bec729da772b5db06a5bf
+  data.tar.gz: 4c9fdee8046e62e40be983d6f28f8e0fc703f89129e3d41d7ee9003aefa1c344bd170b7d4a5c1575729b80363ee2a7cfb48ad6a299564db3aa52da2fef0090c4

data/lib/rails_multisite/connection_management.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
-#
+
+if Rails.version >= '6.1'
+  require 'rails_multisite/connection_management/rails_61_compat'
+else
+  require 'rails_multisite/connection_management/rails_60_compat'
+end
+
 module RailsMultisite
   class ConnectionManagement
-
     DEFAULT = 'default'
-    SPEC_KLASS = ActiveRecord::ConnectionAdapters::ConnectionSpecification
 
     def self.default_config_filename
       File.absolute_path(Rails.root.to_s + "/config/multisite.yml")
@@ -104,16 +108,11 @@ module RailsMultisite
     end
 
     def self.current_hostname
-      spec = @instance.connection_spec(db: self.current_db) if @instance
-      spec ||= ActiveRecord::Base.connection_pool.spec
-      config = spec.config
-      config[:host_names].nil? ? config[:host] : config[:host_names].first
+      current_db_hostnames.first
     end
 
     def self.current_db_hostnames
-      spec = @instance.connection_spec(db: self.current_db) if @instance
-      spec ||= ActiveRecord::Base.connection_pool.spec
-      config = spec.config
+      config = (@instance&.connection_spec(db: current_db) || ConnectionSpecification.current).config
       config[:host_names].nil? ? [config[:host]] : config[:host_names]
     end
 
@@ -121,7 +120,7 @@ module RailsMultisite
       if @instance
         @instance.connection_spec(opts)
       else
-        ActiveRecord::Base.connection_pool.spec
+        ConnectionSpecification.current
       end
     end
 
@@ -170,7 +169,7 @@ module RailsMultisite
       end
 
       @db_spec_cache = {}
-      @default_spec = SPEC_KLASS::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
+      @default_spec = ConnectionSpecification.default
       @default_connection_handler = ActiveRecord::Base.connection_handler
 
       @reload_mutex = Mutex.new
@@ -181,7 +180,7 @@ module RailsMultisite
     def load_config!
       configs = YAML::load(File.open(@config_filename))
 
-      no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
+      no_prepared_statements = @default_spec.config[:prepared_statements] == false
 
       configs.each do |k, v|
         raise ArgumentError.new("Please do not name any db default!") if k == DEFAULT
@@ -189,17 +188,8 @@ module RailsMultisite
         v[:prepared_statements] = false if no_prepared_statements
       end
 
-      resolve_configs = configs
-
-      # rails 6 needs to use a proper object for the resolver
-      if defined?(ActiveRecord::DatabaseConfigurations)
-        resolve_configs = ActiveRecord::DatabaseConfigurations.new(configs)
-      end
-
-      resolver = SPEC_KLASS::Resolver.new(resolve_configs)
-
       # Build a hash of db name => spec
-      new_db_spec_cache = Hash[*configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.flatten]
+      new_db_spec_cache = ConnectionSpecification.db_spec_cache(configs)
       new_db_spec_cache.each do |k, v|
         # If spec already existed, use the old version
         if v&.to_hash == @db_spec_cache[k]&.to_hash
@@ -217,7 +207,7 @@ module RailsMultisite
       end
 
       # Add the default hostnames as well
-      ActiveRecord::Base.configurations[Rails.env]["host_names"].each do |host|
+      @default_spec.config[:host_names].each do |host|
         new_host_spec_cache[host] = @default_spec
       end
 
@@ -365,7 +355,7 @@ module RailsMultisite
     end
 
     def current_db
-      ActiveRecord::Base.connection_pool.spec.config[:db_key] || DEFAULT
+      ConnectionSpecification.current.config[:db_key] || DEFAULT
     end
 
     def current_hostname

data/lib/rails_multisite/connection_management/rails_60_compat.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RailsMultisite
+  class ConnectionManagement
+    class ConnectionSpecification
+      class << self
+        def current
+          ActiveRecord::Base.connection_pool.spec
+        end
+
+        def db_spec_cache(configs)
+          resolve_configs = configs
+          # rails 6 needs to use a proper object for the resolver
+          if defined?(ActiveRecord::DatabaseConfigurations)
+            resolve_configs = ActiveRecord::DatabaseConfigurations.new(configs)
+          end
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(resolve_configs)
+          configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.to_h
+        end
+
+        def default
+          ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver
+            .new(ActiveRecord::Base.configurations)
+            .spec(Rails.env.to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/rails_multisite/connection_management/rails_61_compat.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RailsMultisite
+  class ConnectionManagement
+    class ConnectionSpecification
+      class << self
+        def current
+          new(ActiveRecord::Base.connection_pool.db_config)
+        end
+
+        def db_spec_cache(configs)
+          resolve_configs = ActiveRecord::DatabaseConfigurations.new(configs)
+          configs.map { |k, _| [k, new(resolve_configs.resolve(k.to_sym))] }.to_h
+        end
+
+        def default
+          new(ActiveRecord::Base.configurations.resolve(Rails.env.to_sym))
+        end
+      end
+
+      attr_reader :spec
+
+      def initialize(spec)
+        @spec = spec
+      end
+
+      def name
+        spec.env_name
+      end
+
+      def to_hash
+        spec.configuration_hash
+      end
+      alias config to_hash
+    end
+  end
+end

data/lib/rails_multisite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -61,6 +61,8 @@ files:
 - README.md
 - lib/rails_multisite.rb
 - lib/rails_multisite/connection_management.rb
+- lib/rails_multisite/connection_management/rails_60_compat.rb
+- lib/rails_multisite/connection_management/rails_61_compat.rb
 - lib/rails_multisite/formatter.rb
 - lib/rails_multisite/middleware.rb
 - lib/rails_multisite/railtie.rb
@@ -85,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.2
 signing_key:
 specification_version: 4
 summary: Multi tenancy support for Rails