StompMq 0.3 → 0.4

data/lib/stompmq/connection.rb

@@ -14,13 +14,15 @@ module StompMq
     # Connect to a STOMP broker and log in.
     def initialize(opts = { :broker => 'localhost', :port => 61613, :username => nil, :passcode => nil })
       @buffer = ""
-      @broker   = opts[:broker]
-      @port     = opts[:port]
+      @broker   = opts[:broker]   || 'localhost'
+      @port     = opts[:port]     || 61613
       @username = opts[:username]
       @passcode = opts[:passcode]
       @sock = TCPSocket.new @broker, @port
       send_frame :connect, {:login => @username, :passcode => @passcode}
       frame = receive_frame(15)
+      # some brokers add a \n after null-terminators, including after CONNECTED frames.
+      @buffer = ""
       raise ProtocolSequenceViolation unless frame.cmd == 'CONNECTED'
       self
     end
@@ -56,20 +58,21 @@ module StompMq
     private
     
     # Transmit a standard STOMP frame.
-    def send_frame(function, header = {}, content = {})
+    def send_frame(function, header = {}, content = '')
       frame = "#{function.to_s.upcase}\n"
-      header['content-length'] = content.to_s.length
+      header['content-length'] = content.to_s.length if content.to_s.include?("\000")
       header.each do |key, val|
         frame += "#{key.to_s}:#{val.to_s}\n"
       end
       frame += "\n"
       frame += "#{content.to_s}\000"
-      @sock.puts(frame)
+      @sock.write(frame)
     end
     
     # Receive a standard STOMP frame.
     def receive_frame(timeout = nil)
-      frame = nil
+      frame = parse_frame
+      return frame unless 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
@@ -105,7 +108,7 @@ module StompMq
       # split the header text up into a proper hash
       header = {}
       header_text.split("\n").each do |keyval|
-        key,val = keyval.split(':')
+        key,val = keyval.split(':', 2)
         header[key] = val
       end
       
@@ -132,8 +135,6 @@ module StompMq
       return StompMq::Frame.new(cmd, header, content)
     end
     
-    def buffer=(buffer)
-      @buffer = buffer
-    end
+    attr_accessor :buffer
   end
 end

metadata

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