knockoff 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b71fe8eac98c6f5b545de8676314f8d993362f70
-  data.tar.gz: 6899bcf03cc21c9bc6dc56528db0acec3efe5c44
+  metadata.gz: 3e5db34168c3328cc0f1103d49f8dc3afe1f1e52
+  data.tar.gz: 76763a62ba7a2a5328c643b2de5746349237aba1
 SHA512:
-  metadata.gz: 208629e12804ccf7035ceffa93d3f132cf2ac82c9d0683ccb2e9b71a04f46af8a1f92f5c7349696c093a19208fb7a8e8a56d7ca6bf3cdbd504783f1b2002199f
-  data.tar.gz: 9460406988160c910f3a5cb5ef67d74431c67713a548c187347d78ab5548c3443efa474cb8e4b528c61a6d8584b7d838864bfc5db7f593e7908466273ccbbf98
+  metadata.gz: 91a853b868fe982e37356c308d1ba9d882818f5294dc1fb2ba8ec8fef1414dacb6575f9c028186b46468ca6280343223812d34e498501b04508f7a769478a53b
+  data.tar.gz: 9492b0d7391ffabc493ff88b01950ff86c58a923c23350ad35756b1e1663ceb51eebede052754b3305aa505497287bcc64cd18ff65ba99865c2cd204d023ec0b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/tmp

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/sgringwe/knockoff.svg?branch=master)](https://travis-ci.org/sgringwe/knockoff)
 [![Gem Version](https://badge.fury.io/rb/knockoff.svg)](https://badge.fury.io/rb/knockoff)
 
-A gem for easily using read replicas. Heavily based off of https://github.com/kenn/slavery and https://github.com/kickstarter/replica_pools gem.
+A gem for easily using read replicas.
 
 ## Library Goals
 
@@ -165,6 +165,15 @@ Knockoff.establish_new_connections!({ 'pool' => db_pool })
 
 For forking servers, you may disconnect all replicas before forking with `Knockoff.disconnect_all!`.
 
+```
+# puma.rb
+
+before_fork do
+  ActiveRecord::Base.connection_pool.disconnect!
+  Knockoff.disconnect_all!
+end
+```
+
 ### Other Cases
 
 There are likely other cases specific to each application where it makes sense to force primary database and avoid replication lag. Good candidates are time-based pages (a live calendar, for example), forms, and payments.
@@ -173,6 +182,10 @@ There are likely other cases specific to each application where it makes sense t
 
 * Do not use prepared statements with this gem
 
+## Inspirations
+
+Heavily based off of https://github.com/kenn/slavery and https://github.com/kickstarter/replica_pools gem.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -183,7 +196,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sgringwe/knockoff.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/knockoff/base.rb

@@ -11,13 +11,16 @@ module Knockoff
   private
 
     def decide_with(target)
-      raise Knockoff::Error.new('on_slave cannot be used inside transaction block!') if inside_transaction?
+      calculated_target =
+        if Knockoff.enabled
+          target
+        else
+          :primary
+        end
 
-      if Knockoff.enabled
-        target
-      else
-        :primary
-      end
+      # Don't allow setting the target to anything other than primary if we are already in a transaction
+      raise Knockoff::Error.new('on_replica cannot be used inside transaction block!') if calculated_target != :primary && inside_transaction?
+      calculated_target
     end
 
     def inside_transaction?
@@ -33,4 +36,4 @@ module Knockoff
       RequestLocals.store[:knockoff] = backup
     end
   end
-end
+end

data/lib/knockoff/version.rb

@@ -1,3 +1,3 @@
 module Knockoff
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knockoff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord