mqtt 0.0.9 → 0.1.0

data/lib/mqtt/patches/string_encoding.rb

@@ -0,0 +1,30 @@
+# Monkey patch to add stubbed string encoding functions to Ruby 1.8
+
+class String
+  def force_encoding(encoding)
+    @encoding = encoding
+    self
+  end
+
+  def encoding
+    @encoding ||= Encoding::ASCII_8BIT
+  end
+
+  def encode(encoding)
+    new = self.dup
+    new.force_encoding(encoding)
+  end
+end
+
+class Encoding
+  def initialize(name)
+    @name = name
+  end
+
+  def to_s
+    @name
+  end
+
+  UTF_8 = Encoding.new("UTF-8")
+  ASCII_8BIT = Encoding.new("ASCII-8BIT")
+end

data/lib/mqtt/version.rb

@@ -1,3 +1,3 @@
 module MQTT
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/mqtt_client_spec.rb

@@ -63,7 +63,7 @@ describe MQTT::Client do
     end
   end
 
-  describe "when calling the 'connect' method" do
+  describe "when calling the 'connect' method on a client" do
     before(:each) do
       TCPSocket.stub(:new).and_return(@socket)
       Thread.stub(:new)
@@ -160,6 +160,30 @@ describe MQTT::Client do
 
   end
 
+  describe "calling 'connect' on the class" do
+    before(:each) do
+      TCPSocket.stub(:new).and_return(@socket)
+      MQTT::Client.stub(:new).and_return(@client)
+      Thread.stub(:new)
+      @client.stub(:receive_connack)
+    end
+
+    it "should create a new client object" do
+      MQTT::Client.should_receive(:new).once
+      MQTT::Client.connect
+    end
+
+    it "should call connect new client object" do
+      @client.should_receive(:connect).once
+      MQTT::Client.connect
+    end
+
+    it "should return the new client object" do
+      client = MQTT::Client.connect
+      client.class.should == MQTT::Client
+    end
+  end
+
   describe "when calling the 'receive_connack' method" do
     before(:each) do
       @client.instance_variable_set(:@socket, @socket)
@@ -302,7 +326,7 @@ describe MQTT::Client do
       @socket.string.should == "\x82\x0e\x00\x01\x00\x03a/b\x00\x00\x03c/d\x01"
     end
   end
-  
+
   describe "when calling the 'queue_length' method" do
     it "should return 0 if there are no incoming messages waiting" do
       @client.queue_length.should == 0
@@ -320,7 +344,6 @@ describe MQTT::Client do
     end
   end
 
-  
   describe "when calling the 'queue_emtpy?' method" do
     it "should return return true if there no incoming messages waiting" do
       @client.queue_empty?.should be_true
@@ -351,6 +374,59 @@ describe MQTT::Client do
       payload.should == 'payload1'
       @client.queue_empty?.should be_true
     end
+
+    context "with a block" do
+      it "should successfull receive a more than 1 message" do
+        inject_packet(:topic => 'topic0', :payload => 'payload0')
+        inject_packet(:topic => 'topic1', :payload => 'payload1')
+        payloads = []
+        @client.get do |topic,payload|
+          payloads << payload
+          break if payloads.size > 1
+        end
+        payloads.size.should == 2
+        payloads.should == ['payload0', 'payload1']
+      end
+    end
+  end
+
+  describe "when calling the 'get_packet' method" do
+    before(:each) do
+      @client.instance_variable_set(:@socket, @socket)
+    end
+
+    it "should successfull receive a valid PUBLISH packet with a QoS 0" do
+      inject_packet(:topic => 'topic0', :payload => 'payload0', :qos => 0)
+      packet = @client.get_packet
+      packet.class.should == MQTT::Packet::Publish
+      packet.qos.should == 0
+      packet.topic.should == 'topic0'
+      packet.payload.should == 'payload0'
+    end
+
+    it "should successfull receive a valid PUBLISH packet with a QoS 1" do
+      inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
+      packet = @client.get_packet
+      packet.class.should == MQTT::Packet::Publish
+      packet.qos.should == 1
+      packet.topic.should == 'topic1'
+      packet.payload.should == 'payload1'
+      @client.queue_empty?.should be_true
+    end
+
+    context "with a block" do
+      it "should successfull receive a more than 1 packet" do
+        inject_packet(:topic => 'topic0', :payload => 'payload0')
+        inject_packet(:topic => 'topic1', :payload => 'payload1')
+        packets = []
+        @client.get_packet do |packet|
+          packets << packet
+          break if packets.size > 1
+        end
+        packets.size.should == 2
+        packets.map{|p| p.payload}.should == ['payload0', 'payload1']
+      end
+    end
   end
 
   describe "when calling the 'unsubscribe' method" do

data/spec/mqtt_packet_spec.rb

@@ -1,3 +1,6 @@
+# encoding: BINARY
+# Encoding is set to binary, so that the binary packets aren't validated as UTF-8
+
 $:.unshift(File.dirname(__FILE__))
 
 require 'spec_helper'
@@ -20,6 +23,27 @@ describe MQTT::Packet do
       packet = MQTT::Packet.new( :retain => true )
       packet.retain.should be_true
     end
+
+    it "should have a custom inspect method" do
+      packet = MQTT::Packet.new
+      packet.inspect.should == '#<MQTT::Packet>'
+    end
+
+    it "should throw an exception the QoS is greater than 2" do
+      lambda {
+        packet = MQTT::Packet.new( :qos => 3 )
+      }.should raise_error(
+        'Invalid QoS value: 3'
+      )
+    end
+
+    it "should throw an exception the QoS is less than 0" do
+      lambda {
+        packet = MQTT::Packet.new( :qos => -1 )
+      }.should raise_error(
+        'Invalid QoS value: -1'
+      )
+    end
   end
 
   describe "when setting packet parameters" do
@@ -76,11 +100,13 @@ describe MQTT::Packet do
     it "should provide a add_short method to get a big-endian unsigned 16-bit integer" do
       data = @packet.send(:encode_short, 1024)
       data.should == "\x04\x00"
+      data.encoding.to_s.should == "ASCII-8BIT"
     end
 
     it "should provide a add_string method to get a string preceeded by its length" do
       data = @packet.send(:encode_string, 'quack')
       data.should == "\x00\x05quack"
+      data.encoding.to_s.should == "ASCII-8BIT"
     end
 
     it "should provide a shift_short method to get a 16-bit unsigned integer" do
@@ -125,6 +151,16 @@ describe MQTT::Packet::Publish do
       packet.to_s.should == "\x3C\x12\x00\x03c/d\x00\x05hello world"
     end
 
+    it "should output a string as binary / 8-bit ASCII" do
+      packet = MQTT::Packet::Publish.new( :topic => 'test', :payload => 'hello world' )
+      packet.to_s.encoding.to_s.should == "ASCII-8BIT"
+    end
+
+    it "should support passing in non-strings to the topic and payload" do
+      packet = MQTT::Packet::Publish.new( :topic => :symbol, :payload => 1234 )
+      packet.to_s.should == "\x30\x0c\x00\x06symbol1234"
+    end
+
     it "should throw an exception when there is no topic name" do
       lambda {
         MQTT::Packet::Publish.new.to_s
@@ -132,6 +168,25 @@ describe MQTT::Packet::Publish do
         'Invalid topic name when serialising packet'
       )
     end
+
+    it "should throw an exception when there is an empty topic name" do
+      lambda {
+        MQTT::Packet::Publish.new( :topic => '' ).to_s
+      }.should raise_error(
+        'Invalid topic name when serialising packet'
+      )
+    end
+  end
+
+  describe "when serialising an oversized packet" do
+    it "should throw an exception when body is bigger than 256MB" do
+      lambda {
+        packet = MQTT::Packet::Publish.new( :topic => 'test', :payload => 'x'*268435455 )
+        packet.to_s
+      }.should raise_error(
+        'Error serialising packet: body is more than 256MB'
+      )
+    end
   end
 
   describe "when parsing a packet with QOS 0" do
@@ -157,10 +212,12 @@ describe MQTT::Packet::Publish do
 
     it "should set the topic name correctly" do
       @packet.topic.should == 'test'
+      @packet.topic.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the payload correctly" do
       @packet.payload.should == 'hello world'
+      @packet.payload.encoding.to_s.should == 'ASCII-8BIT'
     end
   end
 
@@ -187,10 +244,22 @@ describe MQTT::Packet::Publish do
 
     it "should set the topic name correctly" do
       @packet.topic.should == 'c/d'
+      @packet.topic.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the payload correctly" do
       @packet.payload.should == 'hello world'
+      @packet.payload.encoding.to_s.should == 'ASCII-8BIT'
+    end
+  end
+
+  describe "when parsing a packet with a invalid QoS value" do
+    it "should throw an exception" do
+      lambda {
+        packet = MQTT::Packet.parse( "\x36\x12\x00\x03a/b\x00\x05hello world" )
+      }.should raise_error(
+        'Invalid QoS value: 3'
+      )
     end
   end
 
@@ -211,7 +280,7 @@ describe MQTT::Packet::Publish do
     end
 
     it "should get the body length correctly" do
-      @packet.payload.size.should == 314
+      @packet.payload.bytesize.should == 314
     end
   end
 
@@ -233,10 +302,95 @@ describe MQTT::Packet::Publish do
     end
 
     it "should get the body length correctly" do
-      @packet.payload.size.should == 16384
+      @packet.payload.bytesize.should == 16384
+    end
+  end
+
+  describe "processing a packet containing UTF-8 character" do
+    before(:each) do
+      @packet = MQTT::Packet::Publish.new(
+        :topic => "Test ①".force_encoding("UTF-8"),
+        :payload => "Snowman: ☃".force_encoding("UTF-8")
+      )
+    end
+
+    it "should have the correct topic byte length" do
+      @packet.topic.bytesize.should == 8
+    end
+
+    it "should have the correct topic string length", :unless => RUBY_VERSION =~ /^1\.8/ do
+      # Ruby 1.8 doesn't support UTF-8 properly
+      @packet.topic.length.should == 6
+    end
+
+    it "should have the correct payload byte length" do
+      @packet.payload.bytesize.should == 12
+    end
+
+    it "should have the correct payload string length", :unless => RUBY_VERSION =~ /^1\.8/ do
+      # Ruby 1.8 doesn't support UTF-8 properly
+      @packet.payload.length.should == 10
+    end
+
+    it "should encode to MQTT packet correctly" do
+      @packet.to_s.should == "\x30\x16\x00\x08Test \xE2\x91\xA0Snowman: \xE2\x98\x83".force_encoding('BINARY')
+    end
+
+    it "should parse the serialised packet" do
+      packet2 = MQTT::Packet.parse( @packet.to_s )
+      packet2.topic.should == "Test ①".force_encoding('UTF-8')
+      packet2.payload.should == "Snowman: ☃".force_encoding('BINARY')
+    end
+  end
+
+  describe "reading a packet from a socket" do
+    before(:each) do
+      @socket = StringIO.new("\x30\x11\x00\x04testhello world")
+      @packet = MQTT::Packet.read(@socket)
+    end
+
+    it "should correctly create the right type of packet object" do
+      @packet.class.should == MQTT::Packet::Publish
+    end
+
+    it "should set the body length is read correctly" do
+      @packet.body_length.should == 17
+    end
+
+    it "should set the QOS level correctly" do
+      @packet.qos.should == 0
+    end
+
+    it "should set the RETAIN flag correctly" do
+      @packet.retain.should be_false
+    end
+
+    it "should set the DUP flag correctly" do
+      @packet.duplicate.should be_false
+    end
+
+    it "should set the topic name correctly" do
+      @packet.topic.should == 'test'
+      @packet.topic.encoding.to_s.should == 'UTF-8'
+    end
+
+    it "should set the payload correctly" do
+      @packet.payload.should == 'hello world'
+      @packet.payload.encoding.to_s.should == 'ASCII-8BIT'
     end
   end
 
+  describe "when calling the inspect method" do
+    it "should output the payload, if it is less than 16 bytes" do
+      packet = MQTT::Packet::Publish.new( :topic => "topic", :payload => "payload" )
+      packet.inspect.should == "#<MQTT::Packet::Publish: d0, q0, r0, m0, 'topic', 'payload'>"
+    end
+
+    it "should output the length of the payload, if it is more than 16 bytes" do
+      packet = MQTT::Packet::Publish.new( :topic => "topic", :payload => 'x'*32 )
+      packet.inspect.should == "#<MQTT::Packet::Publish: d0, q0, r0, m0, 'topic', ... (32 bytes)>"
+    end
+  end
 end
 
 describe MQTT::Packet::Connect do
@@ -262,6 +416,14 @@ describe MQTT::Packet::Connect do
       )
     end
 
+    it "should throw an exception if the keep alive value is less than 0" do
+      lambda {
+        MQTT::Packet::Connect.new(:client_id => 'test', :keep_alive => -2).to_s
+      }.should raise_error(
+        'Invalid keep-alive value: cannot be less than 0'
+      )
+    end
+
     it "should output the correct bytes for a packet with a Will" do
       packet = MQTT::Packet::Connect.new(
         :client_id => 'myclient',
@@ -337,6 +499,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Protocol Name of the packet correctly" do
       @packet.protocol_name.should == 'MQIsdp'
+      @packet.protocol_name.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Protocol Version of the packet correctly" do
@@ -345,6 +508,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Client Identifier of the packet correctly" do
       @packet.client_id.should == 'myclient'
+      @packet.client_id.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Keep Alive timer of the packet correctly" do
@@ -393,6 +557,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Protocol Name of the packet correctly" do
       @packet.protocol_name.should == 'MQIsdp'
+      @packet.protocol_name.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Protocol Version of the packet correctly" do
@@ -401,6 +566,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Client Identifier of the packet correctly" do
       @packet.client_id.should == 'myclient'
+      @packet.client_id.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the clean session flag should be set" do
@@ -417,10 +583,12 @@ describe MQTT::Packet::Connect do
 
     it "should set the Will topic of the packet correctly" do
       @packet.will_topic.should == 'topic'
+      @packet.will_topic.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Will payload of the packet correctly" do
       @packet.will_payload.should == 'hello'
+      @packet.will_payload.encoding.to_s.should == 'UTF-8'
     end
   end
 
@@ -446,6 +614,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Protocol Name of the packet correctly" do
       @packet.protocol_name.should == 'MQIsdp'
+      @packet.protocol_name.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Protocol Version of the packet correctly" do
@@ -454,7 +623,8 @@ describe MQTT::Packet::Connect do
 
     it "should set the Client Identifier of the packet correctly" do
       @packet.client_id.should == 'myclient'
-    end
+      @packet.client_id.encoding.to_s.should == 'UTF-8'
+   end
 
     it "should set the Keep Alive Timer of the packet correctly" do
       @packet.keep_alive.should == 10
@@ -462,10 +632,12 @@ describe MQTT::Packet::Connect do
 
     it "should set the Username of the packet correctly" do
       @packet.username.should == 'username'
+      @packet.username.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Username of the packet correctly" do
       @packet.password.should == 'password'
+      @packet.password.encoding.to_s.should == 'UTF-8'
     end
   end
 
@@ -478,6 +650,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Username of the packet correctly" do
       @packet.username.should == 'username'
+      @packet.username.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Username of the packet correctly" do
@@ -498,6 +671,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Username of the packet correctly" do
       @packet.password.should == 'password'
+      @packet.password.encoding.to_s.should == 'UTF-8'
     end
   end
 
@@ -542,6 +716,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Protocol Name of the packet correctly" do
       @packet.protocol_name.should == 'MQIsdp'
+      @packet.protocol_name.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Protocol Version of the packet correctly" do
@@ -554,6 +729,7 @@ describe MQTT::Packet::Connect do
 
     it "should set the Client Identifier of the packet correctly" do
       @packet.client_id.should == '12345678901234567890123'
+      @packet.client_id.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Will QoS of the packet correctly" do
@@ -566,21 +742,67 @@ describe MQTT::Packet::Connect do
 
     it "should set the Will topic of the packet correctly" do
       @packet.will_topic.should == 'will_topic'
+      @packet.will_topic.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Will payload of the packet correctly" do
       @packet.will_payload.should == 'will_message'
+      @packet.will_payload.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Username of the packet correctly" do
       @packet.username.should == 'user0123456789'
+      @packet.username.encoding.to_s.should == 'UTF-8'
     end
 
     it "should set the Username of the packet correctly" do
       @packet.password.should == 'pass0123456789'
+      @packet.password.encoding.to_s.should == 'UTF-8'
+    end
+  end
+
+  describe "when parsing packet with an unknown protocol name" do
+    it "should throw a protocol exception" do
+      lambda {
+        packet = MQTT::Packet.parse(
+          "\x10\x16\x00\x06FooBar\x03\x00\x00\x0a\x00\x08myclient"
+        )
+      }.should raise_error(
+        MQTT::ProtocolException,
+        "Unsupported protocol name: FooBar"
+      )
     end
   end
 
+  describe "when parsing packet with an unknown protocol version" do
+    it "should throw a protocol exception" do
+      lambda {
+        packet = MQTT::Packet.parse(
+          "\x10\x16\x00\x06MQIsdp\x02\x00\x00\x0a\x00\x08myclient"
+        )
+      }.should raise_error(
+        MQTT::ProtocolException,
+        "Unsupported protocol version: 2"
+      )
+    end
+  end
+
+  describe "when calling the inspect method" do
+    it "should output correct string for the default options" do
+      packet = MQTT::Packet::Connect.new
+      packet.inspect.should == "#<MQTT::Packet::Connect: keep_alive=15, clean, client_id=''>"
+    end
+
+    it "should output correct string when parameters are given" do
+      packet = MQTT::Packet::Connect.new(
+        :keep_alive => 10,
+        :client_id => 'c123',
+        :clean_session => false,
+        :username => 'foo'
+      )
+      packet.inspect.should == "#<MQTT::Packet::Connect: keep_alive=10, client_id='c123', username='foo'>"
+    end
+  end
 end
 
 describe MQTT::Packet::Connack do
@@ -731,6 +953,17 @@ describe MQTT::Packet::Connack do
       )
     end
   end
