replica 1.0.0 → 1.0.1

data/Rakefile

@@ -21,7 +21,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -29,7 +29,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.pattern = 'test/**/*_test.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/replica.rb

@@ -24,6 +24,14 @@ module ActiveRecord # :nodoc:
         with_replica(nil, &block)
       end
 
+      def with_slave_if(condition, &block)
+        condition ? with_slave(&block) : with_master(&block)
+      end
+      
+      def with_slave_unless(condition, &block)
+        with_slave_if(!condition, &block)
+      end
+      
       # Name of the connection pool. Used by ConnectionHandler to retrieve the current connection pool.
       def connection_pool_name # :nodoc:
         replica = current_replica_name

data/test/replica_test.rb

@@ -1,91 +1,114 @@
 require 'helper'
 
 class ReplicaTest < ActiveRecord::TestCase
-  
+
   context "without replica configuration" do
-    
+
     setup do
       ActiveRecord::Base.configurations.delete('test_slave')
       ActiveRecord::Base.connection_handler.connection_pools.clear
       ActiveRecord::Base.establish_connection('test')
     end
-    
+
     should "default to the master database" do
       Account.create!
-      
+
       ActiveRecord::Base.with_slave { assert_using_master_db(Account) } 
       Account.with_slave { assert_using_master_db(Account) }
       Ticket.with_slave  { assert_using_master_db(Account) }
     end
-    
+
     should "successfully execute queries" do
       Account.create!
       assert_using_master_db(Account)
-            
+
       assert_equal Account.count, ActiveRecord::Base.with_slave { Account.count }
       assert_equal Account.count, Account.with_slave { Account.count }
     end
-        
+
   end
-  
+
   context "with replica configuration" do
-  
+
     should "successfully execute queries" do
       assert_using_master_db(Account)
       Account.create!
-            
+
       assert_not_equal Account.count, ActiveRecord::Base.with_slave { Account.count }
       assert_not_equal Account.count, Account.with_slave { Account.count }
       assert_equal Account.count, Ticket.with_slave { Account.count }
     end
-  
+
     should "support model specific with_slave blocks" do
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-     
-         Account.with_slave do
-           assert_using_slave_db(Account)
-           assert_using_master_db(Ticket)
-         end
-     
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-       end
-     
-       should "support global with_slave blocks" do
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-     
-         ActiveRecord::Base.with_slave do
-           assert_using_slave_db(Account)
-           assert_using_slave_db(Ticket)
-         end
-     
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-       end
-     
-       should_eventually "support nested with_* blocks" do
-         
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-     
-         ActiveRecord::Base.with_slave do
-           assert_using_slave_db(Account)
-           assert_using_slave_db(Ticket)
-     
-           Account.with_master do
-             assert_using_master_db(Account)
-             assert_using_slave_db(Ticket)
-           end
-     
-           assert_using_slave_db(Account)
-           assert_using_slave_db(Ticket)
-         end
-     
-         assert_using_master_db(Account)
-         assert_using_master_db(Ticket)
-       end
-   
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+
+      Account.with_slave do
+        assert_using_slave_db(Account)
+        assert_using_master_db(Ticket)
+      end
+
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+    end
+
+    should "support global with_slave blocks" do
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+
+      ActiveRecord::Base.with_slave do
+        assert_using_slave_db(Account)
+        assert_using_slave_db(Ticket)
+      end
+
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+    end
+
+    should "support conditional methods" do
+      assert_using_master_db(Account)
+      
+      Account.with_slave_if(true) do
+        assert_using_slave_db(Account)
+      end
+      
+      assert_using_master_db(Account)
+
+      Account.with_slave_if(false) do
+        assert_using_master_db(Account)
+      end
+      
+      Account.with_slave_unless(true) do
+        assert_using_master_db(Account)
+      end
+      
+      Account.with_slave_unless(false) do
+        assert_using_slave_db(Account)
+      end
+      
+    end
+
+    should_eventually "support nested with_* blocks" do
+
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+
+      ActiveRecord::Base.with_slave do
+        assert_using_slave_db(Account)
+        assert_using_slave_db(Ticket)
+
+        Account.with_master do
+          assert_using_master_db(Account)
+          assert_using_slave_db(Ticket)
+        end
+
+        assert_using_slave_db(Account)
+        assert_using_slave_db(Ticket)
+      end
+
+      assert_using_master_db(Account)
+      assert_using_master_db(Ticket)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: replica
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Chapweske
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -08:00
+date: 2010-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency