StompMq 0.1 → 0.2

data/lib/stompmq/connection.rb

@@ -33,16 +33,16 @@ module StompMq
     
     # Send a STOMP message to a queue.
     def send_message(opts = { :queue => nil, :header => {}, :content => {} })
-      queue   = args[:queue]
-      content = args[:content]
-      header  = args[:header]
+      queue   = opts[:queue]
+      content = opts[:content]
+      header  = opts[:header]
       
       header = {:destination => queue}.merge(header)
       send_frame :send, header, content
     end
     
     # Receive a STOMP message.
-    def receive_message(timeout = 0)
+    def receive_message(timeout = nil)
       frame = receive_frame(timeout)
       return nil if !frame
       raise StompErrorReceived.new(frame.content) if frame.cmd == 'ERROR'
@@ -65,14 +65,19 @@ module StompMq
     end
     
     # Receive a standard STOMP frame.
-    def receive_frame(timeout = 0)
-      receive_data(timeout)
-      parse_frame
+    def receive_frame(timeout = nil)
+      frame = nil
+      # FIXME: we'll violate the timeout given if half a packet comes in at first, then more later.
+      until frame do
+        return nil if receive_data(timeout) == nil
+        frame = parse_frame
+      end
+      frame
     end
     
     # Receive data waiting on a socket.  If timeout is passed, block for this many seconds,
     # otherwise don't block, return nil if no frame is waiting.
-    def receive_data(timeout = 0)
+    def receive_data(timeout = nil)
       sock_ready = select([@sock], nil, nil, timeout)
       return nil if !sock_ready
       @buffer += @sock.recv(1024)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: StompMq
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Sarah Nordstrom
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -04:00
+date: 2008-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: []