blather 0.4.15 → 0.4.16

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 require 'blather/client/dsl'
 
 describe Blather::DSL::PubSub do

data/spec/blather/client/dsl_spec.rb

@@ -1,9 +1,12 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 require 'blather/client/dsl'
 
 describe Blather::DSL do
   before do
-    @client = mock()
+    @client = Blather::Client.new
+    @stream = mock()
+    @stream.stubs(:send)
+    @client.post_init @stream, Blather::JID.new('n@d/r')
     @dsl = Class.new { include Blather::DSL }.new
     Blather::Client.stubs(:new).returns(@client)
   end
@@ -95,7 +98,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 { |n| n.to_s.must_equal Blather::Stanza::Message.new(to, msg).to_s }
+    @client.expects(:write).with Blather::Stanza::Message.new(to, msg)
     @dsl.say to, msg
   end
 
@@ -111,7 +114,7 @@ describe Blather::DSL do
     expected_stanza = Blather::Stanza::Disco::DiscoItems.new
     expected_stanza.to = who
     expected_stanza.node = where
-    @client.expects(:write).with { |n| n.to_s.must_equal expected_stanza.to_s }
+    @client.expects(:write).with expected_stanza
     @dsl.discover what, who, where
   end
 
@@ -122,10 +125,87 @@ describe Blather::DSL do
     expected_stanza = Blather::Stanza::Disco::DiscoInfo.new
     expected_stanza.to = who
     expected_stanza.node = where
-    @client.expects(:write).with { |n| n.to_s.must_equal expected_stanza.to_s }
+    @client.expects(:write).with expected_stanza
     @dsl.discover what, who, where
   end
 
+  it 'provides a caps set helper' do
+    @dsl.must_respond_to :set_caps
+    node = 'http://code.google.com/p/exodus'
+    identities = [Blather::Stanza::Iq::DiscoInfo::Identity.new({:name => 'Exodus 0.9.1', :type => 'pc', :category => 'client'})]
+    features = %w{
+                  http://jabber.org/protocol/caps
+                  http://jabber.org/protocol/disco#info
+                  http://jabber.org/protocol/disco#items
+                  http://jabber.org/protocol/muc
+                }
+    @dsl.set_caps node, identities, features
+    @client.caps.node.must_equal "#{node}##{@client.caps.ver}"
+    @client.caps.identities.must_equal identities
+    @client.caps.features.map{ |f| f.var }.must_equal features
+  end
+
+  it 'provides a caps send helper' do
+    @dsl.must_respond_to :send_caps
+    @client.caps.node = 'http://code.google.com/p/exodus'
+    @client.caps.identities = [Blather::Stanza::Iq::DiscoInfo::Identity.new({:name => 'Exodus 0.9.1', :type => 'pc', :category => 'client'})]
+    @client.caps.features = %w{
+                          http://jabber.org/protocol/caps
+                          http://jabber.org/protocol/disco#info
+                          http://jabber.org/protocol/disco#items
+                          http://jabber.org/protocol/muc
+                        }
+    expected_stanza = Blather::Stanza.import(parse_stanza(<<-XML).root)
+      <presence>
+        <c xmlns="http://jabber.org/protocol/caps" hash="sha-1"
+           node="http://code.google.com/p/exodus"
+           ver="QgayPKawpkPSDYmwT/WM94uAlu0="
+        />
+      </presence>
+    XML
+    @client.expects(:write).with expected_stanza
+    @client.expects(:register_handler).with(:disco_info, :type => :get, :node => "http://code.google.com/p/exodus#QgayPKawpkPSDYmwT/WM94uAlu0=")
+    @dsl.send_caps
+  end
+
+  it 'responds with correct disco stanza after sending caps and receiving query' do
+    @client.caps.node = 'http://code.google.com/p/exodus'
+    @client.caps.identities = [Blather::Stanza::Iq::DiscoInfo::Identity.new({:name => 'Exodus 0.9.1', :type => 'pc', :category => 'client'})]
+    @client.caps.features = %w{
+                          http://jabber.org/protocol/caps
+                          http://jabber.org/protocol/disco#info
+                          http://jabber.org/protocol/disco#items
+                          http://jabber.org/protocol/muc
+                        }
+    stanza = <<-XML
+      <iq from='juliet@capulet.lit/chamber'
+          id='disco1'
+          to='romeo@montague.lit/orchard'
+          type='get'>
+        <query xmlns='http://jabber.org/protocol/disco#info'
+               node='http://code.google.com/p/exodus#QgayPKawpkPSDYmwT/WM94uAlu0='/>
+      </iq>
+    XML
+    @stanza = Blather::Stanza.import(parse_stanza(stanza).root)
+
+    expected_stanza = Blather::Stanza.import(parse_stanza(<<-XML).root)
+      <iq type="result" id="disco1" to="juliet@capulet.lit/chamber">
+        <query xmlns="http://jabber.org/protocol/disco#info" node="http://code.google.com/p/exodus#QgayPKawpkPSDYmwT/WM94uAlu0=">
+          <identity name="Exodus 0.9.1" category="client" type="pc"/>
+          <feature var="http://jabber.org/protocol/caps"/>
+          <feature var="http://jabber.org/protocol/disco#info"/>
+          <feature var="http://jabber.org/protocol/disco#items"/>
+          <feature var="http://jabber.org/protocol/muc"/>
+        </query>
+      </iq>
+    XML
+    @dsl.send_caps
+    # client writes a Client::Cap object but it's the same as a DiscoInfo
+    # this is a hack to pass the same-class check in XMPPNode#eql?
+    @client.expects(:write).with { |n| Blather::Stanza.import(n) == expected_stanza }
+    @client.receive_data @stanza
+  end
+
   Blather::Stanza.handler_list.each do |handler_method|
     it "provides a helper method for #{handler_method}" do
       guards = [:chat?, {:body => 'exit'}]

data/spec/blather/core_ext/nokogiri_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe 'Nokogiri::XML::Node' do
   before { @doc = Nokogiri::XML::Document.new }

data/spec/blather/errors/sasl_error_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def sasl_error_node(err_name = 'aborted')
   node = Blather::XMPPNode.new 'failure'

data/spec/blather/errors/stanza_error_spec.rb

@@ -1,11 +1,11 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def stanza_error_node(type = 'cancel', error = 'internal-server-error', msg = nil)
   node = Blather::Stanza::Message.new 'error@jabber.local', 'test message', :error
 
   node << (error_node = Blather::XMPPNode.new('error'))
   error_node['type'] = type.to_s
-  
+
   error_node << (err = Blather::XMPPNode.new(error, error_node.document))
   err.namespace = 'urn:ietf:params:xml:ns:xmpp-stanzas'
 

data/spec/blather/errors/stream_error_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def stream_error_node(error = 'internal-server-error', msg = nil)
   node = Blather::XMPPNode.new('error')
   node.namespace = {'stream' => Blather::Stream::STREAM_NS}
-  
+
   node << (err = Blather::XMPPNode.new(error, node.document))
   err.namespace = 'urn:ietf:params:xml:ns:xmpp-streams'
 

data/spec/blather/errors_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::BlatherError do
   it 'is handled by :error' do

data/spec/blather/file_transfer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 require 'blather/client/dsl'
 
 module MockFileReceiver
@@ -97,4 +97,4 @@ describe Blather::FileTransfer do
     transfer = Blather::FileTransfer.new(@client, iq)
     transfer.decline
   end
-end
+end

data/spec/blather/jid_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::JID do
   it 'does nothing if creaded from Blather::JID' do

data/spec/blather/roster_item_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::RosterItem do
   it 'can be initialized with Blather::JID' do

data/spec/blather/roster_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Roster do
   before do

data/spec/blather/stanza/discos/disco_info_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def disco_info_xml
   <<-XML
@@ -219,11 +219,6 @@ describe Blather::Stanza::Iq::DiscoInfo::Identity do
     n.xml_lang.must_equal 'de'
   end
 
-  it 'raises an error if equality is sent a non DiscoInfo::Identity object' do
-    a = Blather::Stanza::Iq::DiscoInfo::Identity.new(*%w[name type cat])
-    lambda { a == 'foo' }.must_raise RuntimeError
-  end
-
   it 'can determine equality' do
     a = Blather::Stanza::Iq::DiscoInfo::Identity.new(*%w[name type cat])
     a.must_equal Blather::Stanza::Iq::DiscoInfo::Identity.new(*%w[name type cat])
@@ -245,11 +240,6 @@ describe Blather::Stanza::Iq::DiscoInfo::Feature do
     n.var.must_equal 'foo'
   end
 
-  it 'raises an error if equality is sent a non DiscoInfo::Feature object' do
-    a = Blather::Stanza::Iq::DiscoInfo::Feature.new('var')
-    lambda { a == 'foo' }.must_raise RuntimeError
-  end
-
   it 'can determine equality' do
     a = Blather::Stanza::Iq::DiscoInfo::Feature.new('var')
     a.must_equal Blather::Stanza::Iq::DiscoInfo::Feature.new('var')

data/spec/blather/stanza/discos/disco_items_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def disco_items_xml
   <<-XML
@@ -146,11 +146,6 @@ describe Blather::Stanza::Iq::DiscoItems::Item do
     n.name.must_equal 'Books by and about Shakespeare'
   end
 
-  it 'raises an error when compared against a non DiscoItems::Item' do
-    a = Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz')
-    lambda { a == 'test' }.must_raise RuntimeError
-  end
-
   it 'can determine equality' do
     a = Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz')
     a.must_equal Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz')

data/spec/blather/stanza/iq/command_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def command_xml
   <<-XML
@@ -90,7 +90,7 @@ describe Blather::Stanza::Iq::Command do
     c.action.must_equal :execute
     c.reply.action.must_equal nil
   end
-  
+
   it 'removes action on reply!' do
     c = Blather::XMPPNode.import parse_stanza(command_xml).root
     c.action.must_equal :execute
@@ -203,4 +203,4 @@ describe Blather::Stanza::Iq::Command do
     r.command.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).wont_be_empty
     r.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).must_be_empty
   end
-end
+end

data/spec/blather/stanza/iq/ibb_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def ibb_open_xml
 <<-XML
@@ -133,4 +133,4 @@ describe Blather::Stanza::Iq::Ibb::Close do
     reply = node.reply
     reply.close.must_be_nil
   end
-end
+end

data/spec/blather/stanza/iq/query_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stanza::Iq::Query do
   it 'registers itself' do

data/spec/blather/stanza/iq/roster_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def roster_xml
 <<-XML

data/spec/blather/stanza/iq/s5b_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def s5b_open_xml
 <<-XML
@@ -57,4 +57,4 @@ describe Blather::Stanza::Iq::S5b do
     node.streamhost_used = 'used@example.com/foo'
     node.streamhost_used.jid.to_s.must_equal 'used@example.com/foo'
   end
-end
+end

data/spec/blather/stanza/iq/si_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def si_xml
 <<-XML
@@ -98,4 +98,4 @@ describe Blather::Stanza::Iq::Si::Si::File do
     file.desc = 'This is a test. If this were a real file...'
     file.desc.must_equal 'This is a test. If this were a real file...'
   end
-end
+end

data/spec/blather/stanza/iq/vcard_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def vcard_xml
 <<-XML
@@ -44,7 +44,7 @@ describe Blather::Stanza::Iq::Vcard do
     new_vcard["NICKNAME"] = 'Mercutio'
 
     query.vcard = new_vcard
-    
+
     query.xpath('ns:vCard', :ns => 'vcard-temp').size.must_equal 1
     query.find_first('ns:vCard/ns:NICKNAME', :ns => 'vcard-temp').content.must_equal 'Mercutio'
   end
@@ -93,4 +93,4 @@ describe Blather::Stanza::Iq::Vcard::Vcard do
     query.vcard['NICKNAME'] = 'Mercutio'
     query.vcard['NICKNAME'].must_equal 'Mercutio'
   end
-end
+end

data/spec/blather/stanza/iq_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stanza::Iq do
   it 'registers itself' do

data/spec/blather/stanza/message_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def ichat_message_xml
   <<-XML
@@ -245,4 +245,4 @@ describe Blather::Stanza::Message do
     r.form
     r.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).wont_be_empty
   end
-end
+end

data/spec/blather/stanza/presence/c_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+def c_xml
+  <<-XML
+    <presence from='bard@shakespeare.lit/globe'>
+      <c xmlns='http://jabber.org/protocol/caps'
+         hash='sha-1'
+         node='http://www.chatopus.com'
+         ver='zHyEOgxTrkpSdGcQKH8EFPLsriY='/>
+    </presence>
+  XML
+end
+
+describe 'Blather::Stanza::Presence::C' do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:c, 'http://jabber.org/protocol/caps' ).must_equal Blather::Stanza::Presence::C
+  end
+
+  it 'must be importable' do
+    c = Blather::XMPPNode.import(parse_stanza(c_xml).root).must_be_instance_of Blather::Stanza::Presence::C
+  end
+
+  it 'ensures hash is one of Blather::Stanza::Presence::C::VALID_HASH_TYPES' do
+    lambda { Blather::Stanza::Presence::C.new nil, nil, :invalid_type_name }.must_raise(Blather::ArgumentError)
+
+    Blather::Stanza::Presence::C::VALID_HASH_TYPES.each do |valid_hash|
+      c = Blather::Stanza::Presence::C.new nil, nil, valid_hash
+      c.hash.must_equal valid_hash.to_sym
+    end
+  end
+
+  it 'can set a hash on creation' do
+    c = Blather::Stanza::Presence::C.new nil, nil, :md5
+    c.hash.must_equal :md5
+  end
+
+  it 'can set a node on creation' do
+    c = Blather::Stanza::Presence::C.new 'http://www.chatopus.com'
+    c.node.must_equal 'http://www.chatopus.com'
+  end
+
+  it 'can set a ver on creation' do
+    c = Blather::Stanza::Presence::C.new nil, 'zHyEOgxTrkpSdGcQKH8EFPLsriY='
+    c.ver.must_equal 'zHyEOgxTrkpSdGcQKH8EFPLsriY='
+  end
+end

data/spec/blather/stanza/presence/status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stanza::Presence::Status do
   it 'registers itself' do

data/spec/blather/stanza/presence/subscription_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stanza::Presence::Subscription do
   it 'registers itself' do

data/spec/blather/stanza/presence_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stanza::Presence do
   it 'registers itself' do