shingara-blather 0.4.9 → 0.4.14

data/lib/blather/stream.rb

@@ -113,8 +113,9 @@ module Blather
     #
     # @param [#to_xml, #to_s] stanza the stanza to send over the wire
     def send(stanza)
-      Blather.logger.debug "SENDING: (#{caller[1]}) #{stanza}"
-      send_data stanza.respond_to?(:to_xml) ? stanza.to_xml : stanza.to_s
+      data = stanza.respond_to?(:to_xml) ? stanza.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML) : stanza.to_s
+      Blather.logger.debug "SENDING: (#{caller[1]}) #{data}"
+      send_data data
     end
 
     # Called by EM.connect to initialize stream variables

data/lib/blather/stream/parser.rb

@@ -16,6 +16,7 @@ class Stream # :nodoc:
       @namespaces = {}
       @namespace_definitions = []
       @parser = Nokogiri::XML::SAX::PushParser.new self
+      @parser.options = Nokogiri::XML::ParseOptions::DEFAULT_XML
     end
 
     def receive_data(string)
@@ -37,11 +38,6 @@ class Stream # :nodoc:
         node[attr.localname] = attr.value
       end
 
-      if !@receiver.stopped?
-        @current << node if @current
-        @current = node
-      end
-
       ns_keys = namespaces.map { |pre, href| pre }
       namespaces.delete_if { |pre, href| NS_TO_IGNORE.include? href }
       @namespace_definitions.push []
@@ -53,6 +49,11 @@ class Stream # :nodoc:
       @namespaces[[prefix, uri]] ||= node.add_namespace(prefix, uri) if prefix && !ns_keys.include?(prefix)
       node.namespace = @namespaces[[prefix, uri]]
 
+      if !@receiver.stopped?
+        @current << node if @current
+        @current = node
+      end
+
       deliver(node) if elem == 'stream'
 
       # $stderr.puts "\n\n"

data/lib/blather/xmpp_node.rb

@@ -33,7 +33,7 @@ module Blather
     # @return [Class, nil] the class appropriate for the name/ns combination
     def self.class_from_registration(name, ns = nil)
       name = name.to_s
-      @@registrations[[name, ns]] || @@registrations[[name, nil]]
+      @@registrations[[name, ns]]
     end
 
     # Import an XML::Node to the appropriate class

data/spec/blather/roster_item_spec.rb

@@ -65,7 +65,19 @@ describe Blather::RosterItem do
 
   it 'returns status based on priority' do
     setup_item_with_presences
-    @i.status.must_equal @p2
+    @i.status.must_equal @p3
+  end
+
+  it 'returns status based on priority and state' do
+    setup_item_with_presences
+
+    @p4 = Blather::Stanza::Presence::Status.new
+    @p4.type = :unavailable
+    @p4.from = 'n@d/d'
+    @p4.priority = 15
+    @i.status = @p4
+
+    @i.status.must_equal @p3
   end
 
   it 'returns status based on resource' do
@@ -85,12 +97,38 @@ describe Blather::RosterItem do
     @p2.from = 'n@d/b'
     @p2.priority = -1
 
+    @p3 = Blather::Stanza::Presence::Status.new(:dnd)
+    @p3.from = 'n@d/c'
+    @p3.priority = 10
+
     @i.status = @p
     @i.status = @p2
+    @i.status = @p3
+  end
+
+  it 'removes old unavailable presences' do
+    setup_item_with_presences
+
+    50.times do |i|
+      p = Blather::Stanza::Presence::Status.new
+      p.type = :unavailable
+      p.from = "n@d/#{i}"
+      @i.status = p
+    end
+
+    @i.statuses.size.must_equal 4
   end
 
   it 'initializes groups to [nil] if the item is not part of a group' do
     i = Blather::RosterItem.new 'n@d'
     i.groups.must_equal [nil]
   end
+
+  it 'can determine equality' do
+    item1 = Blather::RosterItem.new 'n@d'
+    item2 = Blather::RosterItem.new 'n@d'
+    item1.groups = %w[group1 group2]
+    item2.groups = %w[group1 group2]
+    (item1 == item2).must_equal true
+  end
 end

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

@@ -54,6 +54,29 @@ describe Blather::Stanza::Iq::DiscoInfo do
     n.to = 'to@jid.com'
     n.find("/iq[@to='to@jid.com' and @type='get' and @id='#{n.id}']/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::Iq::DiscoInfo.registered_ns).wont_be_empty
   end
+
+  it 'allows adding of identities' do
+    di = Blather::Stanza::Iq::DiscoInfo.new
+    di.identities.size.must_equal 0
+    di.identities = [{:name => 'name', :type => 'type', :category => 'category'}]
+    di.identities.size.must_equal 1
+    di.identities += [Blather::Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
+    di.identities.size.must_equal 2
+    di.identities = nil
+    di.identities.size.must_equal 0
+  end
+
+  it 'allows adding of features' do
+    di = Blather::Stanza::Iq::DiscoInfo.new
+    di.features.size.must_equal 0
+    di.features = ["feature1"]
+    di.features.size.must_equal 1
+    di.features += [Blather::Stanza::Iq::DiscoInfo::Feature.new("feature2")]
+    di.features.size.must_equal 2
+    di.features = nil
+    di.features.size.must_equal 0
+  end
+
 end
 
 describe 'Blather::Stanza::Iq::DiscoInfo identities' do

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

@@ -102,6 +102,17 @@ describe Blather::Stanza::Iq::DiscoItems do
     di.items.size.must_equal 2
     di.items.each { |i| control.include?(i).must_equal true }
   end
+
+  it 'allows adding of items' do
+    di = Blather::Stanza::Iq::DiscoItems.new
+    di.items.size.must_equal 0
+    di.items = [{:jid => 'foo@bar/baz', :node => 'node', :name => 'name'}]
+    di.items.size.must_equal 1
+    di.items += [Blather::Stanza::Iq::DiscoItems::Item.new(*%w[foo@bar/baz node name])]
+    di.items.size.must_equal 2
+    di.items = nil
+    di.items.size.must_equal 0
+  end
 end
 
 describe Blather::Stanza::Iq::DiscoItems::Item do

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

@@ -0,0 +1,206 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+
+def command_xml
+  <<-XML
+  <iq type='result'
+      from='catalog.shakespeare.lit'
+      to='romeo@montague.net/orchard'
+      id='form2'>
+    <command xmlns='http://jabber.org/protocol/commands'
+             node='node1'
+             sessionid='dqjiodmqlmakm'>
+      <x xmlns='jabber:x:data' type='form'>
+        <field var='field-name' type='text-single' label='description' />
+      </x>
+    </command>
+  </iq>
+  XML
+end
+
+describe Blather::Stanza::Iq::Command do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:command, 'http://jabber.org/protocol/commands').must_equal Blather::Stanza::Iq::Command
+  end
+
+  it 'must be importable' do
+    Blather::XMPPNode.import(parse_stanza(command_xml).root).must_be_instance_of Blather::Stanza::Iq::Command
+  end
+
+  it 'ensures a command node is present on create' do
+    c = Blather::Stanza::Iq::Command.new
+    c.xpath('xmlns:command', :xmlns => Blather::Stanza::Iq::Command.registered_ns).wont_be_empty
+  end
+
+  it 'ensures a command node exists when calling #command' do
+    c = Blather::Stanza::Iq::Command.new
+    c.remove_children :command
+    c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns).must_be_empty
+
+    c.command.wont_be_nil
+    c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns).wont_be_empty
+  end
+
+  Blather::Stanza::Iq::Command::VALID_ACTIONS.each do |valid_action|
+    it "provides a helper (#{valid_action}?) for action #{valid_action}" do
+      Blather::Stanza::Iq::Command.new.must_respond_to :"#{valid_action}?"
+    end
+  end
+
+  Blather::Stanza::Iq::Command::VALID_STATUS.each do |valid_status|
+    it "provides a helper (#{valid_status}?) for status #{valid_status}" do
+      Blather::Stanza::Iq::Command.new.must_respond_to :"#{valid_status}?"
+    end
+  end
+
+  Blather::Stanza::Iq::Command::VALID_NOTE_TYPES.each do |valid_note_type|
+    it "provides a helper (#{valid_note_type}?) for note_type #{valid_note_type}" do
+      Blather::Stanza::Iq::Command.new.must_respond_to :"#{valid_note_type}?"
+    end
+  end
+
+  [:cancel, :execute, :complete, :next, :prev].each do |action|
+    it "action can be set as \"#{action}\"" do
+      c = Blather::Stanza::Iq::Command.new nil, nil, action
+      c.action.must_equal action
+    end
+  end
+
+  [:get, :set, :result, :error].each do |type|
+    it "can be set as \"#{type}\"" do
+      c = Blather::Stanza::Iq::Command.new type
+      c.type.must_equal type
+    end
+  end
+
+  it 'sets type to "result" on reply' do
+    c = Blather::Stanza::Iq::Command.new
+    c.type.must_equal :set
+    reply = c.reply.type.must_equal :result
+  end
+
+  it 'sets type to "result" on reply!' do
+    c = Blather::Stanza::Iq::Command.new
+    c.type.must_equal :set
+    c.reply!
+    c.type.must_equal :result
+  end
+
+  it 'removes action on reply' do
+    c = Blather::XMPPNode.import parse_stanza(command_xml).root
+    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
+    c.reply!
+    c.action.must_equal nil
+  end
+
+  it 'can be registered under a namespace' do
+    class CommandNs < Blather::Stanza::Iq::Command; register :command_ns, nil, 'command:ns'; end
+    Blather::XMPPNode.class_from_registration(:command, 'command:ns').must_equal CommandNs
+    c_ns = CommandNs.new
+    c_ns.xpath('command').must_be_empty
+    c_ns.xpath('ns:command', :ns => 'command:ns').size.must_equal 1
+
+    c_ns.command
+    c_ns.command
+    c_ns.xpath('ns:command', :ns => 'command:ns').size.must_equal 1
+  end
+
+  it 'is constructed properly' do
+    n = Blather::Stanza::Iq::Command.new :set, "node", :execute
+    n.to = 'to@jid.com'
+    n.find("/iq[@to='to@jid.com' and @type='set' and @id='#{n.id}']/ns:command[@node='node' and @action='execute']", :ns => Blather::Stanza::Iq::Command.registered_ns).wont_be_empty
+  end
+
+  it 'has an action attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.action.must_equal :execute
+    n.action = :cancel
+    n.action.must_equal :cancel
+  end
+
+  it 'must default action to :execute on import' do
+    n = Blather::XMPPNode.import(parse_stanza(command_xml).root)
+    n.action.must_equal :execute
+  end
+
+  it 'has a status attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.status.must_equal :executing
+    n.status = :completed
+    n.status.must_equal :completed
+  end
+
+  it 'has a sessionid attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.sessionid.must_equal nil
+    n.sessionid = "somerandomstring"
+    n.sessionid.must_equal Digest::SHA1.hexdigest("somerandomstring")
+  end
+
+  it 'has a sessionid? attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.sessionid?.must_equal false
+    n.new_sessionid!
+    n.sessionid?.must_equal true
+  end
+
+  it 'has an allowed_actions attribute' do
+    n = Blather::XMPPNode.import parse_stanza(command_xml).root
+    n.allowed_actions.must_equal [:execute]
+    n.allowed_actions = [:next, :prev]
+    (n.allowed_actions - [:next, :prev, :execute]).must_be_empty
+    n.remove_allowed_actions!
+    n.allowed_actions.must_equal [:execute]
+    n.allowed_actions += [:next]
+    (n.allowed_actions - [:next, :execute]).must_be_empty
+
+    r = Blather::Stanza::Iq::Command.new
+    r.allowed_actions.must_equal [:execute]
+    r.allowed_actions += [:prev]
+    (r.allowed_actions - [:prev, :execute]).must_be_empty
+  end
+
+  it 'has a primary_allowed_action attribute' do
+    n = Blather::XMPPNode.import parse_stanza(command_xml).root
+    n.primary_allowed_action.must_equal :execute
+    n.primary_allowed_action = :next
+    n.primary_allowed_action.must_equal :next
+  end
+
+  it 'has a note_type attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.note_type.must_equal nil
+    n.note_type = :info
+    n.note_type.must_equal :info
+  end
+
+  it 'has a note_text attribute' do
+    n = Blather::Stanza::Iq::Command.new
+    n.note_text.must_equal nil
+    n.note_text = "Some text"
+    n.note_text.must_equal "Some text"
+  end
+
+  it 'makes a form child available' do
+    n = Blather::XMPPNode.import(parse_stanza(command_xml).root)
+    n.form.fields.size.must_equal 1
+    n.form.fields.map { |f| f.class }.uniq.must_equal [Blather::Stanza::X::Field]
+    n.form.must_be_instance_of Blather::Stanza::X
+
+    r = Blather::Stanza::Iq::Command.new
+    r.form.type = :form
+    r.form.type.must_equal :form
+  end
+
+  it 'ensures the form child is a child of command' do
+    r = Blather::Stanza::Iq::Command.new
+    r.form
+    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

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

@@ -0,0 +1,96 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+
+def vcard_xml
+<<-XML
+  <iq type="result" id="blather0007" to="romeo@example.net">
+    <vCard xmlns="vcard-temp">
+      <NICKNAME>Romeo</NICKNAME>
+    </vCard>
+  </iq>
+XML
+end
+
+describe Blather::Stanza::Iq::Vcard do
+  it 'registers itself' do
+    Blather::XMPPNode.class_from_registration(:vCard, 'vcard-temp').must_equal Blather::Stanza::Iq::Vcard
+  end
+
+  it 'can be imported' do
+    doc = parse_stanza vcard_xml
+    query = Blather::XMPPNode.import(doc.root)
+    query.must_be_instance_of Blather::Stanza::Iq::Vcard
+    query.vcard.must_be_instance_of Blather::Stanza::Iq::Vcard::Vcard
+  end
+
+  it 'ensures a vcard node is present on create' do
+    query = Blather::Stanza::Iq::Vcard.new
+    query.xpath('ns:vCard', :ns => 'vcard-temp').wont_be_empty
+  end
+
+  it 'ensures a vcard node exists when calling #vcard' do
+    query = Blather::Stanza::Iq::Vcard.new
+    query.vcard.remove
+    query.xpath('ns:vCard', :ns => 'vcard-temp').must_be_empty
+
+    query.vcard.wont_be_nil
+    query.xpath('ns:vCard', :ns => 'vcard-temp').wont_be_empty
+  end
+
+  it 'ensures a vcard node is replaced when calling #vcard=' do
+    doc = parse_stanza vcard_xml
+    query = Blather::XMPPNode.import(doc.root)
+
+    new_vcard = Blather::Stanza::Iq::Vcard::Vcard.new
+    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
+end
+
+describe Blather::Stanza::Iq::Vcard::Vcard do
+  it 'can set vcard elements' do
+    query = Blather::Stanza::Iq::Vcard.new :set
+    query.vcard['NICKNAME'] = 'Romeo'
+    query.find_first('ns:vCard/ns:NICKNAME', :ns => 'vcard-temp').content.must_equal 'Romeo'
+  end
+
+  it 'can set deep vcard elements' do
+    query = Blather::Stanza::Iq::Vcard.new :set
+    query.vcard['PHOTO/TYPE'] = 'image/png'
+    query.vcard['PHOTO/BINVAL'] = '===='
+    query.find_first('ns:vCard/ns:PHOTO', :ns => 'vcard-temp').children.size.must_equal 2
+    query.find_first('ns:vCard/ns:PHOTO', :ns => 'vcard-temp').children.detect { |n| n.element_name == 'TYPE' && n.content == 'image/png' }.wont_be_nil
+    query.find_first('ns:vCard/ns:PHOTO', :ns => 'vcard-temp').children.detect { |n| n.element_name == 'BINVAL' && n.content == '====' }.wont_be_nil
+  end
+
+  it 'can get vcard elements' do
+    query = Blather::Stanza::Iq::Vcard.new :set
+    query.vcard['NICKNAME'] = 'Romeo'
+    query.vcard['NICKNAME'].must_equal 'Romeo'
+  end
+
+  it 'can get deep vcard elements' do
+    query = Blather::Stanza::Iq::Vcard.new :set
+    query.vcard['PHOTO/TYPE'] = 'image/png'
+    query.vcard['PHOTO/BINVAL'] = '===='
+    query.vcard['PHOTO/TYPE'].must_equal 'image/png'
+    query.vcard['PHOTO/BINVAL'].must_equal '===='
+  end
+
+  it 'returns nil on vcard elements which does not exist' do
+    query = Blather::Stanza::Iq::Vcard.new :set
+    query.vcard['NICKNAME'] = 'Romeo'
+    query.vcard['FN'].must_be_nil
+  end
+
+  it 'can update vcard elements' do
+    doc = parse_stanza vcard_xml
+    query = Blather::XMPPNode.import(doc.root)
+    query.vcard['NICKNAME'].must_equal 'Romeo'
+    query.vcard['NICKNAME'] = 'Mercutio'
+    query.vcard['NICKNAME'].must_equal 'Mercutio'
+  end
+end