+
+  describe "when calling the inspect method" do
+    it "should output the right string when the return code is 0" do
+      packet = MQTT::Packet::Connack.new( :return_code => 0x00 )
+      packet.inspect.should == "#<MQTT::Packet::Connack: 0x00>"
+    end
+    it "should output the right string when the return code is 0x0F" do
+      packet = MQTT::Packet::Connack.new( :return_code => 0x0F )
+      packet.inspect.should == "#<MQTT::Packet::Connack: 0x0F>"
+    end
+  end
 end
 
 describe MQTT::Packet::Puback do
@@ -765,6 +998,11 @@ describe MQTT::Packet::Puback do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Puback.new( :message_id => 0x1234 )
+    packet.inspect.should == "#<MQTT::Packet::Puback: 0x1234>"
+  end
 end
 
 describe MQTT::Packet::Pubrec do
@@ -799,6 +1037,11 @@ describe MQTT::Packet::Pubrec do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Pubrec.new( :message_id => 0x1234 )
+    packet.inspect.should == "#<MQTT::Packet::Pubrec: 0x1234>"
+  end
 end
 
 describe MQTT::Packet::Pubrel do
@@ -833,6 +1076,11 @@ describe MQTT::Packet::Pubrel do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Pubrel.new( :message_id => 0x1234 )
+    packet.inspect.should == "#<MQTT::Packet::Pubrel: 0x1234>"
+  end
 end
 
 describe MQTT::Packet::Pubcomp do
@@ -867,6 +1115,11 @@ describe MQTT::Packet::Pubcomp do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Pubcomp.new( :message_id => 0x1234 )
+    packet.inspect.should == "#<MQTT::Packet::Pubcomp: 0x1234>"
+  end
 end
 
 describe MQTT::Packet::Subscribe do
@@ -972,6 +1225,18 @@ describe MQTT::Packet::Subscribe do
       @packet.topics.should == [['a/b',0],['c/d',1]]
     end
   end
+
+  describe "when calling the inspect method" do
+    it "should output correct string for a single topic" do
+      packet = MQTT::Packet::Subscribe.new(:topics => 'test')
+      packet.inspect.should == "#<MQTT::Packet::Subscribe: 0x00, 'test':0>"
+    end
+
+    it "should output correct string for multiple topics" do
+      packet = MQTT::Packet::Subscribe.new(:topics => {'a' => 1, 'b' => 0, 'c' => 2})
+      packet.inspect.should == "#<MQTT::Packet::Subscribe: 0x00, 'a':1, 'b':0, 'c':2>"
+    end
+  end
 end
 
 describe MQTT::Packet::Suback do
@@ -1038,6 +1303,18 @@ describe MQTT::Packet::Suback do
       @packet.granted_qos.should == [1,1]
     end
   end
+
+  describe "when calling the inspect method" do
+    it "should output correct string for a single granted qos" do
+      packet = MQTT::Packet::Suback.new(:message_id => 0x1234, :granted_qos => 0)
+      packet.inspect.should == "#<MQTT::Packet::Suback: 0x1234, qos=0>"
+    end
+
+    it "should output correct string for multiple topics" do
+      packet = MQTT::Packet::Suback.new(:message_id => 0x1235, :granted_qos => [0,1,2])
+      packet.inspect.should == "#<MQTT::Packet::Suback: 0x1235, qos=0,1,2>"
+    end
+  end
 end
 
 describe MQTT::Packet::Unsubscribe do
@@ -1078,6 +1355,18 @@ describe MQTT::Packet::Unsubscribe do
       @packet.topics.should == ['a/b','c/d']
     end
   end
+
+  describe "when calling the inspect method" do
+    it "should output correct string for a single topic" do
+      packet = MQTT::Packet::Unsubscribe.new(:topics => 'test')
+      packet.inspect.should == "#<MQTT::Packet::Unsubscribe: 0x00, 'test'>"
+    end
+
+    it "should output correct string for multiple topics" do
+      packet = MQTT::Packet::Unsubscribe.new(:message_id => 42, :topics => ['a', 'b', 'c'])
+      packet.inspect.should == "#<MQTT::Packet::Unsubscribe: 0x2A, 'a', 'b', 'c'>"
+    end
+  end
 end
 
 describe MQTT::Packet::Unsuback do
@@ -1112,6 +1401,11 @@ describe MQTT::Packet::Unsuback do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Unsuback.new( :message_id => 0x1234 )
+    packet.inspect.should == "#<MQTT::Packet::Unsuback: 0x1234>"
+  end
 end
 
 describe MQTT::Packet::Pingreq do
@@ -1136,6 +1430,11 @@ describe MQTT::Packet::Pingreq do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Pingreq.new
+    packet.inspect.should == "#<MQTT::Packet::Pingreq>"
+  end
 end
 
 describe MQTT::Packet::Pingresp do
