rails_multisite 1.1.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996ac1e0d01f6f24f9d3ed47e89bca743b49b11c
-  data.tar.gz: f0bd440331fad84e9272b4e1727db7c3f12bf34a
+  metadata.gz: 21426e08679ae314cc95d1b9e3a4271b16a53e39
+  data.tar.gz: b748de947d54cb1991caeb9fd32f6e9a323e3462
 SHA512:
-  metadata.gz: 1baf84b410cf26fcc2a053c2fb644d144125a87be633469d6113b114da8f7c8c18f1c5aa81abeb2788d6ff45ad0285b24469a480754119ceb3a05e92047a2f36
-  data.tar.gz: 070f97d29cba5729b71aeb5e2c159dd9b6ddb85c65d20cc6dfe10423496cbbda0f8dd1e5a2e4562ffa4b91f7992489ba6057d7b4ed812d89888b740eb3e5838e
+  metadata.gz: 2f77faddf9cf3ccd3e6d787066afa2c9e2791208d1c0e9ae0780f171c7c2147691030b82b3f31d4168c0f626eb5b82daca96bf5487ea78ba8df283f07c9b79c1
+  data.tar.gz: 804ea79e00fdcaf13b255035fcfb13201e379187a625610cd06ffacdf321a57b54cb25d1c3fb0764879adda4b8c1ad1b4bf86bcb74f836657ff93ebfb508e634

data/lib/rails_multisite.rb

@@ -6,3 +6,4 @@ require 'rails_multisite/version'
 require 'rails_multisite/railtie'
 require 'rails_multisite/formatter'
 require 'rails_multisite/connection_management'
+require 'rails_multisite/middleware'

data/lib/rails_multisite/connection_management.rb

@@ -2,57 +2,186 @@
 #
 module RailsMultisite
   class ConnectionManagement
-    CONFIG_FILE = 'config/multisite.yml'
+
     DEFAULT = 'default'
 
+    def self.default_config_filename
+      File.absolute_path(Rails.root.to_s + "/config/multisite.yml")
+    end
+
+    def self.clear_settings!
+      @instance = nil
+    end
+
+    def self.load_settings!
+      # no op only here backwards compat
+      STDERR.puts "RailsMultisite::ConnectionManagement.load_settings! is deprecated"
+    end
+
+    def self.instance
+      @instance
+    end
+
+    def self.config_filename=(config_filename)
+      if config_filename.nil?
+        @instance = nil
+      else
+        @instance = new(config_filename)
+      end
+    end
+
+    def self.config_filename
+      @instance.config_filename
+    end
+
+    def self.reload
+      @instance = new(instance.config_filename)
+    end
+
     def self.has_db?(db)
       return true if db == DEFAULT
-      (defined? @@db_spec_cache) && @@db_spec_cache && @@db_spec_cache[db]
+      !!(@instance && @instance.has_db?(db))
     end
 
-    def self.rails4?
-      !!(Rails.version =~ /^4/)
+    def self.establish_connection(opts)
+      @instance.establish_connection(opts) if @instance
     end
 
-    def self.establish_connection(opts)
-      opts[:db] = opts[:db].to_s
+    def self.with_hostname(hostname, &blk)
+      if @instance
+        @instance.with_hostname(hostname, &blk)
+      else
+        blk.call hostname
+      end
+    end
 
-      if opts[:db] == DEFAULT && (!defined?(@@default_spec) || !@@default_spec)
-        # don't do anything .. handled implicitly
+    def self.with_connection(db = DEFAULT, &blk)
+      if @instance
+        @instance.with_connection(db, &blk)
       else
-        spec = connection_spec(opts)
-        if (!spec && opts[:raise_on_missing])
-          raise "ERROR: #{opts[:db]} not found!"
-        end
-        spec ||= @@default_spec
-        handler = nil
-        if spec != @@default_spec
-          handler = @@connection_handlers[spec]
-          unless handler
-            handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-            self.handler_establish_connection(handler, spec)
-            @@connection_handlers[spec] = handler
-          end
-        else
-          handler = @@default_connection_handler
-          if !@@established_default
-            self.handler_establish_connection(handler, spec)
-            @@established_default = true
-          end
+        connected = ActiveRecord::Base.connection_pool.connected?
+        blk.call db
+        ActiveRecord::Base.clear_active_connections! unless connected
+      end
+    end
+
+    def self.each_connection(opts = nil, &blk)
+      if @instance
+        @instance.each_connection(opts, &blk)
+      else
+        with_connection(&blk)
+      end
+    end
+
+    def self.all_dbs
+      if @instance
+        @instance.all_dbs
+      else
+        [DEFAULT]
+      end
+    end
+
+    def self.current_db
+      if @instance
+        instance.current_db
+      else
+        DEFAULT
+      end
+    end
+
+    def self.current_hostname
+      config = ActiveRecord::Base.connection_pool.spec.config
+      config[:host_names].nil? ? config[:host] : config[:host_names].first
+    end
+
+    def self.connection_spec(opts)
+      if @instance
+        @instance.connection_spec(opts)
+      else
+        ActiveRecord::Base.connection_pool.spec
+      end
+    end
+
+    def self.host(env)
+      if @instance
+        @instance.host(env)
+      else
+        env["HTTP_HOST"]
+      end
+    end
+
+    attr_reader :config_filename
+
+    def initialize(config_filename)
+      @config_filename = config_filename
+
+      spec_klass = ActiveRecord::ConnectionAdapters::ConnectionSpecification
+      configs = YAML::load(File.open(@config_filename))
+
+      no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
+
+      configs.each do |k, v|
+        raise ArgumentError.new("Please do not name any db default!") if k == DEFAULT
+        v[:db_key] = k
+        v[:prepared_statements] = false if no_prepared_statements
+      end
+
+      resolver = spec_klass::Resolver.new(configs)
+      @db_spec_cache = Hash[*configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.flatten]
+
+      @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]
         end
+      end
 
-        ActiveRecord::Base.connection_handler = handler
+      @default_spec = spec_klass::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
+      ActiveRecord::Base.configurations[Rails.env]["host_names"].each do |host|
+        @host_spec_cache[host] = @default_spec
       end
+
+      @default_connection_handler = ActiveRecord::Base.connection_handler
+
+      @connection_handlers = {}
+      @established_default = false
     end
 
-    def self.with_hostname(hostname)
+    def has_db?(db)
+      return true if db == DEFAULT
+      @db_spec_cache[db]
+    end
+
+    def establish_connection(opts)
+      opts[:db] = opts[:db].to_s
 
-      unless defined? @@db_spec_cache
-        # just fake it for non multisite
-        yield hostname
-        return
+      spec = connection_spec(opts)
+      if (!spec && opts[:raise_on_missing])
+        raise "ERROR: #{opts[:db]} not found!"
+      end
+      spec ||= @default_spec
+      handler = nil
+      if spec != @default_spec
+        handler = @connection_handlers[spec]
+        unless handler
+          handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+          handler_establish_connection(handler, spec)
+          @connection_handlers[spec] = handler
+        end
+      else
+        handler = @default_connection_handler
+        if !@established_default
+          handler_establish_connection(handler, spec)
+          @established_default = true
+        end
       end
 
+      ActiveRecord::Base.connection_handler = handler
+    end
+
+    def with_hostname(hostname)
       old = current_hostname
       connected = ActiveRecord::Base.connection_pool.connected?
 
@@ -69,7 +198,7 @@ module RailsMultisite
       rval
     end
 
-    def self.with_connection(db = DEFAULT)
+    def with_connection(db = DEFAULT)
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
 
@@ -86,7 +215,7 @@ module RailsMultisite
       rval
     end
 
-    def self.each_connection(opts = nil, &blk)
+    def each_connection(opts = nil, &blk)
 
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
@@ -143,120 +272,40 @@ module RailsMultisite
       ActiveRecord::Base.connection_handler.clear_active_connections! unless connected
     end
 
-    def self.all_dbs
-      [DEFAULT] +
-        if defined?(@@db_spec_cache) && @@db_spec_cache
-          @@db_spec_cache.keys.to_a
-        else
-          []
-        end
-    end
-
-    def self.set_current_db
-      @@current_db = DEFAULT
+    def all_dbs
+      [DEFAULT] + @db_spec_cache.keys.to_a
     end
 
-    def self.current_db
-      return @@current_db if defined?(@@current_db)
+    def current_db
       ActiveRecord::Base.connection_pool.spec.config[:db_key] || DEFAULT
     end
 
-    def self.config_filename=(config_filename)
-      @@config_filename = config_filename
-    end
-
-    def self.config_filename
-      @@config_filename ||= File.absolute_path(Rails.root.to_s + "/" + RailsMultisite::ConnectionManagement::CONFIG_FILE)
-    end
-
-    def self.current_hostname
-      config = ActiveRecord::Base.connection_pool.spec.config
-      config[:host_names].nil? ? config[:host] : config[:host_names].first
-    end
-
-    def self.clear_settings!
-      @@db_spec_cache = nil
-      @@host_spec_cache = nil
-      @@default_spec = nil
+    def current_hostname
+      ConnectionManagement.current_hostname
     end
 
