otr-activerecord 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79889ffb8019c357312f6fabb6e8d2e9841c0d7d
-  data.tar.gz: d359105a7837c047c4fa2107efec5ec930181747
+SHA256:
+  metadata.gz: 7c62e1c1f9dbdcd4285f92e2f3c10f2bf8e56d4a721437ba6973a7f3766f608c
+  data.tar.gz: 84d8aa3b44516b9b6303452b1d6741f31646da1b7e9fa1c08f2b85a6d5bbb80f
 SHA512:
-  metadata.gz: 18c3b4782514bc052be4fd61d42d38874db80852ff3a50ea363be3fd5bcffa5e9f80d9e27b010a5dfa503dc38301a0bfff059777af580ce0940aa60e53839e83
-  data.tar.gz: 7591dff71f30c8fe328f9eda40b439f71e8cd5166be062c1f5b659786d645c151a4838852fb0af36afa8fda28b1c03abe07b891d790ce15055f2a6c2c440973c
+  metadata.gz: 8f8cbe209d5cc955054933c40505f3a6dab0ca69d24ba526a816fad8f1ecb1dd55cb5715270ae8841b8d26d48473bba5f37ca22bfb109ce2122c020385a3075a
+  data.tar.gz: '09c8dab63a46a38348a2ce94d531b7ba410f2a4c4f69a3a795560b1b23f8c33040138b7e594a4a630af680173bd1661d85bd41981ac6ad7c14c5ff619acf7365'

data/lib/otr-activerecord/activerecord.rb

@@ -4,6 +4,9 @@ require 'erb'
 module OTR
   # ActiveRecord configuration module
   module ActiveRecord
+    autoload :Compatibility4, 'otr-activerecord/compatibility_4'
+    autoload :Compatibility5, 'otr-activerecord/compatibility_5'
+
     class << self
       # Relative path to the "db" dir
       attr_accessor :db_dir
@@ -20,7 +23,8 @@ 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.to_s => spec.stringify_keys}
+      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
 
@@ -32,7 +36,12 @@ module OTR
     # Connect to database with a yml file. Example: "config/database.yml"
     def self.configure_from_file!(path)
       raise "#{path} does not exist!" unless File.file? path
-      ::ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read(path)).result) || {}
+      ::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
+          a
+        }
       ::ActiveRecord::Base.establish_connection(rack_env)
     end
 

data/lib/otr-activerecord/version.rb

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

data/lib/otr-activerecord.rb

@@ -2,7 +2,5 @@ require 'active_record'
 require 'hashie-forbidden_attributes'
 require 'otr-activerecord/version'
 require 'otr-activerecord/activerecord'
-require 'otr-activerecord/compatibility_4'
-require 'otr-activerecord/compatibility_5'
 require 'otr-activerecord/middleware/connection_management.rb'
 require 'otr-activerecord/defaults'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: hashie-forbidden_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: 'Off The Rails: Use ActiveRecord with Grape, Sinatra, Rack, or anything else!'