fraggle 0.3.4 → 0.3.5

data/README.md

@@ -43,7 +43,7 @@
         e.set?       # => true
         e.del?       # => false
 
-        done_something_with(e)
+        do_something_with(e)
 
         # Phoney check for example
         if can_stop_watching?(path)

data/lib/fraggle.rb

@@ -6,10 +6,19 @@ require 'uri'
 module Fraggle
   extend Logger
 
-  def self.connect(uri, *args)
+  DefaultUri = "doozer:?"+
+    # Default host/port
+    "ca=127.0.0.1:8046&"+
+
+    # Default host + test-cluster ports
+    "ca=127.0.0.1:8041&"+
+    "ca=127.0.0.1:8042&"+
+    "ca=127.0.0.1:8043"
+
+  def self.connect(uri=ENV["DOOZER_URI"] || DefaultUri)
     addrs = addrs_for(uri)
     host, port = addrs.first.split(":")
-    c = EM.connect(host, port, Client, addrs, *args)
+    c = EM.connect(host, port, Client, addrs)
     Snap.new(0, c)
   end
 

data/lib/fraggle/client.rb

@@ -191,16 +191,18 @@ module Fraggle
     end
 
     def send(req, &blk)
-      tag = MinTag
+      if ! req.tag
+        tag = MinTag
 
-      while @cbx.has_key?(tag)
-        tag += 1
-        if tag > MaxTag
-          tag = MinTag
+        while @cbx.has_key?(tag)
+          tag += 1
+          if tag > MaxTag
+            tag = MinTag
+          end
         end
-      end
 
-      req.tag = tag
+        req.tag = tag
+      end
 
       if blk
         req.valid(&blk)
@@ -208,7 +210,7 @@ module Fraggle
 
       # Setup a default error handler that gives useful information
       req.error do |e|
-        raise Error.new("'error (%d) (%s)' for: %s" % [
+        warn("'error (%d) (%s)' for: %s" % [
           e.err_code,
           e.err_detail.inspect,
           req.inspect
@@ -246,13 +248,17 @@ module Fraggle
 
       @last_received = Time.now
 
+      # We've been connected to a new server.  Notify all requests.
+      @cbx.values.each do |req|
+        req.emit(:again, req)
+      end
+
       EM.add_periodic_timer(2) do
         if (n = Time.now - last_received) >= 3
           error("timeout talking to #{@addr}")
           close_connection
         else
-          debug("ping")
-          get(0, "/ping") { debug("pong") }
+          get(0, "/ping")
         end
       end
 
@@ -294,7 +300,7 @@ module Fraggle
 
     # What happens when a connection is closed for any reason.
     def unbind
-      error "disconnected from #{@addr}"
+      warn "disconnected from #{@addr}"
 
       # Shun the address we were currently attempting/connected to.
       @shun[@addr] = Time.now

data/lib/fraggle/emitter.rb

@@ -13,12 +13,15 @@ module Fraggle
     def valid(&blk) ; must_callback!(:valid, blk) ; end
     def done(&blk)  ; must_callback!(:done,  blk) ; end
     def error(&blk) ; must_callback!(:error, blk) ; end
+    def again(&blk) ; must_callback!(:again, blk) ; end
 
     def must_callback!(name, blk)
       if ! blk
         raise ArgumentError, "no block given to `#{name}`"
       end
       callbacks[name] = blk
+
+      self
     end
 
     def aggr(coll=[], &blk)

data/lib/fraggle/snap.rb

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

data/test/fraggle_client_test.rb

@@ -46,18 +46,6 @@ class FraggleClientTest < Test::Unit::TestCase
     assert_equal 1, blk.length
   end
 
-  def test_default_error
-    req = c.send(Fraggle::Request.new)
-
-    assert_raises Fraggle::Client::Error do
-      reply(req.tag, :err_code => E::OTHER, :err_detail => "boom!")
-    end
-
-    assert_nothing_raised do
-      reply(req.tag, :err_code => E::OTHER, :err_detail => "boom!")
-    end
-  end
-
   def test_error
     req = c.send(Fraggle::Request.new)
     req.error(&blk)
@@ -78,6 +66,12 @@ class FraggleClientTest < Test::Unit::TestCase
     assert_equal t+4, c.noop.tag
   end
 
+  def test_no_tag_if_tag
+    req = Fraggle::Request.new :tag => 99
+    c.send(req)
+    assert_sent 99
+  end
+
   # CHECKIN cas, path         => cas
   def test_checkin
     req = c.checkin("abc123", 123, &blk)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fraggle
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -21,9 +22,11 @@ dependencies:
   name: beefcake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
@@ -74,23 +77,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: fraggle
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 2
 summary: A Ruby/EventMachine Client for Doozer