mqtt 0.3.1 → 0.4.0

data/lib/mqtt/version.rb

@@ -1,4 +1,4 @@
 module MQTT
   # The version number of the MQTT gem
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/mqtt_client_spec.rb

@@ -168,6 +168,14 @@ describe MQTT::Client do
     end
   end
 
+  describe "setting a client certificate directly" do
+    it "should add a certificate to the SSL context" do
+      expect(client.ssl_context.cert).to be_nil
+      client.cert = File.read(fixture_path('client.pem'))
+      expect(client.ssl_context.cert).to be_a(OpenSSL::X509::Certificate)
+    end
+  end
+    
   describe "setting a client private key file path" do
     it "should add a certificate to the SSL context" do
       expect(client.ssl_context.key).to be_nil
@@ -176,6 +184,34 @@ describe MQTT::Client do
     end
   end
 
+  describe "setting a client private key directly" do
+    it "should add a certificate to the SSL context" do
+      expect(client.ssl_context.key).to be_nil
+      client.key = File.read(fixture_path('client.key'))
+      expect(client.ssl_context.key).to be_a(OpenSSL::PKey::RSA)
+    end
+  end
+
+  describe "setting an encrypted client private key, w/the correct passphrase" do
+    let(:key_pass) { 'mqtt' }
+
+    it "should add the decrypted certificate to the SSL context" do
+      expect(client.ssl_context.key).to be_nil
+      client.key_file = [fixture_path('client.pass.key'), key_pass]
+      expect(client.ssl_context.key).to be_a(OpenSSL::PKey::RSA)
+    end
+  end
+
+  describe "setting an encrypted client private key, w/an incorrect passphrase" do
+    let(:key_pass) { 'ttqm' }
+
+    it "should raise an OpenSSL::PKey::RSAError exception" do
+      expect(client.ssl_context.key).to be_nil
+      expect { client.key_file = [fixture_path('client.pass.key'), key_pass] }.to(
+        raise_error(OpenSSL::PKey::RSAError, /Neither PUB key nor PRIV key/))
+    end
+  end
+
   describe "setting a Certificate Authority file path" do
     it "should add a CA file path to the SSL context" do
       expect(client.ssl_context.ca_file).to be_nil
@@ -253,7 +289,7 @@ describe MQTT::Client do
       client.connect('myclient')
     end
 
-    it "should throw an exception if no host is configured" do
+    it "should raise an exception if no host is configured" do
       expect {
         client = MQTT::Client.new
         client.connect
@@ -262,9 +298,19 @@ describe MQTT::Client do
       )
     end
 
-    it "should disconnect after connecting, if a block is given" do
-      expect(client).to receive(:disconnect).once
-      client.connect('myclient') { nil }
+    context "if a block is given" do
+      it "should disconnect after connecting" do
+        expect(client).to receive(:disconnect).once
+        client.connect('myclient') { nil }
+      end
+
+      it "should disconnect even if the block raises an exception" do
+        expect(client).to receive(:disconnect).once
+        begin
+          client.connect('myclient') { raise StandardError }
+        rescue StandardError
+        end
+      end
     end
 
     it "should not disconnect after connecting, if no block is given" do
@@ -287,7 +333,7 @@ describe MQTT::Client do
     end
 
     context "no client id is given" do
