otr-activerecord 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edab34fb24651bc3c7bd322d72bbf6adf11ac30
-  data.tar.gz: 7a6e22c799380ff2adc4f3427f8257821f1de1c4
+  metadata.gz: d38e1f9588a97392013912cdba6acbda03ed8436
+  data.tar.gz: 05e19606d13021d122179b62491cf6d292b2037b
 SHA512:
-  metadata.gz: ef3a30b005c29e4f0c85041d111dfa9d9eb76296c14a044d9ad03406f381b199197981ae512bdf17f3ba3990c212ff2d6d97fd72d7003317bf1d372cf677bfab
-  data.tar.gz: 681f758818747691229080e0824097bb232e283036e3accb268191617767eea0ecc6192a2870884c773898f8a3c967317bff940e57a64db5fb3809dbf616ddff
+  metadata.gz: 00434ffdbab7808b5ef0ff0b225bcae50141d33d00ac1b05e5db1fd9166ddbf2ab505161049fb7ce732d0b89238ee544f478b198919eab6fb00b3ac3f908925f
+  data.tar.gz: 15595ff190a8f068cdc765c307188c8234e673f7b4b0fd7196d71271f150daf0530c6ef38d9cda8d82ed7afbe64f7ee1805f88723c3b84e13060b4bbaec6228a

data/lib/otr-activerecord/activerecord.rb

@@ -20,7 +20,7 @@ module OTR
     # Connect to database with a Hash. Example:
     # {adapter: 'postgresql', host: 'localhost', database: 'db', username: 'user', password: 'pass', encoding: 'utf8', pool: 10, timeout: 5000}
     def self.configure_from_hash!(spec)
-      ::ActiveRecord::Base.configurations = {rack_env => spec}.stringify_keys
+      ::ActiveRecord::Base.configurations = {rack_env.to_s => spec.stringify_keys}
       ::ActiveRecord::Base.establish_connection(rack_env)
     end
 
@@ -38,7 +38,7 @@ module OTR
 
     # The current Rack environment
     def self.rack_env
-      (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['OTR_ENV'] || 'development').to_sym
+      (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV'] || ENV['OTR_ENV'] || 'development').to_sym
     end
   end
 end

data/lib/otr-activerecord/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jordan Hollinger