otr-activerecord 1.3.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be72e7cf2d04b19487c2d747929254323747a8c06e42374814a6ecbe8bc935a2
-  data.tar.gz: f3e1bfa5b32199891de46dbd2a9a1d633d2512c53c5d6b20fd670dc4db3b93ee
+  metadata.gz: 9d318dcf63df4adf2773ecaea8663db39502c2a423e2367a1a0dc9552f277563
+  data.tar.gz: ea0483713e317f4eb0b1b4e45099e9db3de30098b207b7adf64a2d29a7370616
 SHA512:
-  metadata.gz: 6ba9aa0f880717dac8b2eefbcc40bd2089240b60f9f1227be38b845f14180beb39e760c46d63c614cfd6f3822198724f3275dd1fe35cbc057bd307a411ef10be
-  data.tar.gz: 263e3f0dde25f81beeecdc746951ee007470dc96e69fc869bde84d2557e150c50589d7df6c3d68ec7245fae0d221b62b9e6e905510b2182c96e924433b3251ef
+  metadata.gz: 8afe4f886901046296b816c50ecad5637280afbbf077a53a77c1f74a5da2073c8ba91c353fe8cf5df5239c03a5a955ca5ca13b9dd147c729d1dafe7b94f5b652
+  data.tar.gz: 412060fba9c524ccb59acd56f13cbe8d26fcc4f0662377dadc25663b22b3954b11f10a5a8d0593e12e9fbe11e0b6b884cb0c8ce7776d9ea529147d7fbd878277

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,13 +23,29 @@ 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 ActiveRecord connection management in Rack apps
+#### 3. Connect to your database(s)
+
+If you have a single database (most apps), use this helper:
 
-This middleware cleans up your database connections after each request. Add it to your `config.ru` file:
+    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`:
+
+    # Clean up database connections after every request (required)
     use OTR::ActiveRecord::ConnectionManagement
 
-#### 4. Import ActiveRecord tasks into your Rakefile
+    # Enable ActiveRecord's QueryCache for every request (optional)
+    use OTR::ActiveRecord::QueryCache
+
+#### 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.rb

@@ -2,5 +2,6 @@ require 'active_record'
 require 'hashie-forbidden_attributes'
 require 'otr-activerecord/version'
 require 'otr-activerecord/activerecord'
-require 'otr-activerecord/middleware/connection_management.rb'
+require 'otr-activerecord/middleware/connection_management'
+require 'otr-activerecord/middleware/query_cache'
 require 'otr-activerecord/defaults'

data/lib/otr-activerecord/activerecord.rb

@@ -26,12 +26,32 @@ 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"
@@ -40,10 +60,20 @@ module OTR
       ::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
+          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
+          end
           a
         }
-      ::ActiveRecord::Base.establish_connection(rack_env)
+    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
 
     # The current Rack environment

data/lib/otr-activerecord/middleware/query_cache.rb

@@ -0,0 +1,33 @@
+module OTR
+  module ActiveRecord
+    #
+    # Rack middleware to enable ActiveRecord's query cache for each request.
+    #
+    class QueryCache
+      def initialize(app)
+        @handler = case ::ActiveRecord::VERSION::MAJOR
+                   when 4 then ::ActiveRecord::QueryCache.new(app)
+                   when 5, 6 then ActionDispatchHandler.new(app)
+                   end
+      end
+
+      def call(env)
+        @handler.call(env)
+      end
+
+      class ActionDispatchHandler
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          state = nil
+          state = ::ActiveRecord::QueryCache.run
+          @app.call(env)
+        ensure
+          ::ActiveRecord::QueryCache.complete(state) if state
+        end
+      end
+    end
+  end
+end

data/lib/otr-activerecord/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2021-06-24 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
@@ -60,6 +60,7 @@ files:
 - lib/otr-activerecord/compatibility_6.rb
 - lib/otr-activerecord/defaults.rb
 - lib/otr-activerecord/middleware/connection_management.rb
+- lib/otr-activerecord/middleware/query_cache.rb
 - lib/otr-activerecord/version.rb
 - lib/tasks/otr-activerecord.rake
 homepage: https://github.com/jhollinger/otr-activerecord
@@ -81,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!'