blather 0.3.4 → 0.4.0

data/spec/blather/stanza/pubsub_owner/purge_spec.rb

@@ -0,0 +1,50 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+
+describe Blather::Stanza::PubSubOwner::Purge do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:purge, 'http://jabber.org/protocol/pubsub#owner').must_equal Blather::Stanza::PubSubOwner::Purge
+  end
+
+  it 'can be imported' do
+    Blather::XMPPNode.import(parse_stanza(<<-NODE).root).must_be_instance_of Blather::Stanza::PubSubOwner::Purge
+    <iq type='set'
+        from='hamlet@denmark.lit/elsinore'
+        to='pubsub.shakespeare.lit'
+        id='purge1'>
+      <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
+        <purge node='princely_musings'/>
+      </pubsub>
+    </iq>
+    NODE
+  end
+
+  it 'ensures an purge node is present on create' do
+    purge = Blather::Stanza::PubSubOwner::Purge.new
+    purge.find('//ns:pubsub/ns:purge', :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
+  end
+
+  it 'ensures an purge node exists when calling #purge_node' do
+    purge = Blather::Stanza::PubSubOwner::Purge.new
+    purge.pubsub.remove_children :purge
+    purge.find('//ns:pubsub/ns:purge', :ns => Blather::Stanza::PubSubOwner.registered_ns).must_be_empty
+
+    purge.purge_node.wont_be_nil
+    purge.find('//ns:pubsub/ns:purge', :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
+  end
+
+  it 'defaults to a set node' do
+    purge = Blather::Stanza::PubSubOwner::Purge.new
+    purge.type.must_equal :set
+  end
+
+  it 'sets the host if requested' do
+    purge = Blather::Stanza::PubSubOwner::Purge.new :set, 'pubsub.jabber.local'
+    purge.to.must_equal Blather::JID.new('pubsub.jabber.local')
+  end
+
+  it 'sets the node' do
+    purge = Blather::Stanza::PubSubOwner::Purge.new :set, 'host', 'node-name'
+    purge.node.must_equal 'node-name'
+  end
+end

data/spec/blather/stanza/pubsub_owner_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. fixtures pubsub])
+
+describe Blather::Stanza::PubSubOwner do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:pubsub, 'http://jabber.org/protocol/pubsub#owner').must_equal Blather::Stanza::PubSubOwner
+  end
+
+  it 'ensures a pubusb node is present on create' do
+    pubsub = Blather::Stanza::PubSubOwner.new
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_nil
+  end
+
+  it 'ensures a pubsub node exists when calling #pubsub' do
+    pubsub = Blather::Stanza::PubSubOwner.new
+    pubsub.remove_children :pubsub
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSubOwner.registered_ns).must_be_nil
+
+    pubsub.pubsub.wont_be_nil
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_nil
+  end
+
+  it 'sets the host if requested' do
+    aff = Blather::Stanza::PubSubOwner.new :get, 'pubsub.jabber.local'
+    aff.to.must_equal Blather::JID.new('pubsub.jabber.local')
+  end
+end

data/spec/blather/stanza/pubsub_spec.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. fixtures pubsub])
+
+describe Blather::Stanza::PubSub do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:pubsub, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub
+  end
+
+  it 'ensures a pubusb node is present on create' do
+    pubsub = Blather::Stanza::PubSub.new
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_nil
+  end
+
+  it 'ensures a pubsub node exists when calling #pubsub' do
+    pubsub = Blather::Stanza::PubSub.new
+    pubsub.remove_children :pubsub
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSub.registered_ns).must_be_nil
+
+    pubsub.pubsub.wont_be_nil
+    pubsub.find_first('/iq/ns:pubsub', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_nil
+  end
+
+  it 'sets the host if requested' do
+    aff = Blather::Stanza::PubSub.new :get, 'pubsub.jabber.local'
+    aff.to.must_equal Blather::JID.new('pubsub.jabber.local')
+  end
+
+  it 'ensures newly inherited items are PubSubItem objects' do
+    pubsub = Blather::XMPPNode.import(parse_stanza(items_all_nodes_xml).root)
+    pubsub.items.map { |i| i.class }.uniq.must_equal [Blather::Stanza::PubSub::PubSubItem]
+  end
+end
+
+describe Blather::Stanza::PubSub::PubSubItem do
+  it 'can be initialized with just an ID' do
+    id = 'foobarbaz'
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new id
+    item.id.must_equal id
+  end
+
+  it 'can be initialized with a payload' do
+    payload = 'foobarbaz'
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'foo', payload
+    item.payload.must_equal payload
+  end
+
+  it 'allows the payload to be set' do
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new
+    item.payload.must_be_nil
+    item.payload = 'testing'
+    item.payload.must_equal 'testing'
+    item.content.must_equal 'testing'
+  end
+
+  it 'allows the payload to be unset' do
+    payload = 'foobarbaz'
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'foo', payload
+    item.payload.must_equal payload
+    item.payload = nil
+    item.payload.must_be_nil
+  end
+end

data/spec/blather/stanza_spec.rb

@@ -1,34 +1,49 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
-describe 'Blather::Stanza' do
+describe Blather::Stanza do
   it 'provides .next_id helper for generating new IDs' do
-    proc { Stanza.next_id }.must_change 'Stanza.next_id'
+    proc { Blather::Stanza.next_id }.must_change 'Blather::Stanza.next_id'
   end
 
-  it 'can import a node' do
-    s = Stanza.import XMPPNode.new('foo')
-    s.element_name.must_equal 'foo'
+  it 'provides a handler registration mechanism' do
+    class Registration < Blather::Stanza; register :handler_test, :handler, 'test:namespace'; end
+    Registration.handler_heirarchy.must_include :handler_test
+    Blather::Stanza.handler_list.must_include :handler_test
+  end
+
+  it 'can register based on handler' do
+    class RegisterHandler < Blather::Stanza; register :register_handler; end
+    Blather::Stanza.class_from_registration(:register_handler, nil).must_equal RegisterHandler
+  end
+
+  it 'can register based on given name' do
+    class RegisterName < Blather::Stanza; register :handler, :registered_name; end
+    Blather::Stanza.class_from_registration(:registered_name, nil).must_equal RegisterName
   end
 
-  it 'sets the ID when created' do
-    Stanza.new('message').id.wont_be_nil
+  it 'can register subclass handlers' do
+    class SuperClassRegister < Blather::Stanza; register :super_class; end
+    class SubClassRegister < SuperClassRegister; register :sub_class; end
+    SuperClassRegister.handler_heirarchy.wont_include :sub_class
+    SubClassRegister.handler_heirarchy.must_include :super_class
   end
 
-  it 'sets the document when created' do
-    Stanza.new('message').doc.wont_be_nil
+  it 'can import a node' do
+    s = Blather::Stanza.import Blather::XMPPNode.new('foo')
+    s.element_name.must_equal 'foo'
   end
 
   it 'provides an #error? helper' do
-    s = Stanza.new('message')
+    s = Blather::Stanza.new('message')
     s.error?.must_equal false
     s.type = :error
     s.error?.must_equal true
   end
 
   it 'will generate a reply' do
-    s = Stanza.new('message')
-    s.from = f = JID.new('n@d/r')
-    s.to = t = JID.new('d@n/r')
+    s = Blather::Stanza.new('message')
+    s.from = f = Blather::JID.new('n@d/r')
+    s.to = t = Blather::JID.new('d@n/r')
 
     r = s.reply
     r.object_id.wont_equal s.object_id
@@ -37,9 +52,9 @@ describe 'Blather::Stanza' do
   end
 
   it 'convert to a reply' do
-    s = Stanza.new('message')
-    s.from = f = JID.new('n@d/r')
-    s.to = t = JID.new('d@n/r')
+    s = Blather::Stanza.new('message')
+    s.from = f = Blather::JID.new('n@d/r')
+    s.to = t = Blather::JID.new('d@n/r')
 
     r = s.reply!
     r.object_id.must_equal s.object_id
@@ -48,53 +63,53 @@ describe 'Blather::Stanza' do
   end
 
   it 'provides "attr_accessor" for id' do
-    s = Stanza.new('message')
-    s.id.wont_be_nil
-    s['id'].wont_be_nil
-
-    s.id = nil
+    s = Blather::Stanza.new('message')
     s.id.must_be_nil
-    s['id'].must_be_nil
+    s[:id].must_be_nil
+
+    s.id = '123'
+    s.id.must_equal '123'
+    s[:id].must_equal '123'
   end
 
   it 'provides "attr_accessor" for to' do
-    s = Stanza.new('message')
+    s = Blather::Stanza.new('message')
     s.to.must_be_nil
-    s['to'].must_be_nil
+    s[:to].must_be_nil
 
-    s.to = JID.new('n@d/r')
+    s.to = Blather::JID.new('n@d/r')
     s.to.wont_be_nil
-    s.to.must_be_kind_of JID
+    s.to.must_be_kind_of Blather::JID
 
-    s['to'].wont_be_nil
-    s['to'].must_equal 'n@d/r'
+    s[:to].wont_be_nil
+    s[:to].must_equal 'n@d/r'
   end
 
   it 'provides "attr_accessor" for from' do
-    s = Stanza.new('message')
+    s = Blather::Stanza.new('message')
     s.from.must_be_nil
-    s['from'].must_be_nil
+    s[:from].must_be_nil
 
-    s.from = JID.new('n@d/r')
+    s.from = Blather::JID.new('n@d/r')
     s.from.wont_be_nil
-    s.from.must_be_kind_of JID
+    s.from.must_be_kind_of Blather::JID
 
-    s['from'].wont_be_nil
-    s['from'].must_equal 'n@d/r'
+    s[:from].wont_be_nil
+    s[:from].must_equal 'n@d/r'
   end
 
   it 'provides "attr_accessor" for type' do
-    s = Stanza.new('message')
+    s = Blather::Stanza.new('message')
     s.type.must_be_nil
-    s['type'].must_be_nil
+    s[:type].must_be_nil
 
     s.type = 'testing'
     s.type.wont_be_nil
-    s['type'].wont_be_nil
+    s[:type].wont_be_nil
   end
 
   it 'can be converted into an error by error name' do
-    s = Stanza.new('message')
+    s = Blather::Stanza.new('message')
     err = s.as_error 'internal-server-error', 'cancel'
     err.name.must_equal :internal_server_error
   end

data/spec/blather/stream/client_spec.rb

@@ -1,6 +1,7 @@
+require 'resolv'
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 
-describe 'Blather::Stream::Client' do
+describe Blather::Stream::Client do
   class MockServer; end
   module ServerMock
     def receive_data(data)
@@ -12,44 +13,102 @@ describe 'Blather::Stream::Client' do
   def mocked_server(times = nil, &block)
     @client ||= mock()
     @client.stubs(:unbind) unless @client.respond_to?(:unbind)
+    @client.stubs(:post_init) unless @client.respond_to?(:post_init)
     @client.stubs(:jid=) unless @client.respond_to?(:jid=)
 
     MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
     EventMachine::run {
+      EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
+
       # Mocked server
       EventMachine::start_server '127.0.0.1', 12345, ServerMock
 
-      # Stream connection
-      EM.connect('127.0.0.1', 12345, Stream::Client, @client, @jid || JID.new('n@d/r'), 'pass') { |c| @stream = c }
+      # Blather::Stream connection
+      EM.connect('127.0.0.1', 12345, Blather::Stream::Client, @client, @jid || Blather::JID.new('n@d/r'), 'pass') { |c| @stream = c }
     }
   end
 
+
   it 'can be started' do
     client = mock()
     params = [client, 'n@d/r', 'pass', 'host', 1234]
     EM.expects(:connect).with do |*parms|
-      parms[0] == 'host'  &&
-      parms[1] == 1234    &&
-      parms[3] == client  &&
-      parms[5] == 'pass'  &&
-      parms[4] == JID.new('n@d/r')
+      parms[0].must_equal 'host'
+      parms[1].must_equal 1234
+      parms[3].must_equal client
+      parms[5].must_equal 'pass'
+      parms[4].must_equal Blather::JID.new('n@d/r')
+    end
+
+    Blather::Stream::Client.start *params
+  end
+
+  it 'attempts to find the SRV record if a host is not provided' do
+    dns = mock(:sort! => nil, :empty? => false)
+    dns.expects(:each).yields(mock({
+      :target => 'd',
+      :port => 5222
+    }))
+    Resolv::DNS.expects(:open).yields(mock(:getresources => dns))
+
+    client = Class.new
+    EM.expects(:connect).with do |*parms|
+      parms[0].must_equal 'd'
+      parms[1].must_equal 5222
+      parms[3].must_equal client
+      parms[5].must_equal 'pass'
+      parms[4].must_equal Blather::JID.new('n@d/r')
     end
 
-    Stream::Client.start *(params)
+    Blather::Stream::Client.start client, 'n@d/r', 'pass'
+  end
+
+  it 'will attempt as many connections as it takes' do
+    dns = [mock(:target => 'd', :port => 5222), mock(:target => 'g', :port => 1234)]
+    dns.stubs(:sort!) #ignore sorting
+    Resolv::DNS.expects(:open).yields(mock(:getresources => dns))
+
+    client = Class.new
+    EM.expects(:connect).with do |*parms|
+      raise Blather::Stream::NoConnection if parms[0] == 'd'
+      parms[0].must_equal 'g'
+      parms[1].must_equal 1234
+      parms[3].must_equal client
+      parms[5].must_equal 'pass'
+      parms[4].must_equal Blather::JID.new('n@d/r')
+    end
+    Blather::Stream::Client.start client, 'n@d/r', 'pass'
+  end
+
+  it 'will not attempt to connect more often than necessary' do
+    dns = [mock(:target => 'd', :port => 5222), mock()]
+    dns.stubs(:sort!) #ignore sorting
+    Resolv::DNS.expects(:open).yields(mock(:getresources => dns))
+
+    client = Class.new
+    EM.expects(:connect).with do |*parms|
+      parms[0].must_equal 'd'
+      parms[1].must_equal 5222
+      parms[3].must_equal client
+      parms[5].must_equal 'pass'
+      parms[4].must_equal Blather::JID.new('n@d/r')
+    end
+    Blather::Stream::Client.start client, 'n@d/r', 'pass'
   end
 
   it 'can figure out the host to use based on the jid' do
-    client = mock()
-    params = [client, 'n@d/r', 'pass', 'd', 5222]
+    Resolv::DNS.expects(:open).yields(mock(:getresources => mock(:empty? => true)))
+    client = Class.new
+    params = [client, 'n@d/r', 'pass', nil, 5222]
     EM.expects(:connect).with do |*parms|
-      parms[0] == 'd'     &&
-      parms[1] == 5222    &&
-      parms[3] == client  &&
-      parms[5] == 'pass'  &&
-      parms[4] == JID.new('n@d/r')
+      parms[0].must_equal 'd'
+      parms[1].must_equal 5222
+      parms[3].must_equal client
+      parms[5].must_equal 'pass'
+      parms[4].must_equal Blather::JID.new('n@d/r')
     end
 
-    Stream::Client.start client, 'n@d/r', 'pass'
+    Blather::Stream::Client.start client, 'n@d/r', 'pass'
   end
 
   it 'starts the stream once the connection is complete' do
@@ -60,7 +119,7 @@ describe 'Blather::Stream::Client' do
     @client = mock()
     @client.expects(:receive_data).with do |n|
       EM.stop
-      n.kind_of?(Stanza::Message) && @stream.ready?.must_equal(true)
+      n.must_be_kind_of Blather::Stanza::Message
     end
 
     mocked_server(1) do |val, server|
@@ -70,7 +129,7 @@ describe 'Blather::Stream::Client' do
     end
   end
 
-  it 'puts itself in the stopped state and calls @client.stopped when stopped' do
+  it 'puts itself in the stopped state and calls @client.unbind when unbound' do
     @client = mock()
     @client.expects(:unbind).at_least_once
 
@@ -95,7 +154,6 @@ describe 'Blather::Stream::Client' do
   it 'will be in the negotiating state during feature negotiations' do
     state = nil
     @client = mock()
-    @client.stubs(:post_init)
     @client.expects(:receive_data).with do |n|
       EM.stop
       state.must_equal(:negotiated) && @stream.negotiating?.must_equal(false)
@@ -111,7 +169,7 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :negotiated
-        @stream.negotiating?.must_equal(true)
+        @stream.negotiating?.must_equal true
         server.send_data "<iq from='d' type='result' id='#{val[/id="([^"]+)"/,1]}' />"
         server.send_data "<message to='a@b/c' from='d@e/f' type='chat' xml:lang='en'><body>Message!</body></message>"
         true
@@ -186,13 +244,36 @@ describe 'Blather::Stream::Client' do
     end
   end
 
+  it 'skips features it is unable to handle' do
+    state = nil
+    mocked_server() do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><auth xmlns='http://jabber.org/features/iq-auth'/><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        EM.stop
+        val.must_match(/starttls/)
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
   it 'starts TLS when asked' do
     state = nil
     mocked_server(3) do |val, server|
       case state
       when nil
         state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
         val.must_match(/stream:stream/)
 
       when :started
@@ -216,7 +297,7 @@ describe 'Blather::Stream::Client' do
   it 'will fail if TLS negotiation fails' do
     state = nil
     @client = mock()
-    @client.expects(:receive_data).with { |v| v.must_be_kind_of TLSFailure }
+    @client.expects(:receive_data).with { |v| v.must_be_kind_of Blather::Stream::TLS::TLSFailure }
     mocked_server(3) do |val, server|
       case state
       when nil
@@ -246,14 +327,14 @@ describe 'Blather::Stream::Client' do
     state = nil
     @client = mock()
     @client.expects(:receive_data).with do |v|
-      v.must_be_kind_of UnknownResponse
-      v.node.element_name.must_equal 'foo-bar'
+      v.must_be_kind_of Blather::Stream::TLS::TLSFailure
     end
     mocked_server(3) do |val, server|
       case state
       when nil
         state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
         val.must_match(/stream:stream/)
 
       when :started
@@ -368,9 +449,9 @@ describe 'Blather::Stream::Client' do
     end
   end
 
-  it 'connects via ANONYMOUS if the JID has a blank node' do
+  it 'connects via ANONYMOUS if the Blather::JID has a blank node' do
     state = nil
-    @jid = JID.new '@d'
+    @jid = Blather::JID.new '@d'
 
     mocked_server(3) do |val, server|
       case state
@@ -397,11 +478,37 @@ describe 'Blather::Stream::Client' do
     end
   end
 
+  it 'fails if asked to connect via ANONYMOUS but the server does not support it' do
+    state = nil
+    @jid = Blather::JID.new '@d'
+    @client = mock()
+    @client.expects(:receive_data).with { |s| s.must_be_instance_of Blather::BlatherError }
+
+    mocked_server(2) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism></mechanisms></stream:features>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        EM.stop
+        val.must_match(/stream:stream/)
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
   it 'tries each possible mechanism until it fails completely' do
     state = nil
     @client = mock()
     @client.expects(:receive_data).with do |n|
-      n.must_be_kind_of(SASLError)
+      n.must_be_kind_of(Blather::SASLError)
       n.name.must_equal :not_authorized
     end
 
@@ -409,7 +516,8 @@ describe 'Blather::Stream::Client' do
       case state
       when nil
         state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
         val.must_match(/stream:stream/)
 
       when :started
@@ -471,9 +579,37 @@ describe 'Blather::Stream::Client' do
     end
   end
 
+  it 'will ignore methods it does not understand' do
+    state = nil
+    mocked_server(3) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>CRAM-MD5</mechanism><mechanism>PLAIN</mechanism></mechanisms></stream:features>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        state = :auth_sent
+        server.send_data "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />"
+        val.must_equal('<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="PLAIN">bkBkAG4AcGFzcw==</auth>')
+
+      when :auth_sent
+        EM.stop
+        state = :complete
+        val.must_match(/stream:stream/)
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+=begin
   it 'sends client an error when an unknown mechanism is sent' do
     @client = mock()
-    @client.expects(:receive_data).with { |v| v.must_be_kind_of(Stream::SASL::UnknownMechanism) }
+    @client.expects(:receive_data).with { |v| v.must_be_kind_of(Blather::Stream::SASL::UnknownMechanism) }
     started = false
     mocked_server(2) do |val, server|
       if !started
@@ -489,7 +625,7 @@ describe 'Blather::Stream::Client' do
       end
     end
   end
-
+=end
   %w[ aborted
       incorrect-encoding
       invalid-authzid
@@ -533,7 +669,7 @@ describe 'Blather::Stream::Client' do
   it 'fails when an unkown node comes through during SASL negotiation' do
     @client = mock()
     @client.expects(:receive_data).with do |n|
-      n.must_be_instance_of UnknownResponse
+      n.must_be_instance_of Blather::UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
     state = nil
@@ -566,13 +702,14 @@ describe 'Blather::Stream::Client' do
     state = nil
     class Client; attr_accessor :jid; end
     @client = Client.new
-    @jid = JID.new('n@d')
+    @jid = Blather::JID.new('n@d')
 
     mocked_server(3) do |val, server|
       case state
       when nil
         state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
         val.must_match(/stream:stream/)
 
       when :started
@@ -584,7 +721,7 @@ describe 'Blather::Stream::Client' do
 
       when :complete
         EM.stop
-        @client.jid.must_equal JID.new('n@d/server_resource')
+        @client.jid.must_equal Blather::JID.new('n@d/server_resource')
 
       else
         EM.stop
@@ -598,7 +735,7 @@ describe 'Blather::Stream::Client' do
     state = nil
     class Client; attr_accessor :jid; end
     @client = Client.new
-    @jid = JID.new('n@d/r')
+    @jid = Blather::JID.new('n@d/r')
 
     mocked_server(3) do |val, server|
       case state
@@ -609,14 +746,47 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :complete
-        val =~ %r{<iq[^>]+id="([^"]+)"}
-        server.send_data "<iq type='result' id='#{$1}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><jid>#{@jid}</jid></bind></iq>"
+        doc = parse_stanza val
+        doc.xpath('/iq/bind_ns:bind/bind_ns:resource[.="r"]', :bind_ns => Blather::Stream::Resource::BIND_NS).wont_be_empty
+
+        server.send_data "<iq type='result' id='#{doc.find_first('iq')['id']}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><jid>#{@jid}</jid></bind></iq>"
         server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
-        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>r</resource></bind>})
 
       when :complete
         EM.stop
-        @client.jid.must_equal JID.new('n@d/r')
+        @client.jid.must_equal Blather::JID.new('n@d/r')
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
+  it 'will error out if the bind ID mismatches' do
+    state = nil
+    @jid = Blather::JID.new('n@d')
+    @client = mock()
+
+    mocked_server(3) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        state = :complete
+        val =~ %r{<iq[^>]+id="([^"]+)"}
+        @client.expects(:receive_data).with("BIND result ID mismatch. Expected: #{$1}. Received: #{$1}-bad")
+        server.send_data "<iq type='result' id='#{$1}-bad'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><jid>#{@jid}/server_resource</jid></bind></iq>"
+        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"\s?/>})
+
+      when :complete
+        EM.stop
+        true
 
       else
         EM.stop
@@ -641,9 +811,9 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :complete
-        val =~ %r{<iq[^>]+id="([^"]+)"}
-        server.send_data "<iq type='error' id='#{$1}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><resource>r</resource></bind><error type='modify'><bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></iq>"
-        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>r</resource></bind>})
+        doc = parse_stanza val
+        doc.xpath('/iq/bind_ns:bind/bind_ns:resource[.="r"]', :bind_ns => Blather::Stream::Resource::BIND_NS).wont_be_empty
+        server.send_data "<iq type='error' id='#{doc.find_first('iq')['id']}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><resource>r</resource></bind><error type='modify'><bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></iq>"
 
       when :complete
         EM.stop
