knockoff 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4dbe4e0b05729412bb47e57c2cb3ea0b345be7a
-  data.tar.gz: 770d78e8d79a682fd87d85e12dfaf915563d6038
+SHA256:
+  metadata.gz: 95bb6904e4373aa3b026fc1e950b8f5cc9081a4abd174e58ef4ed521824fb5bb
+  data.tar.gz: 6bfeeb88cb514854c2e550f531d65c76c160bcac1225b741deab01f6183e0abf
 SHA512:
-  metadata.gz: 95c6cad5af95ca7668a64332e06984e6156bb98b395d523aed37219c4175458754c2043a92a19643c6f7c6815468a73b5405ff2225962a78646f05caf8169ecd
-  data.tar.gz: 3178e3f88c005cba27dea06856946e24f33bf9102c5131b6721ed8e9e4a766e11c1f50893a3dcfbef39ff6212c2efb2593ff71b144b48b4e8a0b2cf1f1856643
+  metadata.gz: e2afdaf7285a09cb98a2946f19313160d84fe57208e86e00278732c391143c524093ab40e241a4db0c59711db789737b64e4958f2667fec6c7727f006e584663
+  data.tar.gz: ee421e025448df4043319d90be8ed9aa8f9e2979d633feaa29d8876ea8bfb24aa1411d6103aeb65d50cb25f5c549732165d60330355bfe944f53fdc6bb14f955

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 notifications:
   email: false
 rvm:
-  - 2.3.1
   - 2.4.0
   - 2.5.1
+  - 2.6.6
+  - 2.7.2
   - ruby-head

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Unreleased
 
-*None*
+## 1.1.1
+
+- Drop Ruby 2.3 support
+- Add Ruby 2.6 and 2.7 support
+- Fix a deprecation warning in Rails 6
 
 ## 1.1.0
 

data/README.md

@@ -1,11 +1,11 @@
 # Knockoff
 
-[![Build Status](https://travis-ci.org/joinhandshake/knockoff.svg?branch=master)](https://travis-ci.org/joinhandshake/knockoff)
+[![Build Status](https://travis-ci.com/joinhandshake/knockoff.svg?branch=master)](https://travis-ci.com/github/joinhandshake/knockoff)
 [![Gem Version](https://badge.fury.io/rb/knockoff.svg)](https://badge.fury.io/rb/knockoff)
 
 A gem for easily using read replicas.
 
-:handshake: Battle tested at [Handshake](https://joinhandshake.com/engineering/)
+:handshake: Battle tested at [Handshake](https://joinhandshake.com/)
 
 ## Library Goals
 
@@ -17,7 +17,7 @@ A gem for easily using read replicas.
 
 ## Supported Versions
 
-Knockoff supports Rails 4 and 5
+Knockoff supports Rails 4, 5 and 6
 
 ## Installation
 

data/lib/knockoff/active_record/relation.rb

@@ -5,11 +5,11 @@ module ActiveRecord
     # Supports queries like User.on_replica.to_a
     alias_method :exec_queries_without_knockoff, :exec_queries
 
-    def exec_queries
+    def exec_queries(&block)
       if knockoff_target == :replica
-        Knockoff.on_replica { exec_queries_without_knockoff }
+        Knockoff.on_replica { exec_queries_without_knockoff(&block) }
       else
-        exec_queries_without_knockoff
+        exec_queries_without_knockoff(&block)
       end
     end
 

data/lib/knockoff/config.rb

@@ -96,10 +96,17 @@ module Knockoff
 
           # Store the hash in configuration and use it when we establish the connection later.
           key = "knockoff_replica_#{index}"
-          full_config = replica_config.merge(uri_config)
+          config = replica_config.merge(uri_config)
 
-          ActiveRecord::Base.configurations[key] = full_config
-          @replicas_configurations[key] = full_config
+          if ActiveRecord::VERSION::MAJOR >= 6
+            full_config = ActiveRecord::Base.configurations.to_h.merge(key => config)
+
+            ActiveRecord::Base.configurations = full_config
+            @replicas_configurations[key] = config
+          else
+            ActiveRecord::Base.configurations[key] = config
+            @replicas_configurations[key] = config
+          end
         rescue URI::InvalidURIError
           Rails.logger.info "LOG NOTIFIER: Invalid URL specified in follower_env_keys. Not including URI, which may result in no followers used." # URI is purposely not printed to logs
           # Return a 'nil' which will be removed from

data/lib/knockoff/version.rb

@@ -1,3 +1,3 @@
 module Knockoff
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knockoff
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A gem for easily using read replicas