otr-activerecord 1.2.7 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2673ab10a9f4bfe00341e5f5fdfc88642417763fcaf703bd431df1c81663364d
-  data.tar.gz: 4fb5873b1e6057f59d328c1a4b75bc62c3ee702521faa06878dda45899934be4
+  metadata.gz: c8dad01fcadb48149aac6d50f0e66507bab5bb35bfa42af74d5c4f35a6706ef4
+  data.tar.gz: 2abf82a804042bfb986cef869c7be5f700c9d4ed6a5e952213608706440c7eac
 SHA512:
-  metadata.gz: 328ec2d96e3e13c816ec8b31536a8b8d558c25b7ca365af686bd9cd9c0c4b272fdda72ae23423a5446e8e74b387a4a45afc4e16e80f99d6d0ec6009f444b3a37
-  data.tar.gz: 28ff18f109772d656403cc9f9b6b399fbbcf7cabffec6e9ddfb06895aa4401c25ecc9ef3e7e63a584b42c1e0348e4b86a1e0fb7c1993d02355e26a3660128b53
+  metadata.gz: fe19cf7af34c499bfd4d1811f8cc40d1e62e2f5df42f3ad47568e412864491aaa2dc709076ccfe5007509d9ffd9a94ba994e4cfbfc778eef52f89b6dc392c90f
+  data.tar.gz: 4404dd0fe82faf3d813b3ff767a2d53219ea339dbd5f5e416f115f3b4a0cb4dacb3dff75885a093a5025aece1b3d5d17e8a77d3f1f4cf1d67e8e8e929dfb11e8

data/README.md

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

@@ -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

@@ -6,6 +6,7 @@ module OTR
   module ActiveRecord
     autoload :Compatibility4, 'otr-activerecord/compatibility_4'
     autoload :Compatibility5, 'otr-activerecord/compatibility_5'
+    autoload :Compatibility6, 'otr-activerecord/compatibility_6'
 
     class << self
       # Relative path to the "db" dir

data/lib/otr-activerecord/compatibility_6.rb

@@ -0,0 +1,36 @@
+module OTR
+  module ActiveRecord
+    # Compatibility layer for ActiveRecord 6
+    class Compatibility6
+      attr_reader :major_version
+
+      # Compatibility layer for ActiveRecord 6
+      def initialize
+        @major_version = 6
+        ::ActiveRecord::Base.default_timezone = :utc
+        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
+      end
+
+      # All db migration dir paths
+      def migrations_paths
+        OTR::ActiveRecord.migrations_paths
+      end
+
+      # The dir in which to put new migrations
+      def migrations_path
+        OTR::ActiveRecord.migrations_paths[0]
+      end
+
+      # Basename of migration classes
+      def migration_base_class_name
+        version = "6.#{::ActiveRecord::VERSION::MINOR}"
+        "ActiveRecord::Migration[#{version}]"
+      end
+
+      # Force RACK_ENV/RAILS_ENV to be 'test' when running any db:test:* tasks
+      def force_db_test_env?
+        false
+      end
+    end
+  end
+end

data/lib/otr-activerecord/defaults.rb

@@ -7,4 +7,5 @@ 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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otr-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.4.2
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2020-04-03 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: '5.3'
+        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: '5.3'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: hashie-forbidden_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -57,8 +57,10 @@ files:
 - lib/otr-activerecord/activerecord.rb
 - lib/otr-activerecord/compatibility_4.rb
 - lib/otr-activerecord/compatibility_5.rb
+- 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
@@ -80,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Off The Rails: Use ActiveRecord with Grape, Sinatra, Rack, or anything else!'