otr-activerecord 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8dad01fcadb48149aac6d50f0e66507bab5bb35bfa42af74d5c4f35a6706ef4
-  data.tar.gz: 2abf82a804042bfb986cef869c7be5f700c9d4ed6a5e952213608706440c7eac
+  metadata.gz: b7cab0f2557ace7ed091eb02c7090a595d0cfb586313b9f03b4727172e9fd670
+  data.tar.gz: 5dcc6d2ee8e6d99612e6999549c944820b7485735947e80ee953498f2c5cf829
 SHA512:
-  metadata.gz: fe19cf7af34c499bfd4d1811f8cc40d1e62e2f5df42f3ad47568e412864491aaa2dc709076ccfe5007509d9ffd9a94ba994e4cfbfc778eef52f89b6dc392c90f
-  data.tar.gz: 4404dd0fe82faf3d813b3ff767a2d53219ea339dbd5f5e416f115f3b4a0cb4dacb3dff75885a093a5025aece1b3d5d17e8a77d3f1f4cf1d67e8e8e929dfb11e8
+  metadata.gz: 71561f7bf678621e8061be51fd5a833c47ac219eb7f7ba010f8a210ba45c108d3f389ab743b87ab4bbc9d6f6aba95bfbd1694bb6f6c9319fa6e17880cd9fa54f
+  data.tar.gz: 2c596c55ae278c66b5081a4d06aabfa43f83e8fd162675c2517299f120e231dd56f8d91a7fa0e7d1d7d0e7390022c825db71d5e71013b4d68b98b8daaf89ce86

data/README.md

@@ -23,7 +23,19 @@ After loading your gems, tell `OTR::ActiveRecord` about your database config usi
 **Important note**: `configure_from_file!` won't work as expected if you have already `DATABASE_URL` set as part of your environment variables.
 This is because in ActiveRecord when that env variable is set it will merge its properties into the current connection configuration.
 
-#### 3. Enable middleware for Rack apps
+#### 3. Connect to your database(s)
+
+If you have a single database (most apps), use this helper:
+
+    OTR::ActiveRecord.establish_connection!
+
+If you're using multiple databases, call your base class(es) instead:
+
+    MyBase.establish_connection :primary
+    MyBase.establish_connection :primary_replica
+    ...
+
+#### 4. Enable middleware for Rack apps
 
 Add these middlewares in `config.ru`:
 
@@ -33,7 +45,7 @@ Add these middlewares in `config.ru`:
     # Enable ActiveRecord's QueryCache for every request (optional)
     use OTR::ActiveRecord::QueryCache
 
-#### 4. Import ActiveRecord tasks into your Rakefile
+#### 5. Import ActiveRecord tasks into your Rakefile
 
 This will give you most of the standard `db:` tasks you get in Rails. Add it to your `Rakefile`.
 

data/lib/otr-activerecord/activerecord.rb

@@ -26,7 +26,6 @@ module OTR
     def self.configure_from_hash!(spec)
       config = spec.stringify_keys.merge("migrations_paths" => ::OTR::ActiveRecord.migrations_paths)
       ::ActiveRecord::Base.configurations = {rack_env.to_s => config}
-      ::ActiveRecord::Base.establish_connection(rack_env)
     end
 
     # Connect to database with a DB URL. Example: "postgres://user:pass@localhost/db"
@@ -40,10 +39,20 @@ module OTR
       ::ActiveRecord::Base.configurations =
         (YAML.load(ERB.new(File.read(path)).result) || {}).
         reduce({}) { |a, (env, config)|
-          a[env] = {"migrations_paths" => ::OTR::ActiveRecord.migrations_paths}.merge config
+          if config.has_key? "database"
+            a[env] = {"migrations_paths" => ::OTR::ActiveRecord.migrations_paths}.merge config
+          elsif env == rack_env.to_s
+            config.each do |dbname, subconfig|
+              a[dbname.to_sym] = {"migrations_paths" => ::OTR::ActiveRecord.migrations_paths}.merge subconfig
+            end
+          end
           a
         }
-      ::ActiveRecord::Base.establish_connection(rack_env)
+    end
+
+    # Establish a connection to the given db (defaults to current rack env)
+    def self.establish_connection!(db = rack_env)
+      ::ActiveRecord::Base.establish_connection(db)
     end
 
     # The current Rack environment

data/lib/otr-activerecord/version.rb

@@ -1,6 +1,6 @@
 module OTR
   module ActiveRecord
     # Gem version
-    VERSION = '1.4.2'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord