slavery 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6bb1c07735678dd8d9c2bd1e3c87c45ae8241ad
-  data.tar.gz: 99bdf13f18d2979a636472caa117228297fe425b
+  metadata.gz: 3a72383d23b47853dae485cfffd2c582a3257aa5
+  data.tar.gz: 59afa26e1e61a5dc9224b57a80e8b0c20d8e76e2
 SHA512:
-  metadata.gz: 6303b5dd01e3ba85b87fe48e8d63ce7a9bbe31a976274e247862d2beb4f09123f1189ec41e4928307157bae6c08532bf06116b140b36069b2719d778993ea8b3
-  data.tar.gz: 1702fc7d7bf42f9fed96a209aaa7e512a2b6ecc9ca253204395cde55c684c52f9a929a75626f915007eee51c622c9ba9ff3931b85997d824c1f7e9cca95d8c09
+  metadata.gz: 77be949569beed8c5b2aca64531997995ad3074b46e0da6b0a359d15db98214360254bfed192f46760d827446e79221cb76a3acbbe08d56b9fbd0c62ce8db5e2
+  data.tar.gz: 8fa0d6c8b97e67b690b61399d736d256fcbb41a283714b6d520c1db666d5c90447d3d4d6c7082f1835bcf5e82e43a6791151452e67315447d17a8aa33fd42b9c

data/lib/slavery.rb

@@ -66,10 +66,12 @@ module Slavery
     end
 
     def slaveryable?
-      base_transaction_depth = defined?(ActiveSupport::TestCase) &&
+      @base_transaction_depth ||= begin
+        defined?(ActiveSupport::TestCase) &&
         ActiveSupport::TestCase.respond_to?(:use_transactional_fixtures) &&
         ActiveSupport::TestCase.try(:use_transactional_fixtures) ? 1 : 0
-      inside_transaction = master_connection.open_transactions > base_transaction_depth
+      end
+      inside_transaction = master_connection.open_transactions > @base_transaction_depth
       raise Error.new('on_slave cannot be used inside transaction block!') if inside_transaction
 
       !Slavery.disabled

data/lib/slavery/version.rb

@@ -1,3 +1,3 @@
 module Slavery
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/spec/slavery_spec.rb

@@ -6,36 +6,36 @@ describe Slavery do
   end
 
   it 'sets thread local' do
-    Slavery.on_master { on_slave?.should == false }
-    Slavery.on_slave  { on_slave?.should == true }
+    Slavery.on_master { expect(on_slave?).to be false }
+    Slavery.on_slave  { expect(on_slave?).to be true }
   end
 
   it 'returns value from block' do
-    Slavery.on_master { User.count }.should == 2
-    Slavery.on_slave  { User.count }.should == 1
+    expect(Slavery.on_master { User.count }).to be 2
+    expect(Slavery.on_slave  { User.count }).to be 1
   end
 
   it 'handles nested calls' do
     # Slave -> Slave
     Slavery.on_slave do
-      on_slave?.should == true
+      expect(on_slave?).to be true
 
       Slavery.on_slave do
-        on_slave?.should == true
+        expect(on_slave?).to be true
       end
 
-      on_slave?.should == true
+      expect(on_slave?).to be true
     end
 
     # Slave -> Master
     Slavery.on_slave do
-      on_slave?.should == true
+      expect(on_slave?).to be true
 
       Slavery.on_master do
-        on_slave?.should == false
+        expect(on_slave?).to be false
       end
 
-      on_slave?.should == true
+      expect(on_slave?).to be true
     end
   end
 
@@ -46,36 +46,36 @@ describe Slavery do
   end
 
   it 'disables by configuration' do
-    Slavery.stub(:disabled).and_return(false)
-    Slavery.on_slave { User.slaveryable?.should == true }
+    allow(Slavery).to receive(:disabled).and_return(false)
+    Slavery.on_slave { expect(User.slaveryable?).to be true }
 
-    Slavery.stub(:disabled).and_return(true)
-    Slavery.on_slave { User.slaveryable?.should == false }
+    allow(Slavery).to receive(:disabled).and_return(true)
+    Slavery.on_slave { expect(User.slaveryable?).to be false }
   end
 
   it 'sets the Slavery database spec name by configuration' do
     Slavery.spec_key = "custom_slave"
-    Slavery.spec_key.should eq 'custom_slave'
+    expect(Slavery.spec_key).to eq 'custom_slave'
 
     Slavery.spec_key = lambda{
       "kewl_slave"
     }
-    Slavery.spec_key.should eq "kewl_slave"
+    expect(Slavery.spec_key).to eq "kewl_slave"
 
     Slavery.spec_key = lambda{
       "#{Slavery.env}_slave"
     }
-    Slavery.spec_key.should eq "test_slave"
+    expect(Slavery.spec_key).to eq "test_slave"
   end
 
   it 'works with scopes' do
-    User.count.should == 2
-    User.on_slave.count.should == 1
+    expect(User.count).to be 2
+    expect(User.on_slave.count).to be 1
 
     # Why where(nil)?
     # http://stackoverflow.com/questions/18198963/with-rails-4-model-scoped-is-deprecated-but-model-all-cant-replace-it
-    User.where(nil).to_a.size.should == 2
-    User.on_slave.where(nil).to_a.size.should == 1
+    expect(User.where(nil).to_a.size).to be 2
+    expect(User.on_slave.where(nil).to_a.size).to be 1
   end
 
   describe 'configuration' do
@@ -95,7 +95,7 @@ describe Slavery do
     it 'connects to master if slave configuration not specified' do
       ActiveRecord::Base.configurations[Slavery.spec_key] = nil
 
-      Slavery.on_slave { User.count }.should == 2
+      expect(Slavery.on_slave { User.count }).to be 2
     end
 
     it 'raises error when no configuration found' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slavery
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Simple, conservative slave reads for ActiveRecord