otr-activerecord 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d318dcf63df4adf2773ecaea8663db39502c2a423e2367a1a0dc9552f277563
-  data.tar.gz: ea0483713e317f4eb0b1b4e45099e9db3de30098b207b7adf64a2d29a7370616
+  metadata.gz: c5fb7d9741794ab39e2b6299431eea662dbb04990bc914d473c24f06a7f14473
+  data.tar.gz: aa581f0798203212de9646c84cdbfc4f166edbb77e2cb44dc70093739c0686ab
 SHA512:
-  metadata.gz: 8afe4f886901046296b816c50ecad5637280afbbf077a53a77c1f74a5da2073c8ba91c353fe8cf5df5239c03a5a955ca5ca13b9dd147c729d1dafe7b94f5b652
-  data.tar.gz: 412060fba9c524ccb59acd56f13cbe8d26fcc4f0662377dadc25663b22b3954b11f10a5a8d0593e12e9fbe11e0b6b884cb0c8ce7776d9ea529147d7fbd878277
+  metadata.gz: 110b90321b69aaafb9bd1198801bf546ce9635a7ebb83d9a7b383c9b357a8c86277110ccf0195923c375b25daf054e58275a9abb4a17d0e760dac1995015724f
+  data.tar.gz: a5b05b93b9205974f911cab1023330fd7b05603e46c033a171f5aaf3e7adc124327c401e699ed2daa535e815d21ab6c938c34d87140a5357f77d594bbd2d0173

data/README.md

@@ -2,6 +2,7 @@
 
 An easy way to use ActiveRecord "off the rails." Works with Grape, Sinatra, plain old Rack, or even in a boring little script!. The defaults are all very Railsy (`config/database.yml`, `db/seeds.rb`, `db/migrate`, etc.), but you can easily change them. (Formerly known as `grape-activerecord`.) Supports:
 
+* ActiveRecord 7.0.0.alpha2 (new AR features, like encryption, not tested)
 * ActiveRecord 6
 * ActiveRecord 5
 * ActiveRecord 4

data/lib/otr-activerecord/activerecord.rb

@@ -7,6 +7,7 @@ module OTR
     autoload :Compatibility4, 'otr-activerecord/compatibility_4'
     autoload :Compatibility5, 'otr-activerecord/compatibility_5'
     autoload :Compatibility6, 'otr-activerecord/compatibility_6'
+    autoload :Compatibility7, 'otr-activerecord/compatibility_7'
 
     class << self
       # Relative path to the "db" dir
@@ -57,18 +58,16 @@ 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) || {}).
-        reduce({}) { |a, (env, 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
+        result = load_yaml(path)
+        ::ActiveRecord::Base.configurations = begin
+        result.each do |_env, config|
+          if config.all? { |_, v| v.is_a?(Hash) }
+            config.each { |_, v| append_migration_path(v) }
+          else
+            append_migration_path(config)
           end
-          a
-        }
+        end
+      end
     end
 
     # Establish a connection to the given db (defaults to current rack env)
@@ -76,9 +75,29 @@ module OTR
       ::ActiveRecord::Base.establish_connection(db)
     end
 
+    def self.append_migration_path(config)
+      config['migrations_paths'] = ::OTR::ActiveRecord.migrations_paths unless config.key?('migrations_paths')
+      config
+    end
+
     # The current Rack environment
     def self.rack_env
       (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV'] || ENV['OTR_ENV'] || 'development').to_sym
     end
+
+    # Support old Psych versions
+    def self.load_yaml(path)
+      erb_result = ERB.new(File.read(path)).result
+
+      result = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+        YAML.safe_load(erb_result, aliases: true)
+      else
+        YAML.safe_load(erb_result, [], [], true)
+      end
+
+      result || {}
+    end
+
+    private_class_method :load_yaml
   end
 end

data/lib/otr-activerecord/compatibility_4.rb

@@ -8,7 +8,6 @@ module OTR
       def initialize
         @major_version = 4
         ::ActiveRecord::Base.default_timezone = :utc
-        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
       end
 
       # All db migration dir paths

data/lib/otr-activerecord/compatibility_5.rb

@@ -8,7 +8,6 @@ module OTR
       def initialize
         @major_version = 5
         ::ActiveRecord::Base.default_timezone = :utc
-        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
       end
 
       # All db migration dir paths

data/lib/otr-activerecord/compatibility_6.rb

@@ -8,7 +8,6 @@ module OTR
       def initialize
         @major_version = 6
         ::ActiveRecord::Base.default_timezone = :utc
-        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
       end
 
       # All db migration dir paths
@@ -23,7 +22,7 @@ module OTR
 
       # Basename of migration classes
       def migration_base_class_name
-        version = "6.#{::ActiveRecord::VERSION::MINOR}"
+        version = "#{@major_version}.#{::ActiveRecord::VERSION::MINOR}"
         "ActiveRecord::Migration[#{version}]"
       end
 

data/lib/otr-activerecord/compatibility_7.rb

@@ -0,0 +1,11 @@
+module OTR
+  module ActiveRecord
+    # Compatibility layer for ActiveRecord 7
+    class Compatibility7 < Compatibility6
+      def initialize
+        @major_version = 7
+        ::ActiveRecord.default_timezone = :utc
+      end
+    end
+  end
+end

data/lib/otr-activerecord/defaults.rb

@@ -4,8 +4,10 @@ OTR::ActiveRecord.db_dir = 'db'
 OTR::ActiveRecord.migrations_paths = %w(db/migrate)
 OTR::ActiveRecord.fixtures_path = 'test/fixtures'
 OTR::ActiveRecord.seed_file = 'seeds.rb'
-OTR::ActiveRecord._normalizer = case ::ActiveRecord::VERSION::MAJOR
-                                when 4 then OTR::ActiveRecord::Compatibility4.new
-                                when 5 then OTR::ActiveRecord::Compatibility5.new
-                                when 6 then OTR::ActiveRecord::Compatibility6.new
-                                end
+OTR::ActiveRecord._normalizer =
+  case ::ActiveRecord::VERSION::MAJOR
+  when 4 then OTR::ActiveRecord::Compatibility4.new
+  when 5 then OTR::ActiveRecord::Compatibility5.new
+  when 6 then OTR::ActiveRecord::Compatibility6.new
+  when 7 then OTR::ActiveRecord::Compatibility7.new
+  end

data/lib/otr-activerecord/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jordan Hollinger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: hashie-forbidden_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,7 @@ files:
 - lib/otr-activerecord/compatibility_4.rb
 - lib/otr-activerecord/compatibility_5.rb
 - lib/otr-activerecord/compatibility_6.rb
+- lib/otr-activerecord/compatibility_7.rb
 - lib/otr-activerecord/defaults.rb
 - lib/otr-activerecord/middleware/connection_management.rb
 - lib/otr-activerecord/middleware/query_cache.rb
@@ -67,7 +68,7 @@ homepage: https://github.com/jhollinger/otr-activerecord
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: 'Off The Rails: Use ActiveRecord with Grape, Sinatra, Rack, or anything else!'
 test_files: []