-      it "should throw an exception if the clean session flag is false" do
+      it "should raise an exception if the clean session flag is false" do
         expect {
           client.client_id = nil
           client.clean_session = false
@@ -376,7 +422,7 @@ describe MQTT::Client do
         expect(client.will_retain).to be_falsey
       end
 
-      it "should have set the Will's retain QOS value to 1" do
+      it "should have set the Will's retain QoS value to 1" do
         expect(client.will_qos).to eq(1)
       end
 
@@ -423,37 +469,37 @@ describe MQTT::Client do
       allow(IO).to receive(:select).and_return([[socket], [], []])
     end
 
-    it "should not throw an exception for a successful CONNACK packet" do
+    it "should not raise an exception for a successful CONNACK packet" do
       socket.write("\x20\x02\x00\x00")
       socket.rewind
       expect { client.send(:receive_connack) }.not_to raise_error
     end
 
-    it "should throw an exception if the packet type isn't CONNACK" do
+    it "should raise an exception if the packet type isn't CONNACK" do
       socket.write("\xD0\x00")
       socket.rewind
       expect { client.send(:receive_connack) }.to raise_error(MQTT::ProtocolException)
     end
 
-    it "should throw an exception if the CONNACK packet return code is 'unacceptable protocol version'" do
+    it "should raise an exception if the CONNACK packet return code is 'unacceptable protocol version'" do
       socket.write("\x20\x02\x00\x01")
       socket.rewind
       expect { client.send(:receive_connack) }.to raise_error(MQTT::ProtocolException, /unacceptable protocol version/i)
     end
 
-    it "should throw an exception if the CONNACK packet return code is 'client identifier rejected'" do
+    it "should raise an exception if the CONNACK packet return code is 'client identifier rejected'" do
       socket.write("\x20\x02\x00\x02")
       socket.rewind
       expect { client.send(:receive_connack) }.to raise_error(MQTT::ProtocolException, /client identifier rejected/i)
     end
 
-    it "should throw an exception if the CONNACK packet return code is 'server unavailable'" do
+    it "should raise an exception if the CONNACK packet return code is 'server unavailable'" do
       socket.write("\x20\x02\x00\x03")
       socket.rewind
       expect { client.send(:receive_connack) }.to raise_error(MQTT::ProtocolException, /server unavailable/i)
     end
 
-    it "should throw an exception if the CONNACK packet return code is an unknown" do
+    it "should raise an exception if the CONNACK packet return code is an unknown" do
       socket.write("\x20\x02\x00\xAA")
       socket.rewind
       expect { client.send(:receive_connack) }.to raise_error(MQTT::ProtocolException, /connection refused/i)
@@ -491,23 +537,6 @@ describe MQTT::Client do
     end
   end
 
-  describe "when calling the 'ping' method" do
-    before(:each) do
-      client.instance_variable_set('@socket', socket)
-    end
-
-    it "should write a valid PINGREQ packet to the socket" do
-      client.ping
-      expect(socket.string).to eq("\xC0\x00")
-    end
-
-    it "should update the time a ping was last sent" do
-      client.instance_variable_set('@last_pingreq', 0)
-      client.ping
-      expect(client.instance_variable_get('@last_pingreq')).not_to eq(0)
-    end
-  end
-
   describe "when calling the 'publish' method" do
     before(:each) do
       client.instance_variable_set('@socket', socket)
@@ -523,12 +552,14 @@ describe MQTT::Client do
       expect(socket.string).to eq("\x31\x0e\x00\x05topicpayload")
     end
 
-    it "should write a valid PUBLISH packet to the socket with the QOS set to 1" do
+    it "should write a valid PUBLISH packet to the socket with the QoS set to 1" do
+      inject_puback(1)
       client.publish('topic','payload', false, 1)
       expect(socket.string).to eq("\x32\x10\x00\x05topic\x00\x01payload")
     end
 
-    it "should write a valid PUBLISH packet to the socket with the QOS set to 2" do
+    it "should write a valid PUBLISH packet to the socket with the QoS set to 2" do
+      inject_puback(1)
       client.publish('topic','payload', false, 2)
       expect(socket.string).to eq("\x34\x10\x00\x05topic\x00\x01payload")
     end
@@ -538,7 +569,12 @@ describe MQTT::Client do
       expect(socket.string).to eq("\x30\x06\x00\x04test")
     end
 
-    it "should throw an ArgumentError exception, if the topic is nil" do
+    it "should write a valid PUBLISH packet with frozen payload" do
+      client.publish('topic', 'payload'.freeze, false, 0)
+      expect(socket.string).to eq("\x30\x0e\x00\x05topicpayload")
+    end
+
+    it "should raise an ArgumentError exception, if the topic is nil" do
       expect {
         client.publish(nil)
       }.to raise_error(
@@ -547,7 +583,7 @@ describe MQTT::Client do
       )
     end
 
-    it "should throw an ArgumentError exception, if the topic is empty" do
+    it "should raise an ArgumentError exception, if the topic is empty" do
       expect {
         client.publish("")
       }.to raise_error(
@@ -555,6 +591,16 @@ describe MQTT::Client do
         'Topic name cannot be empty'
       )
     end
+
+    it "correctly assigns consecutive ids to packets with QoS 1" do
+      inject_puback(1)
+      inject_puback(2)
+      
+      expect(client).to receive(:send_packet) { |packet| expect(packet.id).to eq(1) }
+      client.publish "topic", "message", false, 1
+      expect(client).to receive(:send_packet) { |packet| expect(packet.id).to eq(2) }
+      client.publish "topic", "message", false, 1
+    end
   end
 
   describe "when calling the 'subscribe' method" do
@@ -616,14 +662,14 @@ describe MQTT::Client do
       client.instance_variable_set('@socket', socket)
     end
 
-    it "should successfull receive a valid PUBLISH packet with a QoS 0" do
+    it "should successfully receive a valid PUBLISH packet with a QoS 0" do
       inject_packet(:topic => 'topic0', :payload => 'payload0', :qos => 0)
       topic,payload = client.get
       expect(topic).to eq('topic0')
       expect(payload).to eq('payload0')
     end
 
-    it "should successfull receive a valid PUBLISH packet with a QoS 1" do
+    it "should successfully receive a valid PUBLISH packet with a QoS 1" do
       inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
       topic,payload = client.get
       expect(topic).to eq('topic1')
@@ -631,8 +677,20 @@ describe MQTT::Client do
       expect(client.queue_empty?).to be_truthy
     end
 
+    it "acks calling #get_packet and qos=1" do
+      inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
+      expect(client).to receive(:send_packet).with(an_instance_of(MQTT::Packet::Puback))
+      client.get_packet
+    end
+
+    it "acks calling #get and qos=1" do
+      inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
+      expect(client).to receive(:send_packet).with(an_instance_of(MQTT::Packet::Puback))
+      client.get
+    end
+
     context "with a block" do
-      it "should successfull receive a more than 1 message" do
+      it "should successfully receive more than 1 message" do
         inject_packet(:topic => 'topic0', :payload => 'payload0')
         inject_packet(:topic => 'topic1', :payload => 'payload1')
         payloads = []
@@ -643,6 +701,17 @@ describe MQTT::Client do
         expect(payloads.size).to eq(2)
         expect(payloads).to eq(['payload0', 'payload1'])
       end
+
+      it "acks when qos > 1 after running the block" do
+        inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
+        inject_packet(:topic => 'topic2', :payload => 'payload1')
+        expect(client).to receive(:send_packet).with(an_instance_of(MQTT::Packet::Puback))
+        payloads = []
+        client.get do |topic,payload|
+          payloads << payload
+          break if payloads.size > 1
+        end
+      end
     end
   end
 
@@ -651,7 +720,7 @@ describe MQTT::Client do
       client.instance_variable_set('@socket', socket)
     end
 
-    it "should successfull receive a valid PUBLISH packet with a QoS 0" do
+    it "should successfully receive a valid PUBLISH packet with a QoS 0" do
       inject_packet(:topic => 'topic0', :payload => 'payload0', :qos => 0)
       packet = client.get_packet
       expect(packet.class).to eq(MQTT::Packet::Publish)
@@ -660,7 +729,7 @@ describe MQTT::Client do
       expect(packet.payload).to eq('payload0')
     end
 
-    it "should successfull receive a valid PUBLISH packet with a QoS 1" do
+    it "should successfully receive a valid PUBLISH packet with a QoS 1" do
       inject_packet(:topic => 'topic1', :payload => 'payload1', :qos => 1)
       packet = client.get_packet
       expect(packet.class).to eq(MQTT::Packet::Publish)
@@ -671,7 +740,7 @@ describe MQTT::Client do
     end
 
     context "with a block" do
-      it "should successfull receive a more than 1 packet" do
+      it "should successfully receive more than 1 packet" do
         inject_packet(:topic => 'topic0', :payload => 'payload0')
         inject_packet(:topic => 'topic1', :payload => 'payload1')
         packets = []
@@ -729,10 +798,15 @@ describe MQTT::Client do
       expect(@read_queue.size).to eq(0)
     end
 
-    it "should send a ping packet if one is due" do
-      expect(IO).to receive(:select).and_return(nil)
-      client.instance_variable_set('@last_pingreq', Time.at(0))
-      expect(client).to receive(:ping).once
+    it "should close the socket if there is an exception" do
+      expect(socket).to receive(:close).once
+      allow(MQTT::Packet).to receive(:read).and_raise(MQTT::Exception)
+      client.send(:receive_packet)
+    end
+
+    it "should pass exceptions up to parent thread" do
+      expect(@parent_thread).to receive(:raise).once
+      allow(MQTT::Packet).to receive(:read).and_raise(MQTT::Exception)
       client.send(:receive_packet)
     end
 
@@ -742,17 +816,34 @@ describe MQTT::Client do
       client.send :receive_packet
       expect(client.last_ping_response).to be_within(1).of Time.now
     end
+  end
+
+  describe "when calling the 'keep_alive!' method" do
+    before(:each) do
+      client.instance_variable_set('@socket', socket)
+    end
 
-    it "should close the socket if there is an exception" do
-      expect(socket).to receive(:close).once
-      allow(MQTT::Packet).to receive(:read).and_raise(MQTT::Exception)
-      client.send(:receive_packet)
+    it "should send a ping packet if one is due" do
+      client.instance_variable_set('@last_ping_request', Time.at(0))
+      client.send('keep_alive!')
+      expect(socket.string).to eq("\xC0\x00")
     end
 
-    it "should pass exceptions up to parent thread" do
-      expect(@parent_thread).to receive(:raise).once
-      allow(MQTT::Packet).to receive(:read).and_raise(MQTT::Exception)
-      client.send(:receive_packet)
+    it "should update the time a ping was last sent" do
+      client.instance_variable_set('@last_ping_request', Time.at(0))
+      client.send('keep_alive!')
+      expect(client.instance_variable_get('@last_ping_request')).not_to eq(0)
+    end
+
+    it "should raise an exception if no ping response has been received" do
+      client.instance_variable_set('@last_ping_request', Time.now)
+      client.instance_variable_set('@last_ping_response', Time.at(0))
+      expect {
+        client.send('keep_alive!')
+      }.to raise_error(
+        MQTT::ProtocolException,
+        /No Ping Response received for \d+ seconds/
+      )
     end
   end
 
@@ -797,4 +888,9 @@ describe MQTT::Client do
     client.instance_variable_get('@read_queue').push(packet)
   end
 
+  def inject_puback(packet_id)
+    packet = MQTT::Packet::Puback.new(:id => packet_id)
+    client.instance_variable_get('@pubacks')[packet_id] = packet
+  end
+
 end

data/spec/mqtt_packet_spec.rb

@@ -4,7 +4,6 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'spec_helper'
-require 'mqtt'
 
 describe MQTT::Packet do
 
@@ -96,7 +95,7 @@ end
 
 describe MQTT::Packet::Publish do
   describe "when creating a packet" do
-    it "should allow you to set the packet QOS level as a hash parameter" do
+    it "should allow you to set the packet QoS level as a hash parameter" do
       packet = MQTT::Packet::Publish.new( :qos => 2 )
       expect(packet.qos).to eq(2)
     end
@@ -106,7 +105,7 @@ describe MQTT::Packet::Publish do
       expect(packet.retain).to be_truthy
     end
 
-    it "should throw an exception the QoS is greater than 2" do
+    it "should raise an exception the QoS is greater than 2" do
       expect {
         packet = MQTT::Packet::Publish.new( :qos => 3 )
       }.to raise_error(
@@ -114,7 +113,7 @@ describe MQTT::Packet::Publish do
       )
     end
 
-    it "should throw an exception the QoS is less than 0" do
+    it "should raise an exception the QoS is less than 0" do
       expect {
         packet = MQTT::Packet::Publish.new( :qos => -1 )
       }.to raise_error(
@@ -159,22 +158,22 @@ describe MQTT::Packet::Publish do
   end
 
   describe "when serialising a packet" do
-    it "should output the correct bytes for a packet with default QOS and no flags" do
+    it "should output the correct bytes for a packet with default QoS and no flags" do
       packet = MQTT::Packet::Publish.new( :topic => 'test', :payload => 'hello world' )
       expect(packet.to_s).to eq("\x30\x11\x00\x04testhello world")
     end
 
-    it "should output the correct bytes for a packet with QOS 1 and no flags" do
+    it "should output the correct bytes for a packet with QoS 1 and no flags" do
       packet = MQTT::Packet::Publish.new( :id => 5, :qos => 1, :topic => 'a/b', :payload => 'hello world' )
       expect(packet.to_s).to eq("\x32\x12\x00\x03a/b\x00\x05hello world")
     end
 
-    it "should output the correct bytes for a packet with QOS 2 and retain flag set" do
+    it "should output the correct bytes for a packet with QoS 2 and retain flag set" do
       packet = MQTT::Packet::Publish.new( :id => 5, :qos => 2, :retain => true, :topic => 'c/d', :payload => 'hello world' )
       expect(packet.to_s).to eq("\x35\x12\x00\x03c/d\x00\x05hello world")
     end
 
-    it "should output the correct bytes for a packet with QOS 2 and dup flag set" do
+    it "should output the correct bytes for a packet with QoS 2 and dup flag set" do
       packet = MQTT::Packet::Publish.new( :id => 5, :qos => 2, :duplicate => true, :topic => 'c/d', :payload => 'hello world' )
       expect(packet.to_s).to eq("\x3C\x12\x00\x03c/d\x00\x05hello world")
     end
@@ -194,7 +193,7 @@ describe MQTT::Packet::Publish do
       expect(packet.to_s).to eq("\x30\x0c\x00\x06symbol1234")
     end
 
-    it "should throw an exception when there is no topic name" do
+    it "should raise an exception when there is no topic name" do
       expect {
         MQTT::Packet::Publish.new.to_s
       }.to raise_error(
@@ -202,7 +201,7 @@ describe MQTT::Packet::Publish do
       )
     end
 
-    it "should throw an exception when there is an empty topic name" do
+    it "should raise an exception when there is an empty topic name" do
       expect {
         MQTT::Packet::Publish.new( :topic => '' ).to_s
       }.to raise_error(
@@ -212,7 +211,7 @@ describe MQTT::Packet::Publish do
   end
 
   describe "when serialising an oversized packet" do
-    it "should throw an exception when body is bigger than 256MB" do
+    it "should raise an exception when body is bigger than 256MB" do
       expect {
         packet = MQTT::Packet::Publish.new( :topic => 'test', :payload => 'x'*268435455 )
         packet.to_s
@@ -222,14 +221,14 @@ describe MQTT::Packet::Publish do
     end
   end
 
-  describe "when parsing a packet with QOS 0" do
+  describe "when parsing a packet with QoS 0" do
     let(:packet) { MQTT::Packet.parse( "\x30\x11\x00\x04testhello world" ) }
 
     it "should correctly create the right type of packet object" do
       expect(packet.class).to eq(MQTT::Packet::Publish)
     end
 
-    it "should set the QOS level correctly" do
+    it "should set the QoS level correctly" do
       expect(packet.qos).to eq(0)
     end
 
@@ -252,14 +251,14 @@ describe MQTT::Packet::Publish do
     end
   end
 
-  describe "when parsing a packet with QOS 2 and retain and dup flags set" do
+  describe "when parsing a packet with QoS 2 and retain and dup flags set" do
     let(:packet) { MQTT::Packet.parse( "\x3D\x12\x00\x03c/d\x00\x05hello world" ) }
 
     it "should correctly create the right type of packet object" do
       expect(packet.class).to eq(MQTT::Packet::Publish)
     end
 
-    it "should set the QOS level correctly" do
+    it "should set the QoS level correctly" do
       expect(packet.qos).to eq(2)
     end
 
@@ -299,7 +298,7 @@ describe MQTT::Packet::Publish do
   end
 
   describe "when parsing a packet with a QoS value of 3" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x36\x12\x00\x03a/b\x00\x05hello world" )
       }.to raise_error(
@@ -310,7 +309,7 @@ describe MQTT::Packet::Publish do
   end
 
   describe "when parsing a packet with QoS value of 0 and DUP set" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x38\x10\x00\x03a/bhello world" )
       }.to raise_error(
@@ -412,7 +411,7 @@ describe MQTT::Packet::Publish do
       expect(packet.body_length).to eq(17)
     end
 
-    it "should set the QOS level correctly" do
+    it "should set the QoS level correctly" do
       expect(packet.qos).to eq(0)
     end
 
@@ -469,7 +468,7 @@ describe MQTT::Packet::Connect do
     end
 
     context "protocol version 3.1.0" do
-      it "should throw an exception when there is no client identifier" do
+      it "should raise an exception when there is no client identifier" do
         expect {
           MQTT::Packet::Connect.new(:version => '3.1.0', :client_id => '').to_s
         }.to raise_error(
@@ -477,7 +476,7 @@ describe MQTT::Packet::Connect do
         )
       end
 
-      it "should throw an exception when the client identifier is too long" do
+      it "should raise an exception when the client identifier is too long" do
         expect {
           client_id = '0EB8D2FE7C254715B4467C5B2ECAD100'
           MQTT::Packet::Connect.new(:version => '3.1.0', :client_id => client_id).to_s
@@ -508,7 +507,7 @@ describe MQTT::Packet::Connect do
       end
     end
 
-    it "should throw an exception if the keep alive value is less than 0" do
+    it "should raise an exception if the keep alive value is less than 0" do
       expect {
         MQTT::Packet::Connect.new(:client_id => 'test', :keep_alive => -2).to_s
       }.to raise_error(
@@ -583,7 +582,7 @@ describe MQTT::Packet::Connect do
     end
 
     context 'an invalid protocol version number' do
-      it "should throw a protocol exception" do
+      it "should raise a protocol exception" do
         expect {
           packet = MQTT::Packet::Connect.new( :version => 'x.x.x', :client_id => 'myclient' )
         }.to raise_error(
@@ -744,7 +743,7 @@ describe MQTT::Packet::Connect do
       expect(packet.clean_session).to be_truthy
     end
 
-    it "should set the QOS of the Will should be 1" do
+    it "should set the QoS of the Will should be 1" do
       expect(packet.will_qos).to eq(1)
     end
 
@@ -941,7 +940,7 @@ describe MQTT::Packet::Connect do
   end
 
   describe "when parsing packet with an unknown protocol name" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         packet = MQTT::Packet.parse(
           "\x10\x16\x00\x06FooBar\x03\x00\x00\x0a\x00\x08myclient"
@@ -954,7 +953,7 @@ describe MQTT::Packet::Connect do
   end
 
   describe "when parsing packet with an unknown protocol level" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         packet = MQTT::Packet.parse(
           "\x10\x16\x00\x06MQIsdp\x02\x00\x00\x0a\x00\x08myclient"
@@ -967,7 +966,7 @@ describe MQTT::Packet::Connect do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse(
           "\x13\x16\x00\x06MQIsdp\x03\x00\x00\x0a\x00\x08myclient"
@@ -1199,7 +1198,7 @@ describe MQTT::Packet::Connack do
   end
 
   describe "when parsing packet with invalid Connack flags set" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x20\x02\xff\x05" )
       }.to raise_error(
@@ -1210,7 +1209,7 @@ describe MQTT::Packet::Connack do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x20\x03\x00\x00\x00" )
       }.to raise_error(
@@ -1221,7 +1220,7 @@ describe MQTT::Packet::Connack do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x23\x02\x00\x00" )
       }.to raise_error(
@@ -1264,7 +1263,7 @@ describe MQTT::Packet::Puback do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x40\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1275,7 +1274,7 @@ describe MQTT::Packet::Puback do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x43\x02\x12\x34" )
       }.to raise_error(
@@ -1312,7 +1311,7 @@ describe MQTT::Packet::Pubrec do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x50\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1323,7 +1322,7 @@ describe MQTT::Packet::Pubrec do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x53\x02\x12\x34" )
       }.to raise_error(
@@ -1360,7 +1359,7 @@ describe MQTT::Packet::Pubrel do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\x62\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1371,7 +1370,7 @@ describe MQTT::Packet::Pubrel do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x60\x02\x12\x34" )
       }.to raise_error(
@@ -1408,7 +1407,7 @@ describe MQTT::Packet::Pubcomp do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x70\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1419,7 +1418,7 @@ describe MQTT::Packet::Pubcomp do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x72\x02\x12\x34" )
       }.to raise_error(
@@ -1464,7 +1463,7 @@ describe MQTT::Packet::Subscribe do
       expect(packet.topics).to eq([['a/b', 0], ['b/c', 1]])
     end
 
-    it "should throw an exception when setting topic with a non-string" do
+    it "should raise an exception when setting topic with a non-string" do
       expect {
         packet.topics = 56
       }.to raise_error(
@@ -1484,7 +1483,7 @@ describe MQTT::Packet::Subscribe do
       expect(packet.to_s).to eq("\x82\x0e\000\x06\x00\x03a/b\x00\x00\x03c/d\x01")
     end
 
-    it "should throw an exception when no topics are given" do
+    it "should raise an exception when no topics are given" do
       expect {
         MQTT::Packet::Subscribe.new.to_s
       }.to raise_error(
@@ -1534,7 +1533,7 @@ describe MQTT::Packet::Subscribe do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x80\x08\x00\x01\x00\x03a/b\x00" )
       }.to raise_error(
@@ -1569,15 +1568,15 @@ describe MQTT::Packet::Suback do
       expect(packet.to_s).to eq("\x90\x04\x00\x06\x00\x01")
     end
 
-    it "should throw an exception when no granted QOSs are given" do
+    it "should raise an exception when no granted QoSs are given" do
       expect {
         MQTT::Packet::Suback.new( :id => 7 ).to_s
       }.to raise_error(
-        'no granted QOS given when serialising packet'
+        'no granted QoS given when serialising packet'
       )
     end
 
-    it "should throw an exception if the granted QOS is not an integer" do
+    it "should raise an exception if the granted QoS is not an integer" do
       expect {
         MQTT::Packet::Suback.new( :id => 8, :return_codes => :foo ).to_s
       }.to raise_error(
@@ -1586,7 +1585,7 @@ describe MQTT::Packet::Suback do
     end
   end
 
-  describe "when parsing a packet with a single QOS value of 0" do
+  describe "when parsing a packet with a single QoS value of 0" do
     let(:packet) { MQTT::Packet.parse( "\x90\x03\x12\x34\x00" ) }
 
     it "should correctly create the right type of packet object" do
@@ -1597,12 +1596,12 @@ describe MQTT::Packet::Suback do
       expect(packet.id).to eq(0x1234)
     end
 
-    it "should set the Granted QOS of the packet correctly" do
+    it "should set the Granted QoS of the packet correctly" do
       expect(packet.return_codes).to eq([0])
     end
   end
 
-  describe "when parsing a packet with two QOS values" do
+  describe "when parsing a packet with two QoS values" do
     let(:packet) { MQTT::Packet.parse( "\x90\x04\x12\x34\x01\x01" ) }
 
     it "should correctly create the right type of packet object" do
@@ -1613,13 +1612,13 @@ describe MQTT::Packet::Suback do
       expect(packet.id).to eq(0x1234)
     end
 
-    it "should set the Granted QOS of the packet correctly" do
+    it "should set the Granted QoS of the packet correctly" do
       expect(packet.return_codes).to eq([1,1])
     end
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\x92\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1666,7 +1665,7 @@ describe MQTT::Packet::Unsubscribe do
       expect(packet.to_s).to eq("\xa2\x0c\000\006\000\003a/b\000\003c/d")
     end
 
-    it "should throw an exception when no topics are given" do
+    it "should raise an exception when no topics are given" do
       expect {
         MQTT::Packet::Unsubscribe.new.to_s
       }.to raise_error(
@@ -1692,7 +1691,7 @@ describe MQTT::Packet::Unsubscribe do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\xa0\x07\x00\x05\x00\x03a/b" )
       }.to raise_error(
@@ -1738,7 +1737,7 @@ describe MQTT::Packet::Unsuback do
   end
 
   describe "when parsing packet with extra bytes on the end" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         packet = MQTT::Packet.parse( "\xB0\x03\x12\x34\x00" )
       }.to raise_error(
@@ -1749,7 +1748,7 @@ describe MQTT::Packet::Unsuback do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\xB2\x02\x12\x34" )
       }.to raise_error(
@@ -1779,7 +1778,7 @@ describe MQTT::Packet::Pingreq do
       expect(packet.class).to eq(MQTT::Packet::Pingreq)
     end
 
-    it "should throw an exception if the packet has a payload" do
+    it "should raise an exception if the packet has a payload" do
       expect {
         MQTT::Packet.parse( "\xC0\x05hello" )
       }.to raise_error(
@@ -1789,7 +1788,7 @@ describe MQTT::Packet::Pingreq do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\xC2\x00" )
       }.to raise_error(
@@ -1819,7 +1818,7 @@ describe MQTT::Packet::Pingresp do
       expect(packet.class).to eq(MQTT::Packet::Pingresp)
     end
 
-    it "should throw an exception if the packet has a payload" do
+    it "should raise an exception if the packet has a payload" do
       expect {
         MQTT::Packet.parse( "\xD0\x05hello" )
       }.to raise_error(
@@ -1829,7 +1828,7 @@ describe MQTT::Packet::Pingresp do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\xD2\x00" )
       }.to raise_error(
@@ -1860,7 +1859,7 @@ describe MQTT::Packet::Disconnect do
       expect(packet.class).to eq(MQTT::Packet::Disconnect)
     end
 
-    it "should throw an exception if the packet has a payload" do
+    it "should raise an exception if the packet has a payload" do
       expect {
         MQTT::Packet.parse( "\xE0\x05hello" )
       }.to raise_error(
@@ -1870,7 +1869,7 @@ describe MQTT::Packet::Disconnect do
   end
 
   describe "when parsing packet with invalid fixed header flags" do
-    it "should throw a protocol exception" do
+    it "should raise a protocol exception" do
       expect {
         MQTT::Packet.parse( "\xE2\x00" )
       }.to raise_error(
@@ -1889,7 +1888,7 @@ end
 
 describe "Serialising an invalid packet" do
   context "that has a no type" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.new.to_s
       }.to raise_error(
@@ -1902,7 +1901,7 @@ end
 
 describe "Reading in an invalid packet from a socket" do
   context "that has 0 length" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         socket = StringIO.new
         MQTT::Packet.read(socket)
@@ -1914,7 +1913,7 @@ describe "Reading in an invalid packet from a socket" do
   end
 
   context "that has an incomplete packet length header" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         socket = StringIO.new("\x30\xFF")
         MQTT::Packet.read(socket)
@@ -1926,7 +1925,7 @@ describe "Reading in an invalid packet from a socket" do
   end
 
   context "that has the maximum number of bytes in the length header" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         socket = StringIO.new("\x30\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF")
         MQTT::Packet.read(socket)
@@ -1940,7 +1939,7 @@ end
 
 describe "Parsing an invalid packet" do
   context "that has no length" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "" )
       }.to raise_error(
@@ -1951,7 +1950,7 @@ describe "Parsing an invalid packet" do
   end
 
   context "that has an invalid type identifier" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x00\x00" )
       }.to raise_error(
@@ -1962,7 +1961,7 @@ describe "Parsing an invalid packet" do
   end
 
   context "that has an incomplete packet length header" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x30\xFF" )
       }.to raise_error(
@@ -1973,7 +1972,7 @@ describe "Parsing an invalid packet" do
   end
 
   context "that has too many bytes in the length field" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x30\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" )
       }.to raise_error(
@@ -1984,7 +1983,7 @@ describe "Parsing an invalid packet" do
   end
 
   context "that has a bigger buffer than expected" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x30\x11\x00\x04testhello big world" )
       }.to raise_error(
@@ -1995,7 +1994,7 @@ describe "Parsing an invalid packet" do
   end
 
   context "that has a smaller buffer than expected" do
-    it "should throw an exception" do
+    it "should raise an exception" do
       expect {
         MQTT::Packet.parse( "\x30\x11\x00\x04testhello" )
       }.to raise_error(