RingyDingy 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a70aaeac4ce0f4d9e3bddb018da38372ca5d0d
-  data.tar.gz: 373f70d3c2e3bb548fdf5cfd81e32f77e40aeb32
+  metadata.gz: d8a4f704ed23112e54c4597dc6473483d8bdeb72
+  data.tar.gz: d2af91f407e5a026730d3bb8ae185a5e35b86c29
 SHA512:
-  metadata.gz: 50ce6ae837b4dcde616b9c9d8dcf5376c01527a2a6300c9e6a7b2fa6b58e5787b4bbdf1aaa492fa5eec92d4f8562804b3af098dc7c8ff42d1470df7f323571a8
-  data.tar.gz: eaec7dfff951f1b88bcfa18445a5427394d130a3e7a12e314004426cf1c28090602a74016c73fc7473c65ee8ac3d10ce831a0c2ccb19533abfc95660e0aafeb0
+  metadata.gz: d41e38e6c7519babb2960609c132ce61473b8dbdaa8df4117a24d17af8d6b8ae4dfe7b9b75ebb6269a2a952ebb02472780125f7ff5806d1fa60f9443410df33d
+  data.tar.gz: c86b6c4b10165c1fb58835c5d8b3992ab08c03d675826bb5ee2ca18bae72b42e05351cc73ec46dc0b5319972b305d5792cf406005ad079b64b28e55b219a98b6

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.6 / 2013-06-05
+
+* RingyDingy.new now allows a Rinda::RingFinger or TupleSpace reference as the
+  last "lookup" parameter in addition to a list of broadcast addresses.
+
 === 1.5 / 2013-05-03
 
 * Added RingyDingy::Lookup to handle lookup of services.

data/lib/ringy_dingy.rb

@@ -22,7 +22,7 @@ class RingyDingy
   ##
   # The version of RingyDingy you are using
 
-  VERSION = '1.5'
+  VERSION = '1.6'
 
   ##
   # Interval to check the RingServer for our registration information.
@@ -65,9 +65,14 @@ class RingyDingy
   ##
   # Creates a new RingyDingy that registers +object+ as +service+ with
   # optional identifier +name+.
+  #
+  # The +lookup+ is used to locate a Rinda::RingServer.  It can be unspecified
+  # (to look for a ring server in the BROADCAST_LIST), an Array of host names
+  # or IP address strings, a Rinda::RingFinger or RingyDingy::Lookup using a
+  # specific broadcast list or a reference to a Rinda::TupleSpace.
 
   def initialize object, service = :RingyDingy, name = nil,
-                 broadcast_list = BROADCAST_LIST
+                 lookup = BROADCAST_LIST
     DRb.start_service unless DRb.primary_server
 
     @identifier = [Socket.gethostname.downcase, $PID, name].compact.join '_'
@@ -77,9 +82,20 @@ class RingyDingy
     @check_every = 15
     @renewer = Rinda::SimpleRenewer.new
 
-    @ring_finger = Rinda::RingFinger.new broadcast_list
+    @ring_finger = nil
     @ring_server = nil
 
+    case lookup
+    when Array then
+      @ring_finger = Rinda::RingFinger.new lookup
+    when Rinda::RingFinger then
+      @ring_finger = lookup
+    when RingyDingy::Lookup then
+      @ring_finger = lookup.ring_finger
+    else
+      @ring_server = lookup
+    end
+
     @thread = nil
   end
 

data/lib/ringy_dingy/lookup.rb

@@ -50,8 +50,6 @@ class RingyDingy::Lookup
 
   def enumerate_tuple_spaces
     Thread.start do
-      spaces = {}
-
       loop do
         @ring_finger.lookup_ring do |tuple_space|
           yield tuple_space
@@ -113,7 +111,7 @@ class RingyDingy::Lookup
           tuple = tuple_space.read template, renewer
 
           queue.push tuple[2]
-        rescue DRb::DRbConnError => e
+        rescue DRb::DRbConnError
         end
       end
     end

data/test/test_ringy_dingy.rb

@@ -89,6 +89,34 @@ class TestRingyDingy < Test::Unit::TestCase
     Rinda.const_set :RingFinger, orig_ring_finger
   end
 
+  def test_initialize_broadcast_list
+    service = RingyDingy.new @object, nil, 'blah', %w[192.0.2.1]
+
+    assert_equal %w[192.0.2.1], service.ring_finger.broadcast_list
+  end
+
+  def test_initialize_lookup
+    lookup = RingyDingy::Lookup.new %w[192.0.2.1]
+    service = RingyDingy.new @object, nil, 'blah', lookup
+
+    assert_same lookup.ring_finger, service.ring_finger
+  end
+
+  def test_initialize_ring_finger
+    ring_finger = Rinda::RingFinger.new %w[192.0.2.1]
+    service = RingyDingy.new @object, nil, 'blah', ring_finger
+
+    assert_same ring_finger, service.ring_finger
+  end
+
+  def test_initialize_tuple_space
+    tuple_space = Rinda::TupleSpace.new
+    service = RingyDingy.new @object, nil, 'blah', tuple_space
+
+    assert_nil               service.ring_finger
+    assert_same tuple_space, service.ring_server
+  end
+
   def test_identifier
     assert_equal @identifier, @ringy_dingy.identifier
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RingyDingy
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement