knockoff 1.0 → 1.1.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0b434b18fd1ad5b383fa9bc40fcaf77e04b79e
-  data.tar.gz: 17cee20d59d0cb6099838c0efaac845545e6af55
+  metadata.gz: b9352faddb2bf60d2ddf6f3c91c9e03bce498a41
+  data.tar.gz: c4bb57f7a8b240d71ca164d489de9b26535ce53b
 SHA512:
-  metadata.gz: 6ccbdee78647fea3b3e64b581e7c4dca073bf5428834067e37b4d15d0fb64237dc53f66361a639ad4f535e9511cd0820caf04415269dc9f05acb6cd8e8cef823
-  data.tar.gz: 9667d13bf4bcaec1c72898c63a7b9a446eade2f290b18bbef282bc6d757c88dfabb6dde5c4d4ea477ece150eb26f5878883b71f8181ae6862d9c6edeb8376782
+  metadata.gz: 13d2338a6425fe9eea71c30b8b838f7df6fe9c69e369193b67bd3be59c739062a8f0515f7cc28c2846e0df743d9745467b5e3b5e3cf2bfdbeb680719c2bc4efd
+  data.tar.gz: ffda5a9534ca24f6dfb85d59ea3a225bd5759a50eaa94f71ae869396abf7d7806fa05583108adfbd240abb0c5356b2d9b3bf241af0dc0f59fb3c0edeab906d1a

data/.travis.yml

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

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## Unreleased
+
+- Allow for not checking `inside_transaction?` on primary database (https://github.com/joinhandshake/knockoff/pull/13)
+- Allow setting `Knockoff.default_target` to set the default target other than `:primary` (https://github.com/joinhandshake/knockoff/pull/11)
+- Drop Ruby 2.2 support
+- Add Ruby 2.5 support

data/README.md

@@ -1,6 +1,6 @@
 # Knockoff
 
-[![Build Status](https://travis-ci.org/sgringwe/knockoff.svg?branch=master)](https://travis-ci.org/sgringwe/knockoff)
+[![Build Status](https://travis-ci.org/joinhandshake/knockoff.svg?branch=master)](https://travis-ci.org/joinhandshake/knockoff)
 [![Gem Version](https://badge.fury.io/rb/knockoff.svg)](https://badge.fury.io/rb/knockoff)
 
 A gem for easily using read replicas.
@@ -188,10 +188,6 @@ There are likely other cases specific to each application where it makes sense t
 
 * Do not use prepared statements with this gem
 
-## Inspirations
-
-Based off of and inspired by 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.
@@ -200,7 +196,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sgringwe/knockoff.
+Bug reports and pull requests are welcome on GitHub at https://github.com/joinhandshake/knockoff.
 
 ## License
 

data/knockoff.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activerecord', '>= 4.0.0'
   spec.add_runtime_dependency 'activesupport', '>= 4.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.14.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency 'sqlite3'

data/lib/knockoff.rb

@@ -10,15 +10,20 @@ require 'knockoff/active_record/relation'
 module Knockoff
   class << self
     attr_accessor :enabled
+    attr_reader :default_target
 
-    def on_replica(&block)
-      Base.new(:replica).run(&block)
+    def on_replica(check_transaction: true, &block)
+      Base.new(:replica, check_transaction: check_transaction).run(&block)
     end
 
     def on_primary(&block)
       Base.new(:primary).run(&block)
     end
 
+    def default_target=(target)
+      @default_target = Base.new(target).target
+    end
+
     def replica_pool
       @replica_pool ||= ReplicaConnectionPool.new(config.replica_database_keys)
     end

data/lib/knockoff/active_record/base.rb

@@ -4,7 +4,8 @@ module ActiveRecord
       alias_method :original_connection, :connection
 
       def connection
-        case Thread.current[:knockoff]
+        target = Thread.current[:knockoff] || Knockoff.default_target
+        case target
         when :replica
           # Attempts to use a random replica connection, but otherwise falls back to primary
           Knockoff.replica_pool.random_replica_connection.original_connection

data/lib/knockoff/base.rb

@@ -1,7 +1,9 @@
 module Knockoff
   class Base
-    def initialize(target)
-      @target = decide_with(target)
+    attr_reader :target
+
+    def initialize(target, check_transaction: true)
+      @target = decide_with(target, check_transaction)
     end
 
     def run(&block)
@@ -10,7 +12,7 @@ module Knockoff
 
   private
 
-    def decide_with(target)
+    def decide_with(target, check_transaction)
       calculated_target =
         if Knockoff.enabled
           target
@@ -19,7 +21,9 @@ module Knockoff
         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?
+      if calculated_target != :primary && check_transaction && inside_transaction?
+        raise Knockoff::Error.new('on_replica cannot be used inside transaction block!')
+      end
       calculated_target
     end
 

data/lib/knockoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knockoff
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.1.0.alpha
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,14 +136,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A gem for easily using read replicas
 test_files: []
-has_rdoc: