otr-activerecord 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cab0f2557ace7ed091eb02c7090a595d0cfb586313b9f03b4727172e9fd670
-  data.tar.gz: 5dcc6d2ee8e6d99612e6999549c944820b7485735947e80ee953498f2c5cf829
+  metadata.gz: c1e566ff7225406da58fdb74cf202e283bacf60486ab841aa45be19607efc54d
+  data.tar.gz: 3ee87d6850730d55c0aa64c71b5b68a17f3ab784f568377a164ea63df6b6ff3c
 SHA512:
-  metadata.gz: 71561f7bf678621e8061be51fd5a833c47ac219eb7f7ba010f8a210ba45c108d3f389ab743b87ab4bbc9d6f6aba95bfbd1694bb6f6c9319fa6e17880cd9fa54f
-  data.tar.gz: 2c596c55ae278c66b5081a4d06aabfa43f83e8fd162675c2517299f120e231dd56f8d91a7fa0e7d1d7d0e7390022c825db71d5e71013b4d68b98b8daaf89ce86
+  metadata.gz: b5fb891ef5c65446dd662e89b401b77354257e571513d8ae9d9657a55fd24b3f4838d0d86e863d492537f8c5ea7f57ee97f6beaa3c5c6a9962af22e947af80ae
+  data.tar.gz: cbe9dc7f8ab23c2d475efd33915be5ff4f64b8672a6aba424d350b5bc1cf5d811af15955c6777acb4406b1b0e1aa73151bbf43432e7a54a149a4e7148aa6ce7f

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
@@ -30,24 +31,43 @@ module OTR
 
     # Connect to database with a DB URL. Example: "postgres://user:pass@localhost/db"
     def self.configure_from_url!(url)
-      configure_from_hash! ::ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
+      require 'uri'
+      uri = URI(url)
+      spec = {"adapter" => uri.scheme}
+
+      case spec["adapter"]
+      when /^sqlite/i
+        spec["database"] = url =~ /::memory:/ ? ":memory:" : "#{uri.host}#{uri.path}"
+      else
+        spec["host"] = uri.host if uri.host
+        spec["port"] = uri.port if uri.port
+        spec["database"] = uri.path.sub(/^\//, "")
+        spec["username"] = uri.user if uri.user
+        spec["password"] = uri.password if uri.password
+      end
+
+      if uri.query
+        opts_ary = URI.decode_www_form(uri.query)
+        opts = Hash[opts_ary]
+        spec.merge!(opts)
+      end
+
+      configure_from_hash! spec
     end
 
     # 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)
@@ -55,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_6.rb

@@ -23,7 +23,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,12 @@
+module OTR
+  module ActiveRecord
+    # Compatibility layer for ActiveRecord 7
+    class Compatibility7 < Compatibility6
+      def initialize
+        @major_version = 7
+        ::ActiveRecord.default_timezone = :utc
+        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
+      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.0'
+    VERSION = '2.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2022-01-20 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
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: 'Off The Rails: Use ActiveRecord with Grape, Sinatra, Rack, or anything else!'