otr-activerecord 1.4.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8dad01fcadb48149aac6d50f0e66507bab5bb35bfa42af74d5c4f35a6706ef4
-  data.tar.gz: 2abf82a804042bfb986cef869c7be5f700c9d4ed6a5e952213608706440c7eac
+  metadata.gz: 304d3cdd120ed69673c1d19b4be9fc6398929ba82c9fe3a8999815177a84ae98
+  data.tar.gz: 4ce504f5faa3ceb7ea4145dc4205e41a0ac3484409ef51253c278ce61ffb1f3e
 SHA512:
-  metadata.gz: fe19cf7af34c499bfd4d1811f8cc40d1e62e2f5df42f3ad47568e412864491aaa2dc709076ccfe5007509d9ffd9a94ba994e4cfbfc778eef52f89b6dc392c90f
-  data.tar.gz: 4404dd0fe82faf3d813b3ff767a2d53219ea339dbd5f5e416f115f3b4a0cb4dacb3dff75885a093a5025aece1b3d5d17e8a77d3f1f4cf1d67e8e8e929dfb11e8
+  metadata.gz: 1327e816c901a33452b6f76a0ec362af3e9f7fd454dca9b522672acebe911b59e4f7ef2e20dbe566b4085c100bae9df392985ad7db0d5ace866d13392d942c8f
+  data.tar.gz: 64d38211a199cca1c93f5e1da576e69c17fbdda4333b6cf6e595027f851a478bf63b5c77ca6b9bf918c6da1418187fdebd2feec1e835a8e03179267bb6af4ae5

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
@@ -23,7 +24,19 @@ After loading your gems, tell `OTR::ActiveRecord` about your database config usi
 **Important note**: `configure_from_file!` won't work as expected if you have already `DATABASE_URL` set as part of your environment variables.
 This is because in ActiveRecord when that env variable is set it will merge its properties into the current connection configuration.
 
-#### 3. Enable middleware for Rack apps
+#### 3. Connect to your database(s)
+
+If you have a single database (most apps), use this helper:
+
+    OTR::ActiveRecord.establish_connection!
+
+If you're using multiple databases, call your base class(es) instead:
+
+    MyBase.establish_connection :primary
+    MyBase.establish_connection :primary_replica
+    ...
+
+#### 4. Enable middleware for Rack apps
 
 Add these middlewares in `config.ru`:
 
@@ -33,7 +46,7 @@ Add these middlewares in `config.ru`:
     # Enable ActiveRecord's QueryCache for every request (optional)
     use OTR::ActiveRecord::QueryCache
 
-#### 4. Import ActiveRecord tasks into your Rakefile
+#### 5. Import ActiveRecord tasks into your Rakefile
 
 This will give you most of the standard `db:` tasks you get in Rails. Add it to your `Rakefile`.
 

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
@@ -26,24 +27,57 @@ module OTR
     def self.configure_from_hash!(spec)
       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
 
     # 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)|
-          a[env] = {"migrations_paths" => ::OTR::ActiveRecord.migrations_paths}.merge config
-          a
-        }
-      ::ActiveRecord::Base.establish_connection(rack_env)
+        result =(YAML.safe_load(ERB.new(File.read(path)).result, [], [], true) || {})
+        ::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
+        end
+      end
+    end
+
+    # Establish a connection to the given db (defaults to current rack env)
+    def self.establish_connection!(db = rack_env)
+      ::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

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 = '1.4.2'
+    VERSION = '2.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Jordan Hollinger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2021-10-22 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: []