fraggle 0.3.2 → 0.3.3

data/lib/fraggle.rb

@@ -1,7 +1,10 @@
+require 'fraggle/errors'
+require 'fraggle/logger'
 require 'fraggle/snap'
 require 'uri'
 
 module Fraggle
+  extend Logger
 
   def self.connect(uri, *args)
     params = uri.gsub(/^doozer:\?/, '').split("&")
@@ -23,4 +26,27 @@ module Fraggle
     Snap.new(0, c)
   end
 
+  def self.addrs_for(uri)
+    params = uri.gsub(/^doozer:\?/, '').split("&")
+    addrs  = []
+
+    params.each do |param|
+      k, v = param.split("=")
+      if k == "ca"
+        # Perform a liberal validation to weed out most mistakes
+        if v =~ /^[\d\w\-.]+:\d+$/
+          addrs << v
+        else
+          warn "invalid addr (#{v}) in #{uri}"
+        end
+      end
+    end
+
+    if addrs.empty?
+      raise NoAddrs
+    end
+
+    addrs
+  end
+
 end

data/lib/fraggle/client.rb

@@ -1,3 +1,4 @@
+require 'fraggle/errors'
 require 'fraggle/logger'
 require 'fraggle/meta'
 require 'fraggle/protocol'
@@ -65,13 +66,13 @@ module Fraggle
     end
 
     def session(prefix=nil, &blk)
-      name    = genkey(prefix)
+      name    = "#{prefix}#{genkey}"
       estab   = false
 
       f = Proc.new do |e|
         # If this is the first response from the server, it's go-time.
         if ! estab
-          blk.call
+          blk.call(name)
         end
 
         # We've successfully established a session.  Say so.
@@ -315,7 +316,7 @@ module Fraggle
 
       if ! @addr
         # We are all out of addresses to try
-        raise "No more doozers!"
+        raise NoAddrs
       end
 
       host, port = @addr.split(":")
@@ -332,9 +333,8 @@ module Fraggle
       end
     end
 
-    def genkey(prefix=nil)
-      postfix = (0...16).map { Nibbles[rand(Nibbles.length)].chr }.join
-      prefix ? prefix+"."+postfix : postfix
+    def genkey
+      (0...16).map { Nibbles[rand(Nibbles.length)].chr }.join
     end
 
   end

data/lib/fraggle/emitter.rb

@@ -21,6 +21,16 @@ module Fraggle
       callbacks[name] = blk
     end
 
+    def aggr(coll=[], &blk)
+      valid do |item|
+        coll << item
+      end
+
+      done do
+        blk.call(coll)
+      end
+    end
+
   end
 
 end

data/lib/fraggle/errors.rb

@@ -0,0 +1,3 @@
+module Fraggle
+  class NoAddrs < StandardError ; end
+end

data/lib/fraggle/logger.rb

@@ -3,14 +3,16 @@ module Fraggle
 
     DEBUG = 0
     INFO  = 1
-    ERROR = 2
+    WARN  = 2
+    ERROR = 3
 
-    attr_accessor :writer, :level
+    attr_writer :writer, :level
 
     def log(lv, msg)
       label = case lv
       when DEBUG then "debug "
       when INFO  then "info  "
+      when WARN  then "warn  "
       when ERROR then "error "
       end
 
@@ -19,8 +21,12 @@ module Fraggle
       end
     end
 
+    def writer ; @writer ||= STDERR ; end
+    def level  ; @level ||= WARN   ; end
+
     def debug(msg) ; log(DEBUG, msg) ; end
     def info(msg)  ; log(INFO,  msg) ; end
+    def warn(msg)  ; log(WARN,  msg) ; end
     def error(msg) ; log(ERROR, msg) ; end
   end
 end

data/lib/fraggle/protocol.rb

@@ -38,10 +38,6 @@ module Fraggle
       send_data("#{head}#{data}")
     end
 
-    def send_data(data)
-      super(data)
-    end
-
   end
 
 end

data/lib/fraggle/snap.rb

@@ -35,6 +35,10 @@ module Fraggle
       end
     end
 
+    def delete(&blk)
+      @c.delsnap(@id, &blk)
+    end
+
     def method_missing(*args, &blk)
       @c.__send__(*args, &blk)
     end

data/test/fraggle_test.rb

@@ -0,0 +1,16 @@
+require 'fraggle'
+
+class FraggleTest < Test::Unit::TestCase
+  def test_addrs_for
+    uri   = "doozer:?ca=ec2-123:9999&ca=127.0.0.1:8888"
+    addrs = Fraggle.addrs_for(uri)
+    assert_equal ["ec2-123:9999", "127.0.0.1:8888"], addrs
+  end
+
+  def test_addrs_for_error
+    uri   = "doozer:?"
+    assert_raises Fraggle::NoAddrs do
+      Fraggle.addrs_for(uri)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - README.md
 - lib/fraggle/client.rb
 - lib/fraggle/emitter.rb
+- lib/fraggle/errors.rb
 - lib/fraggle/logger.rb
 - lib/fraggle/meta.rb
 - lib/fraggle/msg.rb
@@ -57,6 +58,7 @@ files:
 - test/fraggle_client_test.rb
 - test/fraggle_protocol_test.rb
 - test/fraggle_snap_test.rb
+- test/fraggle_test.rb
 has_rdoc: true
 homepage: http://github.com/bmizerany/fraggle
 licenses: []
@@ -96,3 +98,4 @@ test_files:
 - test/fraggle_client_test.rb
 - test/fraggle_protocol_test.rb
 - test/fraggle_snap_test.rb
+- test/fraggle_test.rb