rubyrep 1.0.5 → 1.0.6

data/spec/two_way_replicator_spec.rb

@@ -13,14 +13,14 @@ describe Replicators::TwoWayReplicator do
   end
 
   it "initialize should store the replication helper" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     replicator.rep_helper.should == helper
   end
 
   it "verify_option should raise descriptive errors" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     lambda {replicator.verify_option(nil, [:valid_value], :my_key, :my_value)}.
@@ -30,7 +30,7 @@ describe Replicators::TwoWayReplicator do
   end
 
   it "initialize should throw an error if options are invalid" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     base_options = {
       :replicator => :two_way,
@@ -71,7 +71,7 @@ describe Replicators::TwoWayReplicator do
   it "options_for_table should return the correct options for the table" do
     Initializer.configuration.options = {:a => 1, :b => 2}
     Initializer.configuration.add_table_options 'scanner_records', {:b => 3}
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     options = replicator.options_for_table('scanner_records')
@@ -80,7 +80,7 @@ describe Replicators::TwoWayReplicator do
   end
 
   it "options_for_table should merge the configured options into the default two way replicator options" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     replicator.options_for_table('scanner_records').include?(:left_change_handling).should be_true
@@ -94,18 +94,20 @@ describe Replicators::TwoWayReplicator do
     session.left.begin_db_transaction
     session.right.begin_db_transaction
     begin
-      rep_run = ReplicationRun.new(session)
+      rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      left_change = LoggedChange.new session, :left
+      loaders = LoggedChangeLoaders.new(session)
+
+      left_change = LoggedChange.new loaders[:left]
       left_change.table = 'left_table'
       left_change.key = {'id' => '1'}
-      right_change = LoggedChange.new session, :right
+      right_change = LoggedChange.new loaders[:right]
       right_change.table = 'right_table'
       right_change.key = {'id' => '1'}
 
-      diff = ReplicationDifference.new(session)
+      diff = ReplicationDifference.new(loaders)
       diff.changes[:left] = left_change
       diff.changes[:right] = right_change
 
@@ -150,11 +152,13 @@ describe Replicators::TwoWayReplicator do
 
   it "log_replication_outcome should log conflicts correctly" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
 
-    diff = ReplicationDifference.new session
+    loaders = LoggedChangeLoaders.new(session)
+
+    diff = ReplicationDifference.new loaders
     diff.type = :conflict
-    diff.changes[:left] = LoggedChange.new session, :left
+    diff.changes[:left] = LoggedChange.new loaders[:left]
     diff.changes[:left].table = 'scanner_records'
 
     # should only log events if so configured
@@ -183,11 +187,13 @@ describe Replicators::TwoWayReplicator do
 
   it "log_replication_outcome should log changes correctly" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
+
+    loaders = LoggedChangeLoaders.new(session)
 
-    diff = ReplicationDifference.new session
+    diff = ReplicationDifference.new loaders
     diff.type = :left
-    diff.changes[:left] = LoggedChange.new session, :left
+    diff.changes[:left] = LoggedChange.new loaders[:left]
     diff.changes[:left].table = 'scanner_records'
 
     # should only log events if so configured
@@ -216,7 +222,7 @@ describe Replicators::TwoWayReplicator do
 
   it "replicate_difference should not do anything if ignore option is given" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     replicator.stub!(:options_for_table).and_return(
@@ -228,8 +234,10 @@ describe Replicators::TwoWayReplicator do
       }
     )
 
-    diff = ReplicationDifference.new(session)
-    diff.changes[:left] = LoggedChange.new session, :left
+    loaders = LoggedChangeLoaders.new(session)
+
+    diff = ReplicationDifference.new(loaders)
+    diff.changes[:left] = LoggedChange.new loaders[:left]
     diff.changes[:left].table = 'scanner_records'
 
     # but logging should still happen
@@ -251,7 +259,7 @@ describe Replicators::TwoWayReplicator do
 
   it "replicate_difference should call the provided Proc objects" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
 
     lambda_parameters = []
@@ -267,20 +275,22 @@ describe Replicators::TwoWayReplicator do
       }
     )
 
-    change = LoggedChange.new session, :left
+    loaders = LoggedChangeLoaders.new(session)
+
+    change = LoggedChange.new loaders[:left]
     change.table = 'scanner_records'
 
-    d1 = ReplicationDifference.new(session)
+    d1 = ReplicationDifference.new(loaders)
     d1.type = :conflict
     d1.changes[:left] = change
     replicator.replicate_difference d1
 
-    d2 = ReplicationDifference.new(session)
+    d2 = ReplicationDifference.new(loaders)
     d2.type = :left
     d2.changes[:left] = change
     replicator.replicate_difference d2
 
-    d3 = ReplicationDifference.new(session)
+    d3 = ReplicationDifference.new(loaders)
     d3.type = :right
     d3.changes[:left] = change
     replicator.replicate_difference d3
@@ -294,12 +304,12 @@ describe Replicators::TwoWayReplicator do
 
   it "replicate_difference should clear conflicts as per provided options" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
 
-    left_change = LoggedChange.new session, :left
+    left_change = LoggedChange.new LoggedChangeLoader.new(session, :left)
     left_change.table = 'scanner_records'
