sprsquish-blather 0.3.4 → 0.4.0

data/spec/blather/client/dsl/pubsub_spec.rb

@@ -0,0 +1,465 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require 'blather/client/dsl'
+
+describe Blather::DSL::PubSub do
+  before do
+    @host = 'host.name'
+    @pubsub = Blather::DSL::PubSub.new @host
+    @client = mock()
+    @client.stubs(:jid).returns Blather::JID.new('n@d/r')
+    Blather::DSL.stubs(:client).returns @client
+  end
+
+  it 'raises an error when trying to send a stanza without a host' do
+    @pubsub.host = nil
+    proc { @pubsub.affiliations }.must_raise RuntimeError
+  end
+
+  it 'requests affiliations' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Affiliations
+      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.affiliations
+  end
+
+  it 'requests affiliations from a specified host' do
+    host = 'another.host'
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Affiliations
+      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(host)
+      n.type.must_equal :get
+    end
+    @pubsub.affiliations host
+  end
+
+  it 'requests subscriptions' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Subscriptions
+      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.subscriptions
+  end
+
+  it 'requests subscriptions from a specified host' do
+    host = 'another.host'
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Subscriptions
+      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(host)
+      n.type.must_equal :get
+    end
+    @pubsub.subscriptions host
+  end
+
+  it 'requests nodes defaulting to "/"' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.nodes nil
+  end
+
+  it 'requests nodes from a specified host' do
+    host = 'another.host'
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(host)
+      n.type.must_equal :get
+    end
+    @pubsub.nodes nil, host
+  end
+
+  it 'requests nodes under a specified path' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/path/to/nodes']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.nodes '/path/to/nodes'
+  end
+
+  it 'requests information on a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::DiscoInfo
+      n.find("/iq/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::DiscoInfo.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.node '/path/to/node'
+  end
+
+  it 'requests all items from a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.items '/path/to/node'
+  end
+
+  it 'requests specific items from a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node'][ns:item[@id='item1']][ns:item[@id='item2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.items '/path/to/node', %w[item1 item2]
+  end
+
+  it 'requests some items from a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node' and @max_items='2']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :get
+    end
+    @pubsub.items '/path/to/node', nil, 2
+  end
+
+  it 'can publish items to a node with a hash' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[@id='id1' and .='payload1'] and ns:item[@id='id2' and .='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.publish '/path/to/node', {'id1' => 'payload1', 'id2' => 'payload2'}
+  end
+
+  it 'can publish items to a node with an array' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload1'] and ns:item[.='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.publish '/path/to/node', %w[payload1 payload2]
+  end
+
+  it 'can publish items to a node with a string' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.publish '/path/to/node', 'payload'
+  end
+
+  it 'can retract an item with an array' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Retract
+      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1'] and ns:item[@id='id2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.retract '/path/to/node', %w[id1 id2]
+  end
+
+  it 'can retract an item with a string' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Retract
+      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.retract '/path/to/node', 'id1'
+  end
+
+  it 'can subscribe to a node with the default jid' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.subscribe '/path/to/node'
+  end
+
+  it 'can subscribe to a node with a specified jid as a string' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.subscribe '/path/to/node', 'jid@d/r'
+  end
+
+  it 'can subscribe to a node with a specified jid as a Blather::JID' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.subscribe '/path/to/node', Blather::JID.new('jid@d/r')
+  end
+
+  it 'can unsubscribe to a node with the default jid' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.unsubscribe '/path/to/node'
+  end
+
+  it 'can unsubscribe to a node with a specified jid as a string' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.unsubscribe '/path/to/node', 'jid@d/r'
+  end
+
+  it 'can unsubscribe to a node with a specified jid as a Blather::JID' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.unsubscribe '/path/to/node', Blather::JID.new('jid@d/r')
+  end
+
+  it 'can purge a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSubOwner::Purge
+      n.find("/iq[@type='set']/ns:pubsub/ns:purge[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.purge '/path/to/node'
+  end
+
+  it 'can create a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSub::Create
+      n.find("/iq[@type='set']/ns:pubsub/ns:create[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.create '/path/to/node'
+  end
+
+  it 'can delete a node' do
+    @client.expects(:write_with_handler).with do |n|
+      n.must_be_instance_of Blather::Stanza::PubSubOwner::Delete
+      n.find("/iq[@type='set']/ns:pubsub/ns:delete[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
+      n.to.must_equal Blather::JID.new(@host)
+      n.type.must_equal :set
+    end
+    @pubsub.delete '/path/to/node'
+  end
+end
+
+describe 'Blather::DSL::PubSub callbacks' do
+  before do
+    @host = 'host.name'
+    @pubsub = Blather::DSL::PubSub.new @host
+    @client = Blather::Client.new
+    @client.jid = Blather::JID.new('n@d/r')
+    Blather::DSL.stubs(:client).returns @client
+  end
+
+  it 'returns a list of affiliations when requesting affiliations' do
+    affiliations = Blather::XMPPNode.import(parse_stanza(affiliations_xml).root)
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal affiliations.list }
+    @client.stubs(:write).with do |n|
+      affiliations.id = n.id
+      @client.receive_data affiliations
+      true
+    end
+    @pubsub.affiliations { |n| response.call n }
+  end
+
+  it 'returns a list of subscriptions when requesting subscriptions' do
+    subscriptions = Blather::XMPPNode.import(parse_stanza(subscriptions_xml).root)
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal subscriptions.list }
+    @client.stubs(:write).with do |n|
+      subscriptions.id = n.id
+      @client.receive_data subscriptions
+      true
+    end
+    @pubsub.subscriptions { |n| response.call n }
+  end
+
+  it 'returns a list of node items when requesting nodes' do
+    nodes = Blather::XMPPNode.import(parse_stanza(<<-NODES).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        to='francisco@denmark.lit/barracks'
+        id='nodes1'>
+      <query xmlns='http://jabber.org/protocol/disco#items'>
+        <item jid='pubsub.shakespeare.lit'
+              node='blogs'
+              name='Weblog updates'/>
+        <item jid='pubsub.shakespeare.lit'
+              node='news'
+              name='News and announcements'/>
+      </query>
+    </iq>
+    NODES
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal nodes.items }
+    @client.stubs(:write).with do |n|
+      nodes.id = n.id
+      @client.receive_data nodes
+      true
+    end
+    @pubsub.nodes { |n| response.call n }
+  end
+
+  it 'returns a DiscoInfo node when requesting a node' do
+    node = Blather::XMPPNode.import(parse_stanza(<<-NODES).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        to='francisco@denmark.lit/barracks'
+        id='meta1'>
+      <query xmlns='http://jabber.org/protocol/disco#info'
+             node='blogs'>
+        <identity category='pubsub' type='collection'/>
+      </query>
+    </iq>
+    NODES
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal node }
+    @client.stubs(:write).with do |n|
+      node.id = n.id
+      @client.receive_data node
+      true
+    end
+    @pubsub.node('blogs') { |n| response.call n }
+  end
+
+  it 'returns a set of items when requesting items' do
+    items = Blather::XMPPNode.import(parse_stanza(items_all_nodes_xml).root)
+    response = mock()
+    response.expects(:call).with { |n| n.map{|i|i.to_s}.must_equal items.items.map{|i|i.to_s} }
+    @client.stubs(:write).with do |n|
+      items.id = n.id
+      @client.receive_data items
+      true
+    end
+    @pubsub.items('princely_musings') { |n| response.call n }
+  end
+
+  it 'returns aa subscription node when subscribing' do
+    subscription = Blather::XMPPNode.import(parse_stanza(subscription_xml).root)
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal subscription }
+    @client.stubs(:write).with do |n|
+      subscription.id = n.id
+      @client.receive_data subscription
+      true
+    end
+    @pubsub.subscribe('princely_musings') { |n| response.call n }
+  end
+
+  it 'returns aa unsubscribe node when unsubscribing' do
+    unsubscribe = Blather::XMPPNode.import(parse_stanza(unsubscribe_xml).root)
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal unsubscribe }
+    @client.stubs(:write).with do |n|
+      unsubscribe.id = n.id
+      @client.receive_data unsubscribe
+      true
+    end
+    @pubsub.unsubscribe('princely_musings') { |n| response.call n }
+  end
+
+  it 'returns a publish result when publishing to a node' do
+    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        to='hamlet@denmark.lit/blogbot'
+        id='publish1'>
+      <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+        <publish node='princely_musings'>
+          <item id='ae890ac52d0df67ed7cfdf51b644e901'/>
+        </publish>
+      </pubsub>
+    </iq>
+    NODE
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal result }
+    @client.stubs(:write).with do |n|
+      result.id = n.id
+      @client.receive_data result
+      true
+    end
+    @pubsub.publish('princely_musings', 'payload') { |n| response.call n }
+  end
+
+  it 'returns a create result when creating a node' do
+    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        to='hamlet@denmark.lit/elsinore'
+        id='create2'>
+        <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+          <create node='25e3d37dabbab9541f7523321421edc5bfeb2dae'/>
+        </pubsub>
+    </iq>
+    NODE
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal result }
+    @client.stubs(:write).with do |n|
+      result.id = n.id
+      @client.receive_data result
+      true
+    end
+    @pubsub.create('princely_musings') { |n| response.call n }
+  end
+
+  it 'returns a purge result when purging a node' do
+    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        id='purge1'/>
+    NODE
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal result }
+    @client.stubs(:write).with do |n|
+      result.id = n.id
+      @client.receive_data result
+      true
+    end
+    @pubsub.purge('princely_musings') { |n| response.call n }
+  end
+
+  it 'returns a delete result when deleting a node' do
+    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    <iq type='result'
+        from='pubsub.shakespeare.lit'
+        id='delete1'/>
+    NODE
+    response = mock()
+    response.expects(:call).with { |n| n.must_equal result }
+    @client.stubs(:write).with do |n|
+      result.id = n.id
+      @client.receive_data result
+      true
+    end
+    @pubsub.delete('princely_musings') { |n| response.call n }
+  end
+end

data/spec/blather/client/dsl_spec.rb

@@ -1,11 +1,11 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 require 'blather/client/dsl'
 
-describe 'Blather::DSL' do
+describe Blather::DSL do
   before do
     @client = mock()
-    @dsl = class MockDSL; include Blather::DSL; end.new
-    Client.stubs(:new).returns(@client)
+    @dsl = Class.new { include Blather::DSL }.new
+    Blather::Client.stubs(:new).returns(@client)
   end
 
   it 'wraps the setup' do
@@ -55,6 +55,12 @@ describe 'Blather::DSL' do
     @dsl.my_roster
   end
 
+  it 'provides a << style writer that provides chaining' do
+    stanza = Blather::Stanza::Iq.new
+    @client.expects(:write).with stanza
+    (@dsl << stanza).must_equal @dsl
+  end
+
   it 'provides a writer' do
     stanza = Blather::Stanza::Iq.new
     @client.expects(:write).with stanza
@@ -64,7 +70,7 @@ describe 'Blather::DSL' do
   it 'provides a "say" helper' do
     to, msg = 'me@me.com', 'hello!'
     Blather::Stanza::Message.stubs(:next_id).returns 0
-    @client.expects(:write).with Blather::Stanza::Message.new(to, msg)
+    @client.expects(:write).with { |n| n.to_s.must_equal Blather::Stanza::Message.new(to, msg).to_s }
     @dsl.say to, msg
   end
 
@@ -80,7 +86,7 @@ describe 'Blather::DSL' do
     expected_stanza = Blather::Stanza::Disco::DiscoItems.new
     expected_stanza.to = who
     expected_stanza.node = where
-    @client.expects(:write).with expected_stanza
+    @client.expects(:write).with { |n| n.to_s.must_equal expected_stanza.to_s }
     @dsl.discover what, who, where
   end
 
@@ -91,7 +97,7 @@ describe 'Blather::DSL' do
     expected_stanza = Blather::Stanza::Disco::DiscoInfo.new
     expected_stanza.to = who
     expected_stanza.node = where
-    @client.expects(:write).with expected_stanza
+    @client.expects(:write).with { |n| n.to_s.must_equal expected_stanza.to_s }
     @dsl.discover what, who, where
   end
 
@@ -102,4 +108,11 @@ describe 'Blather::DSL' do
       @dsl.__send__(handler_method, *guards)
     end
   end
+
+  it 'has a pubsub helper set to the jid domain' do
+    jid = Blather::JID.new('jid@domain/resource')
+    @client.stubs(:jid).returns jid
+    @dsl.pubsub.must_be_instance_of Blather::DSL::PubSub
+    @dsl.pubsub.host.must_equal jid.domain
+  end
 end

data/spec/blather/core_ext/nokogiri_spec.rb

@@ -0,0 +1,83 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+
+describe 'Nokogiri::XML::Node' do
+  before { @doc = Nokogiri::XML::Document.new }
+
+  it 'aliases #name to #element_name' do
+    node = Nokogiri::XML::Node.new 'foo', @doc
+    node.must_respond_to :element_name
+    node.element_name.must_equal node.name
+  end
+
+  it 'aliases #name= to #element_name=' do
+    node = Nokogiri::XML::Node.new 'foo', @doc
+    node.must_respond_to :element_name=
+    node.element_name.must_equal node.name
+    node.element_name = 'bar'
+    node.element_name.must_equal 'bar'
+  end
+
+  it 'allows symbols as hash keys for attributes' do
+    attrs = Nokogiri::XML::Node.new('foo', @doc)
+    attrs['foo'] = 'bar'
+
+    attrs['foo'].must_equal 'bar'
+    attrs[:foo].must_equal 'bar'
+  end
+
+  it 'ensures a string is passed to the attribute setter' do
+    attrs = Nokogiri::XML::Node.new('foo', @doc)
+    attrs[:foo] = 1
+    attrs[:foo].must_equal '1'
+
+    attrs[:jid] = Blather::JID.new('n@d/r')
+    attrs[:jid].must_equal 'n@d/r'
+  end
+
+  it 'removes an attribute when set to nil' do
+    attrs = Nokogiri::XML::Node.new('foo', @doc)
+    attrs['foo'] = 'bar'
+
+    attrs['foo'].must_equal 'bar'
+    attrs['foo'] = nil
+    attrs['foo'].must_be_nil
+  end
+
+  it 'allows attribute values to change' do
+    attrs = Nokogiri::XML::Node.new('foo', @doc)
+    attrs['foo'] = 'bar'
+
+    attrs['foo'].must_equal 'bar'
+    attrs['foo'] = 'baz'
+    attrs['foo'].must_equal 'baz'
+  end
+
+  it 'allows symbols as the path in #xpath' do
+    node = Nokogiri::XML::Node.new('foo', @doc)
+    node.must_respond_to :find
+    @doc.root = node
+    @doc.xpath(:foo).first.wont_be_nil
+    @doc.xpath(:foo).first.must_equal @doc.xpath('/foo').first
+  end
+
+  it 'allows symbols as namespace names in #xpath' do
+    node = Nokogiri::XML::Node.new('foo', @doc)
+    node.namespace = node.add_namespace('bar', 'baz')
+    @doc.root = node
+    node.xpath('/bar:foo', :bar => 'baz').first.wont_be_nil
+  end
+
+  it 'aliases #xpath to #find' do
+    node = Nokogiri::XML::Node.new('foo', @doc)
+    node.must_respond_to :find
+    @doc.root = node
+    node.find('/foo').first.wont_be_nil
+  end
+
+  it 'has a helper function #find_first' do
+    node = Nokogiri::XML::Node.new('foo', @doc)
+    node.must_respond_to :find
+    @doc.root = node
+    node.find_first('/foo').must_equal node.find('/foo').first
+  end
+end

data/spec/blather/errors/sasl_error_spec.rb

@@ -1,18 +1,18 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 
 def sasl_error_node(err_name = 'aborted')
-  node = XMPPNode.new 'failure'
-  node.namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
+  node = Blather::XMPPNode.new 'failure'
+  node.namespace = Blather::SASLError::SASL_ERR_NS
 
-  node << XMPPNode.new(err_name)
+  node << Blather::XMPPNode.new(err_name, node.document)
   node
 end
 
-describe 'Blather::SASLError' do
+describe Blather::SASLError do
   it 'can import a node' do
-    SASLError.must_respond_to :import
-    e = SASLError.import sasl_error_node
-    e.must_be_kind_of SASLError
+    Blather::SASLError.must_respond_to :import
+    e = Blather::SASLError.import sasl_error_node
+    e.must_be_kind_of Blather::SASLError
   end
 
   describe 'each XMPP SASL error type' do
@@ -25,7 +25,7 @@ describe 'Blather::SASLError' do
         temporary-auth-failure
     ].each do |error_type|
       it "handles the name for #{error_type}" do
-        e = SASLError.import sasl_error_node(error_type)
+        e = Blather::SASLError.import sasl_error_node(error_type)
         e.name.must_equal error_type.gsub('-','_').to_sym
       end
     end