@@ -1160,6 +1459,11 @@ describe MQTT::Packet::Pingresp do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Pingresp.new
+    packet.inspect.should == "#<MQTT::Packet::Pingresp>"
+  end
 end
 
 
@@ -1185,6 +1489,11 @@ describe MQTT::Packet::Disconnect do
       )
     end
   end
+
+  it "should output the right string when calling inspect" do
+    packet = MQTT::Packet::Disconnect.new
+    packet.inspect.should == "#<MQTT::Packet::Disconnect>"
+  end
 end
 
 
@@ -1201,24 +1510,60 @@ describe "Serialising an invalid packet" do
   end
 end
 
-describe "Reading in an invalid packet" do 
+describe "Reading in an invalid packet from a socket" do
   context "that has 0 length" do
     it "should throw an exception" do
       lambda {
-        data = StringIO.new
-        MQTT::Packet.read(data)
+        socket = StringIO.new
+        MQTT::Packet.read(socket)
+      }.should raise_error(
+        MQTT::ProtocolException,
+        "Failed to read byte from socket"
+      )
+    end
+  end
+
+  context "that has an incomplete packet length header" do
+    it "should throw an exception" do
+      lambda {
+        socket = StringIO.new("\x30\xFF")
+        MQTT::Packet.read(socket)
+      }.should raise_error(
+        MQTT::ProtocolException,
+        "Failed to read byte from socket"
+      )
+    end
+  end
+
+  context "that has the maximum number of bytes in the length header" do
+    it "should throw an exception" do
+      lambda {
+        socket = StringIO.new("\x30\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF")
+        MQTT::Packet.read(socket)
       }.should raise_error(
-        MQTT::ProtocolException
+        MQTT::ProtocolException,
+        "Failed to parse packet - input buffer (4) is not the same as the body length header (268435455)"
       )
     end
   end
 end
 
 describe "Parsing an invalid packet" do
+  context "that has no length" do
+    it "should throw an exception" do
+      lambda {
+        MQTT::Packet.parse( "" )
+      }.should raise_error(
+        MQTT::ProtocolException,
+        "Invalid packet: less than 2 bytes long"
+      )
+    end
+  end
+
   context "that has an invalid type identifier" do
     it "should throw an exception" do
       lambda {
-        MQTT::Packet.parse( "\x00" )
+        MQTT::Packet.parse( "\x00\x00" )
       }.should raise_error(
         MQTT::ProtocolException,
         "Invalid packet type identifier: 0"
@@ -1237,13 +1582,24 @@ describe "Parsing an invalid packet" do
     end
   end
 
+  context "that has too many bytes in the length field" do
+    it "should throw an exception" do
+      lambda {
+        MQTT::Packet.parse( "\x30\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" )
+      }.should raise_error(
+        MQTT::ProtocolException,
+        'Failed to parse packet - input buffer (4) is not the same as the body length header (268435455)'
+      )
+    end
+  end
+
   context "that has a bigger buffer than expected" do
     it "should throw an exception" do
       lambda {
         MQTT::Packet.parse( "\x30\x11\x00\x04testhello big world" )
       }.should raise_error(
         MQTT::ProtocolException,
-        "Failed to parse packet - input buffer (21) is not the same as the body length buffer (17)"
+        "Failed to parse packet - input buffer (21) is not the same as the body length header (17)"
       )
     end
   end
@@ -1254,7 +1610,7 @@ describe "Parsing an invalid packet" do
         MQTT::Packet.parse( "\x30\x11\x00\x04testhello" )
       }.should raise_error(
         MQTT::ProtocolException,
-        "Failed to parse packet - input buffer (11) is not the same as the body length buffer (17)"
+        "Failed to parse packet - input buffer (11) is not the same as the body length header (17)"
       )
     end
   end