rails_multisite 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68463a7504b939ebae5583bd1a83cc54fa88c6a
-  data.tar.gz: d4770c86628b9a0a22294121322089c14cfffb79
+  metadata.gz: 46f1af53002fa575bb2ef12f53aedb834bd146f7
+  data.tar.gz: 16a65e7ea6a754641070e3867388082f447e0c82
 SHA512:
-  metadata.gz: c245a17c26cc9125df4a7726437ab07b5803a2b2b4b36192522c10e43b8ef014ef197a233641e802c6ee5bf6c65502ab85cf6915a69e213d61330dc91f778e06
-  data.tar.gz: 4202d63fd048a87b2d7645734022a68df77ea4aa4587c7ad46d50a59b647095e156df62738c15aba2aa12a6f811971d05cd1fecfa332f811ea6025604ede3c00
+  metadata.gz: 583ec55ba16263a8c9e442cb405bd3f74cbb4825e556a9df0307c38a0f331a601702e22b3d647e343d2bd856c8b94f76a4d223b3b87b21cd9eb3d58f0b2b0e1f
+  data.tar.gz: 19ec7b4f342e3b940be2ee5951cc038dcca679c01628de691a460d9d168f2cd07cee8a79113fd1499c5820de213558d958c73c9e217c2388ff0a02a55d42291d

data/lib/rails_multisite.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'rails'
-require "rails_multisite/version"
-require "rails_multisite/railtie"
-require "rails_multisite/formatter"
-require "rails_multisite/connection_management"
+require 'rails_multisite/version'
+require 'rails_multisite/railtie'
+require 'rails_multisite/formatter'
+require 'rails_multisite/connection_management'

data/lib/rails_multisite/connection_management.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+#
 module RailsMultisite
   class ConnectionManagement
     CONFIG_FILE = 'config/multisite.yml'
-    DEFAULT = 'default'.freeze
+    DEFAULT = 'default'
 
     def self.has_db?(db)
       return true if db == DEFAULT
@@ -50,13 +52,13 @@ module RailsMultisite
       old = current_hostname
       connected = ActiveRecord::Base.connection_pool.connected?
 
-      establish_connection(:host => hostname) unless connected && hostname == old
+      establish_connection(host: hostname) unless connected && hostname == old
       rval = yield hostname
 
       unless connected && hostname == old
         ActiveRecord::Base.connection_handler.clear_active_connections!
 
-        establish_connection(:host => old)
+        establish_connection(host: old)
         ActiveRecord::Base.connection_handler.clear_active_connections! unless connected
       end
 
@@ -67,20 +69,20 @@ module RailsMultisite
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
 
-      establish_connection(:db => db) unless connected && db == old
+      establish_connection(db: db) unless connected && db == old
       rval = yield db
 
       unless connected && db == old
         ActiveRecord::Base.connection_handler.clear_active_connections!
 
-        establish_connection(:db => old)
+        establish_connection(db: old)
         ActiveRecord::Base.connection_handler.clear_active_connections! unless connected
       end
 
       rval
     end
 
-    def self.each_connection(opts=nil, &blk)
+    def self.each_connection(opts = nil, &blk)
 
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
@@ -90,7 +92,7 @@ module RailsMultisite
 
       if (opts && (threads = opts[:threads]))
         queue = Queue.new
-        all_dbs.each{|db| queue << db}
+        all_dbs.each { |db| queue << db }
       end
 
       errors = nil
@@ -108,7 +110,7 @@ module RailsMultisite
 
               break unless db
 
-              establish_connection(:db => db)
+              establish_connection(db: db)
               # no choice but to rescue, should probably log
 
               begin
@@ -122,7 +124,7 @@ module RailsMultisite
         end.map(&:join)
       else
         all_dbs.each do |db|
-          establish_connection(:db => db)
+          establish_connection(db: db)
           blk.call(db)
           ActiveRecord::Base.connection_handler.clear_active_connections!
         end
@@ -132,9 +134,8 @@ module RailsMultisite
         raise StandardError, "Failed to run queries #{errors.inspect}"
       end
 
-
     ensure
-      establish_connection(:db => old)
+      establish_connection(db: old)
       ActiveRecord::Base.connection_handler.clear_active_connections! unless connected
     end
 
@@ -181,7 +182,7 @@ module RailsMultisite
 
       no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
 
-      configs.each do |k,v|
+      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
@@ -191,7 +192,7 @@ module RailsMultisite
       @@db_spec_cache = Hash[*configs.map { |k, _| [k, resolver.spec(k.to_sym)] }.flatten]
 
       @@host_spec_cache = {}
-      configs.each do |k,v|
+      configs.each do |k, v|
         next unless v["host_names"]
         v["host_names"].each do |host|
           @@host_spec_cache[host] = @@db_spec_cache[k]
@@ -209,9 +210,9 @@ module RailsMultisite
       @@established_default = false
     end
 
-
     def initialize(app, config = nil)
       @app = app
+      @db_lookup = config && config[:db_lookup]
     end
 
     def self.host(env)
@@ -221,13 +222,20 @@ module RailsMultisite
 
     def call(env)
       host = self.class.host(env)
+      db = nil
       begin
 
-        #TODO: add a callback so users can simply go to a domain to register it, or something
-        return [404, {}, ["not found"]] unless @@host_spec_cache[host]
+        unless @@host_spec_cache[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!
-        self.class.establish_connection(:host => host)
+        self.class.establish_connection(host: host, db: db)
         @app.call(env)
       ensure
         ActiveRecord::Base.connection_handler.clear_active_connections!

data/lib/rails_multisite/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 module RailsMultisite
   class Formatter < ::ActiveSupport::Logger::SimpleFormatter
     include ::ActiveSupport::TaggedLogging::Formatter

data/lib/rails_multisite/railtie.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module RailsMultisite
   class Railtie < Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+      Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
     end
 
     initializer "RailsMultisite.init" do |app|

data/lib/rails_multisite/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 module RailsMultisite
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/tasks/generators.rake

@@ -1,6 +1,6 @@
 desc "generate multisite config file (if missing)"
 task "multisite:generate:config" => :environment do
-  filename =  RailsMultisite::ConnectionManagement.config_filename
+  filename = RailsMultisite::ConnectionManagement.config_filename
 
   if File.exists?(filename)
     puts "Config is already generated at #{RailsMultisite::ConnectionManagement::CONFIG_FILE}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="