master_slave_adapter_tcurdt 0.0.5 → 0.0.6

data/lib/master_slave_adapter/adapter.rb

@@ -151,12 +151,10 @@ module ActiveRecord
         result
       end
 
-      def transaction(*args)
-        # puts "<transaction"
-        result = yield
-        # puts "</transaction"
-        update_clock
-        result
+      def transaction(options = {}, &block)
+        on_write do
+          self.master_connection.transaction(options, &block)
+        end
       end
 
       class << self
@@ -169,8 +167,8 @@ module ActiveRecord
           ActiveRecord::Base.with_slave(&block)
         end
 
-        def with_consitency(clock, &block)
-          ActiveRecord::Base.with_slave(clock, &block)
+        def with_consistency(clock, &block)
+          ActiveRecord::Base.with_consistency(clock, &block)
         end
 
         def reset!
@@ -283,4 +281,4 @@ module ActiveRecord
 
     end
   end
-end
+end

data/lib/master_slave_adapter/version.rb

@@ -1,3 +1,3 @@
 module MasterSlaveAdapter
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/specs/specs.rb

@@ -329,11 +329,11 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
     it "should update the clock after a transaction" do
       ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.reset!
       slave_should_report_clock(0)
-      master_should_report_clock([0, 1, 1, 1, 1])
+      master_should_report_clock([0, 1, 1])
       @slave_connection.should_receive('select_all').exactly(1).times.with('testing').and_return(true)
-      @master_connection.should_receive('update').exactly(3).times.with('testing').and_return(true)
-      # @master_connection.should_receive('transaction').and_return(true)
-      @master_connection.should_receive('select_all').exactly(5).times.with('testing').and_return(true)
+      @master_connection.should_receive('update').exactly(2).times.with('testing').and_return(true)
+      @master_connection.should_receive('transaction').and_return(true)
+      @master_connection.should_receive('select_all').exactly(3).times.with('testing').and_return(true)
 
       old_clock = zero
       new_clock = ActiveRecord::Base.with_consistency(old_clock) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mauricio Linhares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +02:00
+date: 2011-06-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency