otr-activerecord 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd820c260dab9b0cbef1548223fd8c7173c5cf2995e133e32db0ce2c90c3c427
-  data.tar.gz: 2a170bd9fcaee46df1a0255180cc765eb4145d95fcb1ca7daf63a786cd43518d
+  metadata.gz: 618d9bd8f7eefebc0dec7d8edab50f3467d67960f0d45f6af2f6b9269c891326
+  data.tar.gz: defdc1b651311d6223c93372c12414c8aa959bfe2bff5c6e2f9ccfefb8742b2a
 SHA512:
-  metadata.gz: c736dd5202985ab80f22318fbdab901c769e009ebc5dfb6b3de3c3be133f767e530222c231000bdef783c9fb3628cdbe69b5c1c3e9191bd1e3d1d5606debf198
-  data.tar.gz: 5e5bfb8062b5ab2508b5057a5b8e222a5f0034a96a3e0a9f632c74ae2e53ba05350c8d30bf84b2e47051deea66a3094dd62721afb6e4d6b731135d1491cea44b
+  metadata.gz: ed724376e924c950216a0af6be220026eae7827771f956b823a3a5a87cde337382c417c10959a47e257a6a810f86f43104c1808abdfda26bd4237e0b19ec2ab2
+  data.tar.gz: 7b139648c7f47ff52dd6888c6bf9027d4c56d1ca8f5a6549eaa42ae48d6b9ed31ec10b2d9e5029f228b8c21824fca8910b38cac7c627bcfa2a21a9b6855c52a4

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,7 +58,7 @@ 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
-        result =(YAML.safe_load(ERB.new(File.read(path)).result, [], [], true) || {})
+        result = load_yaml(path)
         ::ActiveRecord::Base.configurations = begin
         result.each do |_env, config|
           if config.all? { |_, v| v.is_a?(Hash) }
@@ -83,5 +84,20 @@ module OTR
     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/middleware/query_cache.rb

@@ -7,7 +7,7 @@ module OTR
       def initialize(app)
         @handler = case ::ActiveRecord::VERSION::MAJOR
                    when 4 then ::ActiveRecord::QueryCache.new(app)
-                   when 5, 6 then ActionDispatchHandler.new(app)
+                   when 5, 6, 7 then ActionDispatchHandler.new(app)
                    end
       end
 

data/lib/otr-activerecord/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Jordan Hollinger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 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: []