rgossip2 0.1.5 → 0.1.6

data/lib/rgossip2/client.rb

@@ -133,7 +133,7 @@ module RGossip2
 
           node.start_timer if @running
 
-          callback(:add, address, nil, nil)
+          callback(:add, address, nil, nil, nil)
         }
       }
     end
@@ -155,7 +155,7 @@ module RGossip2
           node = @dead_list.delete(address)
           node.stop_timer if node
 
-          callback(:delete, address, nil, nil)
+          callback(:delete, address, nil, nil, nil)
         }
       }
     end

data/lib/rgossip2/context_helper.rb

@@ -18,9 +18,9 @@ module RGossip2
     end
 
     # 各種ハンドラプロキシメソッド
-    def callback(action, address, timestamp, data)
+    def callback(action, address, timestamp, data, old_data)
       if @context.callback_handler
-        __proc_yield_protect__(@context.callback_handler, action, address, timestamp, data)
+        __proc_yield_protect__(@context.callback_handler, action, address, timestamp, data, old_data)
       end
     end
 

data/lib/rgossip2/node.rb

@@ -51,7 +51,7 @@ module RGossip2
         }
 
         # 破棄時の処理をコールバック
-        callback(:delete, @address, @timestamp, @data)
+        callback(:delete, @address, @timestamp, @data, @data)
       end
     end
 

data/lib/rgossip2/receiver.rb

@@ -111,10 +111,11 @@ module RGossip2
             #debug("The node was updated: address=#{address} timestamp=#{timestamp}")
 
             node.timestamp = timestamp
+            old_data = node.data
             node.data = data
             node.reset_timer
 
-            callback(:update, address, timestamp, data)
+            callback(:update, address, timestamp, data, old_data)
           end
         elsif (node = @dead_list.synchronize { @dead_list[address] })
           # デッドリストに見つかった場合
@@ -126,10 +127,16 @@ module RGossip2
               #debug("Node revived: address=#{address} timestamp=#{timestamp}")
 
               @dead_list.delete(address)
+
+              # データの更新を忘れずに
+              node.timestamp = timestamp
+              old_data = node.data
+              node.data = data
+
               @node_list[address] = node
               node.start_timer
 
-              callback(:comeback, address, timestamp, data)
+              callback(:comeback, address, timestamp, data, old_data)
             end
           }
         else
@@ -142,7 +149,7 @@ module RGossip2
           @node_list[address] = node
           node.start_timer
 
-          callback(:add, address, timestamp, data)
+          callback(:add, address, timestamp, data, data)
         end
       end
     end # merge_lists

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgossip2
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-13 00:00:00 Z
+date: 2011-11-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: msgpack