@@ -661,21 +831,22 @@ describe 'Blather::Stream::Client' do
     state = nil
     @client = mock()
     @client.expects(:receive_data).with do |n|
-      n.must_be_instance_of UnknownResponse
+      n.must_be_instance_of Blather::UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
     mocked_server(3) do |val, server|
       case state
       when nil
         state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
+        server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
         val.must_match(/stream:stream/)
 
       when :started
         state = :complete
-        val =~ %r{<iq[^>]+id="([^"]+)"}
+        doc = parse_stanza val
+        doc.xpath('/iq/bind_ns:bind/bind_ns:resource[.="r"]', :bind_ns => Blather::Stream::Resource::BIND_NS).wont_be_empty
         server.send_data "<foo-bar />"
-        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>r</resource></bind>})
 
       when :complete
         EM.stop
@@ -704,9 +875,10 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :completed
-        server.send_data "<iq from='d' type='result' id='#{val[/id="([^"]+)"/,1]}' />"
+        doc = parse_stanza val
+        doc.find('/iq[@type="set" and @to="d"]/sess_ns:session', :sess_ns => Blather::Stream::Session::SESSION_NS).wont_be_empty
+        server.send_data "<iq from='d' type='result' id='#{doc.find_first('iq')['id']}' />"
         server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
-        val.must_match(%r{<iq id="[^"]+" type="set" to="d"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"\s?/></iq>})
 
       when :completed
         EM.stop
@@ -736,8 +908,9 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :completed
-        server.send_data "<iq from='d' type='error' id='#{val[/id="([^"]+)"/,1]}'><session xmlns='urn:ietf:params:xml:ns:xmpp-session'/><error type='wait'><internal-server-error xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></iq>"
-        val.must_match(%r{<iq id="[^"]+" type="set" to="d"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"\s?/></iq>})
+        doc = parse_stanza val
+        doc.find('/iq[@type="set" and @to="d"]/sess_ns:session', :sess_ns => Blather::Stream::Session::SESSION_NS).wont_be_empty
+        server.send_data "<iq from='d' type='error' id='#{doc.find_first('iq')['id']}'><session xmlns='urn:ietf:params:xml:ns:xmpp-session'/><error type='wait'><internal-server-error xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error></iq>"
 
       when :completed
         EM.stop
@@ -755,7 +928,7 @@ describe 'Blather::Stream::Client' do
     state = nil
     @client = mock()
     @client.expects(:receive_data).with do |n|
-      n.must_be_instance_of UnknownResponse
+      n.must_be_instance_of Blather::UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
     mocked_server(3) do |val, server|
@@ -768,8 +941,9 @@ describe 'Blather::Stream::Client' do
 
       when :started
         state = :completed
+        doc = parse_stanza val
+        doc.find('/iq[@type="set" and @to="d"]/sess_ns:session', :sess_ns => Blather::Stream::Session::SESSION_NS).wont_be_empty
         server.send_data '<foo-bar />'
-        val.must_match(%r{<iq id="[^"]+" type="set" to="d"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"\s?/></iq>})
 
       when :completed
         EM.stop
@@ -783,42 +957,10 @@ describe 'Blather::Stream::Client' do
     end
   end
 
-  it 'sends the client a warning on parse warning' do
-    @client = mock()
-    @client.expects(:receive_data).with do |v|
-      EM.stop
-      v.must_be_kind_of ParseWarning
-      v.message.must_match(/vcard\-temp/)
-    end
-    state = nil
-    mocked_server(2) do |val, server|
-      case state
-      when nil
-        state = :started
-        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>"
-        server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
-        val.must_match(/stream:stream/)
-
-      when :started
-        server.send_data <<-XML
-          <iq xmlns="jabber:client" to="utterance.localhost" type="get" id="2590">
-            <vCard xmlns="vcard-temp" />
-          </iq>
-        XML
-        true
-
-      else
-        EM.stop
-        false
-
-      end
-    end
-  end
-
-  it 'sends client an error on parse error' do
+  it 'sends client an error and reply to the server on parse error' do
     @client = mock()
     @client.expects(:receive_data).with do |v|
-      v.must_be_kind_of ParseError
+      v.must_be_kind_of Blather::ParseError
       v.message.must_match(/generate\-parse\-error/)
     end
     state = nil
@@ -845,4 +987,5 @@ describe 'Blather::Stream::Client' do
       end
     end
   end
+
 end