otr-activerecord 1.4.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66d9b98bb0a752c77dbe8a6d4f07642abb0b429134ea778490a79cc07c212b8
-  data.tar.gz: 2a22f9002a6aa565cdfa79a6418a325e2787add9830148cedecb50e53f54177b
+  metadata.gz: cd820c260dab9b0cbef1548223fd8c7173c5cf2995e133e32db0ce2c90c3c427
+  data.tar.gz: 2a170bd9fcaee46df1a0255180cc765eb4145d95fcb1ca7daf63a786cd43518d
 SHA512:
-  metadata.gz: 4459ff4ed83e3c0078e37859a550d76ab51faab66ba298b36e1b1b80d9e2cbb94a00d0429ce362d669938b72271d5d35038b895c0d57b94e140cbcdb1e42f526
-  data.tar.gz: af6e4bd794d8f9d809e5f771d69c469de5cb53bd800b194e9b780ff493af2ee1c107e854ba1d7775bae2da5c4710a8b566dd4e1828829e98f8448c4aaafd3e37
+  metadata.gz: c736dd5202985ab80f22318fbdab901c769e009ebc5dfb6b3de3c3be133f767e530222c231000bdef783c9fb3628cdbe69b5c1c3e9191bd1e3d1d5606debf198
+  data.tar.gz: 5e5bfb8062b5ab2508b5057a5b8e222a5f0034a96a3e0a9f632c74ae2e53ba05350c8d30bf84b2e47051deea66a3094dd62721afb6e4d6b731135d1491cea44b

data/README.md

@@ -2,9 +2,9 @@
 
 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 4
-* ActiveRecord 5
 * ActiveRecord 6
+* ActiveRecord 5
+* ActiveRecord 4
 
 ## How to use
 
@@ -23,7 +23,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 +45,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

@@ -26,24 +26,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2021-09-14 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.1'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: hashie-forbidden_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -82,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Off The Rails: Use ActiveRecord with Grape, Sinatra, Rack, or anything else!'