fraggle 0.2.2 → 0.3.0

data/lib/fraggle.rb

@@ -4,8 +4,22 @@ require 'uri'
 module Fraggle
 
   def self.connect(uri, *args)
-    uri = URI(uri)
-    c = EM.connect(uri.host, uri.port, Client, uri, *args)
+    params = uri.gsub(/^doozer:\?/, '').split("&")
+    addrs  = []
+
+    params.each do |param|
+      k, v = param.split("=")
+      if k == "ca" && v =~ /^[\d.]+:\d+$/
+        addrs << v
+      end
+    end
+
+    if addrs.empty?
+      fail "The URI (#{uri}) does not contain valid addresses"
+    end
+
+    host, port = addrs.first.split(":")
+    c = EM.connect(host, port, Client, addrs, *args)
     Snap.new(0, c)
   end
 

data/lib/fraggle/client.rb

@@ -3,6 +3,7 @@ require 'fraggle/meta'
 require 'fraggle/protocol'
 require 'fraggle/request'
 require 'fraggle/response'
+require 'set'
 require 'uri'
 
 module Fraggle
@@ -18,12 +19,9 @@ module Fraggle
     MaxTag = (1<<32)
 
 
-    def initialize(uri)
-      # Simplied for now.  Later we'll take a real uri
-      # and disect it to init the addrs list
-      uri = URI(uri.to_s)
-
-      @addr  = [uri.host, uri.port] * ":"
+    def initialize(addrs)
+      @addr  = addrs.shift
+      @init  = addrs
       @addrs = {}
       @shun  = {}
       @cbx   = {}
@@ -259,8 +257,8 @@ module Fraggle
       end
 
       waw = Proc.new do |e|
-        if e.value == ""
-          addr = @addrs.delete(e.path)
+        if e.value != ""
+          addr = @addrs.delete(e.value)
           if addr
             error "noticed #{addr} is gone; removing"
           end
@@ -283,8 +281,15 @@ module Fraggle
         end
       end
 
-      watch    "/doozer/slot/*", &waw
-      walk  0, "/doozer/slot/*", &waw
+      watch("/doozer/slot/*", &waw)
+
+      w = walk(0, "/doozer/slot/*", &waw)
+      w.done do
+        # We have the best known addrs;  We can clear the initial
+        # ones given at inception.
+        debug "addrs list complete; clearing init addrs"
+        @init.clear
+      end
     end
 
     # What happens when a connection is closed for any reason.
@@ -300,7 +305,14 @@ module Fraggle
       # has been complete, we'll start the timer again.
       EM.cancel_timer(@timer)
 
-      _, @addr = @addrs.shift rescue nil
+      # Attempt to use an addr given to us by a Doozer
+      _, @addr = @addrs.shift
+
+      if ! @addr
+        # As a last resort, try one of the addresses given
+        # at inception.
+        @addr = @init.shift
+      end
 
       if ! @addr
         # We are all out of addresses to try

data/test/fraggle_client_test.rb

@@ -8,7 +8,7 @@ class FraggleClientTest < Test::Unit::TestCase
   attr_reader :c, :blk
 
   def setup
-    @c   = TestClient.new("doozer://127.0.0.1:8046")
+    @c   = TestClient.new("doozer:?ca=127.0.0.1:8046")
     @blk = Blk.new
   end
 

data/test/fraggle_protocol_test.rb

@@ -82,7 +82,7 @@ class FraggleProtocolTest < Test::Unit::TestCase
 
       def initialize
         @data = ""
-        super("doozer://127.0.0.1:8046")
+        super("doozer:?ca=127.0.0.1:8046")
       end
 
       def send_data(data)

data/test/fraggle_snap_test.rb

@@ -7,7 +7,7 @@ class FraggleSnapTest < Test::Unit::TestCase
   attr_reader :c, :blk
 
   def setup
-    cl   = TestClient.new("doozer://127.0.0.1:8046")
+    cl   = TestClient.new("doozer:?ca=127.0.0.1:8046")
     @c   = Fraggle::Snap.new(1, cl)
     @blk = Blk.new
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Mizerany