Merge pull request #6 from inhabitedtype/pending-bytes

Pending bytes

lib/faraday.ml

@@ -247,7 +247,7 @@ let schedule_gen t ~length ~to_buffer ?(off=0) ?len a =
     | None     -> length a - off
     | Some len -> len
   in
-  schedule_iovec t ~off ~len (to_buffer a)
+  if len > 0 then schedule_iovec t ~off ~len (to_buffer a)
 
 let schedule_string =
   let to_buffer a = `String a in
@@ -393,8 +393,11 @@ let close t =
 let is_closed t =
   t.closed
 
+let pending_bytes t =
+  (t.write_pos - t.scheduled_pos) + (t.bytes_received - t.bytes_written)
+
 let has_pending_output t =
-  not (Buffers.is_empty t.scheduled)
+  pending_bytes t <> 0
 
 let yield t =
   t.yield <- true

lib/faraday.mli

@@ -238,6 +238,10 @@ val has_pending_output : t -> bool
     be the case that [t]'s queued output is being serviced by some other thread
     of control, but has not yet completed. *)
 
+val pending_bytes : t -> int
+(** [pending_bytes t] is the size of the next write, in bytes, that [t] will
+    surface to the caller. *)
+
 
 (** {2 Running} *)
 

lib_test/test_faraday.ml

@@ -40,9 +40,9 @@ let empty =
       check ~iovecs:0 ~msg:"bigstring" [`Write_bigstring ""] ""
   end
   ; "schedule", `Quick, begin fun () ->
-      check ~iovecs:1 ~msg:"string"    [`Schedule_string    ""] "";
-      check ~iovecs:1 ~msg:"bytes"     [`Schedule_bytes     ""] "";
-      check ~iovecs:1 ~msg:"bigstring" [`Schedule_bigstring ""] ""
+      check ~iovecs:0 ~msg:"string"    [`Schedule_string    ""] "";
+      check ~iovecs:0 ~msg:"bytes"     [`Schedule_bytes     ""] "";
+      check ~iovecs:0 ~msg:"bigstring" [`Schedule_bigstring ""] ""
   end ]
 
 let write =