rails_multisite 1.1.0.rc3 → 1.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9482374c98ac24501bd7ee498b5b256e369f4983
-  data.tar.gz: fc13d21adba2c269cb1a1e509f051329ff933305
+  metadata.gz: 7c34ae44ef4463a47d823ba8d59e9c5b6c3257e9
+  data.tar.gz: 3c1acedaacdeea8bb38f46a56db82b81781f1891
 SHA512:
-  metadata.gz: 5510ae2b38586780fce33a49ebeb87ae04238ca3813fd2146d34d300cfec525cdec4054b4185ed690a6fb24e784cbde132c95969c48f1d845e8c4fc521dae5a2
-  data.tar.gz: '0952fd1f2e935419fc8bacaa1f3fdef11d77060249f01a97b20c1c9a63b2a1557f3f387ccb5374b54b7b828e2c8c7a23cb008db8b6cd97db776f29586528b51b'
+  metadata.gz: 0565a6ce2976d30d7b8193571aecb024c6640bc0f8fd4f417bbd210d1dcbe325017753e96b94d4b8a2b43ecf8d10824dc11ac487bca9f4ec1fe4fe67b91788d7
+  data.tar.gz: b3eba6b046b05dcd8c104e7d5cdbb21af5c3df6348eb987aa20eee9af03df48a20dbd7d345d26100a93b6cb6f7af13f761309e850cd3ef48d8921c4c14807725

data/lib/rails_multisite/connection_management.rb

@@ -147,7 +147,12 @@ module RailsMultisite
         end
     end
 
+    def self.set_current_db
+      @@current_db = DEFAULT
+    end
+
     def self.current_db
+      return @@current_db if defined?(@@current_db)
       ActiveRecord::Base.connection_pool.spec.config[:db_key] || DEFAULT
     end
 

data/lib/rails_multisite/railtie.rb

@@ -17,6 +17,8 @@ module RailsMultisite
         if ENV['RAILS_DB']
           ConnectionManagement.establish_connection(db: ENV['RAILS_DB'])
         end
+      else
+        ConnectionManagement.set_current_db
       end
     end
   end

data/lib/rails_multisite/version.rb

@@ -1,3 +1,3 @@
 module RailsMultisite
-  VERSION = "1.1.0.rc3"
+  VERSION = "1.1.0.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc3
+  version: 1.1.0.rc4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord