otr-activerecord 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be72e7cf2d04b19487c2d747929254323747a8c06e42374814a6ecbe8bc935a2
-  data.tar.gz: f3e1bfa5b32199891de46dbd2a9a1d633d2512c53c5d6b20fd670dc4db3b93ee
+  metadata.gz: f491048eedeff2cf2bb0a359e3729ddd59e6adc5003385db0d96799606cc7946
+  data.tar.gz: a7e388b4ab6c78461d803da7a226f98f142c74b28946738632c12c987d958f77
 SHA512:
-  metadata.gz: 6ba9aa0f880717dac8b2eefbcc40bd2089240b60f9f1227be38b845f14180beb39e760c46d63c614cfd6f3822198724f3275dd1fe35cbc057bd307a411ef10be
-  data.tar.gz: 263e3f0dde25f81beeecdc746951ee007470dc96e69fc869bde84d2557e150c50589d7df6c3d68ec7245fae0d221b62b9e6e905510b2182c96e924433b3251ef
+  metadata.gz: bce9596561ea97fc9aee6bd09f316041f9f366686ae33ac0d6d10d0b5d7193c2d51132636035a087b8b488f0567d624317aee9ff7ea551a10ec671ef6cf4b85b
+  data.tar.gz: 42d687311c29530f8a6162ceec4cd14586b30b7ee6f4da2c9398be235132370bc84d8321f58116da660f9c1947b5aed68205e4cc1820473efb389d0ccd994445

data/README.md

@@ -23,12 +23,16 @@ 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. Enable middleware for Rack apps
 
-This middleware cleans up your database connections after each request. Add it to your `config.ru` file:
+Add these middlewares in `config.ru`:
 
+    # Clean up database connections after every request (required)
     use OTR::ActiveRecord::ConnectionManagement
 
+    # Enable ActiveRecord's QueryCache for every request (optional)
+    use OTR::ActiveRecord::QueryCache
+
 #### 4. 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

@@ -3,4 +3,5 @@ require 'hashie-forbidden_attributes'
 require 'otr-activerecord/version'
 require 'otr-activerecord/activerecord'
 require 'otr-activerecord/middleware/connection_management.rb'
+require 'otr-activerecord/middleware/query_cache.rb'
 require 'otr-activerecord/defaults'

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 = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -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