-    right_change = LoggedChange.new session, :right
+    right_change = LoggedChange.new LoggedChangeLoader.new(session, :right)
     right_change.table = 'scanner_records'
     diff = ReplicationDifference.new(session)
     diff.type = :conflict
@@ -347,12 +357,12 @@ describe Replicators::TwoWayReplicator do
     session.left.begin_db_transaction
     session.right.begin_db_transaction
     begin
-      rep_run = ReplicationRun.new(session)
+      rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
 
-      left_change = LoggedChange.new session, :left
+      left_change = LoggedChange.new LoggedChangeLoader.new(session, :left)
       left_change.table = 'left_table'
       left_change.key = {'id' => '1'}
-      right_change = LoggedChange.new session, :right
+      right_change = LoggedChange.new LoggedChangeLoader.new(session, :right)
       right_change.table = 'right_table'
       right_change.key = {'id' => '1'}
 
@@ -420,11 +430,11 @@ describe Replicators::TwoWayReplicator do
       }
 
 
-      rep_run = ReplicationRun.new session
+      rep_run = ReplicationRun.new session, TaskSweeper.new(1)
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       session.right.insert_record 'extender_no_record', {
@@ -467,11 +477,11 @@ describe Replicators::TwoWayReplicator do
         'change_time' => Time.now
       }
 
-      rep_run = ReplicationRun.new session
+      rep_run = ReplicationRun.new session, TaskSweeper.new(1)
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       session.left.insert_record 'rr_pending_changes', {
@@ -490,7 +500,7 @@ describe Replicators::TwoWayReplicator do
   end
 
   it "replicate_difference should raise Exception if all replication attempts have been exceeded" do
-    rep_run = ReplicationRun.new Session.new
+    rep_run = ReplicationRun.new Session.new, TaskSweeper.new(1)
     helper = ReplicationHelper.new(rep_run)
     replicator = Replicators::TwoWayReplicator.new(helper)
     lambda {replicator.replicate_difference :dummy_diff, 0}.
@@ -513,11 +523,11 @@ describe Replicators::TwoWayReplicator do
         'change_time' => Time.now
       }
 
-      rep_run = ReplicationRun.new session
+      rep_run = ReplicationRun.new session, TaskSweeper.new(1)
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       lambda {replicator.replicate_difference diff, 1}.should raise_error(/duplicate/i)
@@ -557,11 +567,11 @@ describe Replicators::TwoWayReplicator do
         'change_time' => Time.now
       }
 
-      rep_run = ReplicationRun.new session
+      rep_run = ReplicationRun.new session, TaskSweeper.new(1)
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       lambda {replicator.replicate_difference diff, 1}.should raise_error(/referencing_table_fkey/)
@@ -607,11 +617,11 @@ describe Replicators::TwoWayReplicator do
         'change_time' => Time.now
       }
 
-      rep_run = ReplicationRun.new session
+      rep_run = ReplicationRun.new session, TaskSweeper.new(1)
       helper = ReplicationHelper.new(rep_run)
       replicator = Replicators::TwoWayReplicator.new(helper)
 
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       session.left.delete_record 'extender_no_record', {'id' => '2'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyrep
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Arndt Lehmann
@@ -30,7 +30,7 @@ cert_chain:
   NwT26VZnE2nr8g==
   -----END CERTIFICATE-----
 
-date: 2009-07-03 00:00:00 +09:00
+date: 2009-07-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,8 @@ files:
 - lib/rubyrep/initializer.rb
 - lib/rubyrep/log_helper.rb
 - lib/rubyrep/logged_change.rb
+- lib/rubyrep/logged_change_loader.rb
+- lib/rubyrep/noisy_connection.rb
 - lib/rubyrep/proxied_table_scan.rb
 - lib/rubyrep/proxy_block_cursor.rb
 - lib/rubyrep/proxy_connection.rb
@@ -137,6 +139,7 @@ files:
 - lib/rubyrep/table_sorter.rb
 - lib/rubyrep/table_spec_resolver.rb
 - lib/rubyrep/table_sync.rb
+- lib/rubyrep/task_sweeper.rb
 - lib/rubyrep/trigger_mode_switcher.rb
 - lib/rubyrep/type_casting_cursor.rb
 - lib/rubyrep/uninstall_runner.rb
@@ -166,7 +169,9 @@ files:
 - spec/generate_runner_spec.rb
 - spec/initializer_spec.rb
 - spec/log_helper_spec.rb
+- spec/logged_change_loader_spec.rb
 - spec/logged_change_spec.rb
+- spec/noisy_connection_spec.rb
 - spec/postgresql_replication_spec.rb
 - spec/postgresql_schema_support_spec.rb
 - spec/postgresql_support_spec.rb
@@ -203,6 +208,7 @@ files:
 - spec/table_sorter_spec.rb
 - spec/table_spec_resolver_spec.rb
 - spec/table_sync_spec.rb
+- spec/task_sweeper_spec.rb
 - spec/trigger_mode_switcher_spec.rb
 - spec/two_way_replicator_spec.rb
 - spec/two_way_syncer_spec.rb