rails_multisite 2.0.7 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0e0f9bb773343cb717c3342bdba03296eb1d7f298a26527aa435309aba5c71
-  data.tar.gz: 8b2d59de4f66e24d753f72b4bf43618769178191e3b25a1117b8a0fd4460e0a0
+  metadata.gz: e9d253acd86ab0b218a43d6cf67bc7bd3948b03c8288872f75c8788ff1c54373
+  data.tar.gz: 1141a30cad5dba7992b6adc5ab1c315488789430f9bee82ba4bb0b189447d27c
 SHA512:
-  metadata.gz: 706c6793500ab5a89ceec191519033263f2851c94fb707614b28c1c2da9fee89b274ee268bac880e8893a0f2ad4c24ee86d087894b4a9bec35fd28abe0200312
-  data.tar.gz: a1156c538005d8cd01dfc3994c890a12cf872c4400b9c5e6e0ddcdd1e4d018ab9486edd3227b5c67718b643933258f6c009712e7c1c90b474cdc05c7d6e31a31
+  metadata.gz: 6a2a3ac0846e4b589a44e5285d8bba6be418e0a535c642a95f23073dcf16d51425e87d27ed74e5e58b04e25a5cc88620d7937530bd25285dd013d8e81689fb6e
+  data.tar.gz: 5520157f4aed32cc36b03e289ccb56b4f43385f7a153f64245a4ab570b13138826b8cf1d2aaac78b40b1d7231501575a53df4af0f1d56472ef267e82f90f6d92

data/README.md

@@ -35,7 +35,6 @@ mlp:
   host: dbhost
   pool: 5
   timeout: 5000
-  db_id: 1  # ensure db_id is unique for each site
   host_names:
     - discourse.equestria.com
     - discourse.equestria.internal
@@ -48,7 +47,6 @@ drwho:
   host: dbhost
   pool: 5
   timeout: 5000
-  db_id: 2 # ensure db_id is unique for each site
   host_names:
     - discuss.tardis.gallifrey
 ```
@@ -92,7 +90,7 @@ db_two:
 To get a Rails console that is connected to `some_database_1` database:
 
 ```
-RAILS_ENV=db_one rails console
+RAILS_DB=db_one rails console
 ```
 
 

data/lib/rails_multisite/connection_management.rb

@@ -4,6 +4,7 @@ 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")
@@ -35,7 +36,7 @@ module RailsMultisite
     end
 
     def self.reload
-      @instance = new(instance.config_filename)
+      @instance.reload
     end
 
     def self.has_db?(db)
@@ -118,7 +119,19 @@ module RailsMultisite
     def initialize(config_filename)
       @config_filename = config_filename
 
-      spec_klass = ActiveRecord::ConnectionAdapters::ConnectionSpecification
+      @connection_handlers = {}
+      @db_spec_cache = {}
+
+      @default_spec = SPEC_KLASS::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
+      @default_connection_handler = ActiveRecord::Base.connection_handler
+      @established_default = false
+
+      @reload_mutex = Mutex.new
+
+      load_config!
+    end
+
+    def load_config!
       configs = YAML::load(File.open(@config_filename))
 
       no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
@@ -136,27 +149,46 @@ module RailsMultisite
         resolve_configs = ActiveRecord::DatabaseConfigurations.new(configs)
       end
 
-      resolver = spec_klass::Resolver.new(resolve_configs)
-      @db_spec_cache = Hash[*configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.flatten]
+      resolver = SPEC_KLASS::Resolver.new(resolve_configs)
 
-      @host_spec_cache = {}
+      # 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.each do |k, v|
+        # If spec already existed, use the old version
+        if v&.to_hash == @db_spec_cache[k]&.to_hash
+          new_db_spec_cache[k] = @db_spec_cache[k]
+        end
+      end
 
+      # Build a hash of hostname => spec
+      new_host_spec_cache = {}
       configs.each do |k, v|
         next unless v["host_names"]
         v["host_names"].each do |host|
-          @host_spec_cache[host] = @db_spec_cache[k]
+          new_host_spec_cache[host] = new_db_spec_cache[k]
         end
       end
 
-      @default_spec = spec_klass::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
+      # Add the default hostnames as well
       ActiveRecord::Base.configurations[Rails.env]["host_names"].each do |host|
-        @host_spec_cache[host] = @default_spec
+        new_host_spec_cache[host] = @default_spec
       end
 
-      @default_connection_handler = ActiveRecord::Base.connection_handler
+      removed_dbs = @db_spec_cache.keys - new_db_spec_cache.keys
+      removed_specs = @db_spec_cache.values_at(*removed_dbs)
 
-      @connection_handlers = {}
-      @established_default = false
+      @host_spec_cache = new_host_spec_cache
+      @db_spec_cache = new_db_spec_cache
+
+      # Clean up connection handler cache.
+      # (@connection_handlers is a hash of spec => handler)
+      removed_specs.each { |s| @connection_handlers.delete(s) }
+    end
+
+    def reload
+      @reload_mutex.synchronize do
+        load_config!
+      end
     end
 
     def has_db?(db)
@@ -320,11 +352,7 @@ module RailsMultisite
     private
 
     def handler_establish_connection(handler, spec)
-      if Rails::VERSION::MAJOR >= 5
-        handler.establish_connection(spec.config)
-      else
-        handler.establish_connection(ActiveRecord::Base, spec)
-      end
+      handler.establish_connection(spec.config)
     end
 
   end

data/lib/rails_multisite/middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RailsMultisite
   class Middleware
     def initialize(app, config = nil)

data/lib/rails_multisite/version.rb

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

data/lib/tasks/db.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 desc "migrate all sites in tier"
 task "multisite:migrate" => :environment do
   RailsMultisite::ConnectionManagement.each_connection do |db|

data/lib/tasks/generators.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 desc "generate multisite config file (if missing)"
 task "multisite:generate:config" => :environment do
   filename = RailsMultisite::ConnectionManagement.config_filename
@@ -14,7 +15,6 @@ task "multisite:generate:config" => :environment do
 #   host: localhost
 #   pool: 5
 #   timeout: 5000
-#   db_id: 1           # optionally include other settings you need
 #   host_names:
 #     - www.mysite.com
 #     - www.anothersite.com

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="