-    def self.load_settings!
-      spec_klass = ActiveRecord::ConnectionAdapters::ConnectionSpecification
-      configs = YAML::load(File.open(self.config_filename))
-
-      no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
-
-      configs.each do |k, v|
-        raise ArgumentError.new("Please do not name any db default!") if k == DEFAULT
-        v[:db_key] = k
-        v[:prepared_statements] = false if no_prepared_statements
+    def host(env)
+      if host = env["RAILS_MULTISITE_HOST"]
+        return host
       end
 
-      resolver = spec_klass::Resolver.new(configs)
-      @@db_spec_cache = Hash[*configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.flatten]
-
-      @@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]
-        end
-      end
-
-      @@default_spec = spec_klass::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
-      ActiveRecord::Base.configurations[Rails.env]["host_names"].each do |host|
-        @@host_spec_cache[host] = @@default_spec
-      end
-
-      @@default_connection_handler = ActiveRecord::Base.connection_handler
-
-      @@connection_handlers = {}
-      @@established_default = false
-    end
-
-    def initialize(app, config = nil)
-      @app = app
-      @db_lookup = config && config[:db_lookup]
-    end
-
-    def self.host(env)
       request = Rack::Request.new(env)
-      request['__ws'] || request.host
-    end
-
-    def call(env)
-      host = self.class.host(env)
-      db = nil
-      begin
-
-        unless @@host_spec_cache[host]
-          db = @db_lookup && @db_lookup.call(env)
-          if db
-            host = nil
-          else
-            return [404, {}, ["not found"]]
-          end
-        end
+      host = request['__ws'] || request.host
 
-        ActiveRecord::Base.connection_handler.clear_active_connections!
-        self.class.establish_connection(host: host, db: db)
-        @app.call(env)
-      ensure
-        ActiveRecord::Base.connection_handler.clear_active_connections!
-      end
+      env["RAILS_MULTISITE_HOST"] = host
     end
 
-    def self.connection_spec(opts)
+    def connection_spec(opts)
       if opts[:host]
-        @@host_spec_cache[opts[:host]]
+        @host_spec_cache[opts[:host]]
       else
-        @@db_spec_cache[opts[:db]]
+        @db_spec_cache[opts[:db]]
       end
     end
 
     private
 
-      def self.handler_establish_connection(handler, spec)
+      def handler_establish_connection(handler, spec)
         if Rails::VERSION::MAJOR >= 5
           handler.establish_connection(spec.config)
         else

data/lib/rails_multisite/middleware.rb

@@ -0,0 +1,30 @@
+module RailsMultisite
+  class Middleware
+    def initialize(app, config = nil)
+      @app = app
+      @db_lookup = config && config[:db_lookup]
+    end
+
+    def call(env)
+      host = ConnectionManagement.host(env)
+      db = nil
+      begin
+
+        unless ConnectionManagement.connection_spec(host: host)
+          db = @db_lookup && @db_lookup.call(env)
+          if db
+            host = nil
+          else
+            return [404, {}, ["not found"]]
+          end
+        end
+
+        ActiveRecord::Base.connection_handler.clear_active_connections!
+        ConnectionManagement.establish_connection(host: host, db: db)
+        @app.call(env)
+      ensure
+        ActiveRecord::Base.connection_handler.clear_active_connections!
+      end
+    end
+  end
+end

data/lib/rails_multisite/railtie.rb

@@ -9,18 +9,17 @@ module RailsMultisite
     initializer "RailsMultisite.init" do |app|
       Rails.configuration.multisite = false
 
-      if File.exist?(ConnectionManagement.config_filename)
+      config_file = ConnectionManagement.default_config_filename
+      if File.exist?(config_file)
+        ConnectionManagement.config_filename = ConnectionManagement.default_config_filename
         Rails.configuration.multisite = true
         Rails.logger.formatter = RailsMultisite::Formatter.new
-        ConnectionManagement.load_settings!
-        app.middleware.insert_after(ActionDispatch::Executor, RailsMultisite::ConnectionManagement)
+        app.middleware.insert_after(ActionDispatch::Executor, RailsMultisite::Middleware)
         app.middleware.delete(ActionDispatch::Executor)
 
         if ENV['RAILS_DB'].present?
           ConnectionManagement.establish_connection(db: ENV['RAILS_DB'], raise_on_missing: true)
         end
-      else
-        ConnectionManagement.set_current_db
       end
     end
   end

data/lib/rails_multisite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -62,6 +62,7 @@ files:
 - lib/rails_multisite.rb
 - lib/rails_multisite/connection_management.rb
 - lib/rails_multisite/formatter.rb
+- lib/rails_multisite/middleware.rb
 - lib/rails_multisite/railtie.rb
 - lib/rails_multisite/version.rb
 - lib/tasks/db.rake