knockoff 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83de5808a54fcfafc4aaae002b53fa1ef1991d40
-  data.tar.gz: a1e0ab6b1ff428e91487bea8eac534adb141fd8e
+  metadata.gz: 3fb8caafc5c3c363ca1da1f95b4310b299b83291
+  data.tar.gz: 2348bf90468be28d39e09d8717e393817e33ea5c
 SHA512:
-  metadata.gz: 0b3b9673c90334243bc2cd70116dfc82abb64443b81a47bf25d0d23b36a163c83b545b4ae4fc3c0b8db774a6605c458dc4920dfa9118dff87e96e8f2f948f742
-  data.tar.gz: 165984db313f9edc1b169f0ba1883e5e4e017a26c4bb6cfcd044e95d1e9b6ed4411301c1a98d631b723c01672c1e821f3c24a107684d6886923ed585e8e0840c
+  metadata.gz: 34db1af5388b1b84fbfaec976ebedb3d4b063e449830954e50e7b45b91bf0899ad78ac88909d69d6b184af29fdd424a70af79e3ba42b1d5ad38db15964dc8677
+  data.tar.gz: 816aff66c031dc7d781c055fdd097b4df733caa5cb903209e03da3ba9dd9019f647c47da94a64632c0203b7ab9e9a2f47afedc587f548c64ef7bae0bf81dd5b5

data/knockoff.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activerecord', '>= 4.0.0'
   spec.add_runtime_dependency 'activesupport', '>= 4.0.0'
-  spec.add_runtime_dependency 'request_store_rails', '>= 1.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/knockoff.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'request_store_rails'
 require 'knockoff/version'
 require 'knockoff/base'
 require 'knockoff/config'

data/lib/knockoff/active_record/base.rb

@@ -4,14 +4,14 @@ module ActiveRecord
       alias_method :original_connection, :connection
 
       def connection
-        case RequestLocals.fetch(:knockoff) { nil }
+        case Thread.current[:knockoff]
         when :replica
           # Attempts to use a random replica connection, but otherwise falls back to primary
           Knockoff.replica_pool.random_replica_connection.original_connection
         when :primary, NilClass
           original_connection
         else
-          raise Knockoff::Error, "Invalid target: #{RequestLocals.fetch(:knockoff)}"
+          raise Knockoff::Error, "Invalid target: #{Thread.current[:knockoff]}"
         end
       end
 

data/lib/knockoff/base.rb

@@ -29,11 +29,11 @@ module Knockoff
     end
 
     def run_on(target)
-      backup = RequestLocals.fetch(:knockoff) { nil } # Save for recursive nested calls
-      RequestLocals.store[:knockoff] = target
+      backup = Thread.current[:knockoff] # Save for recursive nested calls
+      Thread.current[:knockoff] = target
       yield
     ensure
-      RequestLocals.store[:knockoff] = backup
+      Thread.current[:knockoff] = backup
     end
   end
 end

data/lib/knockoff/replica_connection_pool.rb

@@ -46,6 +46,9 @@ module Knockoff
         class #{class_name} < ActiveRecord::Base
           self.abstract_class = true
           establish_connection :#{config_key}
+          def self.connection_config
+            configurations[#{config_key.to_s.inspect}]
+          end
         end
       }, __FILE__, __LINE__
 

data/lib/knockoff/version.rb

@@ -1,3 +1,3 @@
 module Knockoff
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knockoff
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: request_store_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement