RubyGems - shingara-blather - Versions diffs - 0.4.9 → 0.4.14 - Mend

shingara-blather 0.4.9 → 0.4.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

data/README.md +15 -1
data/lib/blather.rb +5 -0
data/lib/blather/core_ext/nokogiri.rb +2 -0
data/lib/blather/roster.rb +3 -3
data/lib/blather/roster_item.rb +14 -3
data/lib/blather/stanza/disco/disco_info.rb +20 -2
data/lib/blather/stanza/disco/disco_items.rb +10 -1
data/lib/blather/stanza/iq/command.rb +324 -0
data/lib/blather/stanza/iq/vcard.rb +147 -0
data/lib/blather/stanza/message.rb +49 -5
data/lib/blather/stanza/presence/status.rb +11 -3
data/lib/blather/stanza/pubsub.rb +9 -21
data/lib/blather/stanza/x.rb +398 -0
data/lib/blather/stream.rb +3 -2
data/lib/blather/stream/parser.rb +6 -5
data/lib/blather/xmpp_node.rb +1 -1
data/spec/blather/roster_item_spec.rb +39 -1
data/spec/blather/stanza/discos/disco_info_spec.rb +23 -0
data/spec/blather/stanza/discos/disco_items_spec.rb +11 -0
data/spec/blather/stanza/iq/command_spec.rb +206 -0
data/spec/blather/stanza/iq/vcard_query_spec.rb +96 -0
data/spec/blather/stanza/message_spec.rb +89 -14
data/spec/blather/stanza/pubsub/retract_spec.rb +1 -1
data/spec/blather/stanza/pubsub_spec.rb +0 -5
data/spec/blather/stanza/x_spec.rb +235 -0
data/spec/blather/stream/client_spec.rb +14 -1
data/spec/blather/stream/parser_spec.rb +6 -0
data/spec/blather/xmpp_node_spec.rb +4 -3
data/spec/spec_helper.rb +28 -0
metadata +35 -5

data/spec/blather/stanza/message_spec.rb CHANGED

@@ -1,21 +1,28 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+def message_xml
+  <<-XML
+    <message
+        to='romeo@example.net'
+        from='juliet@example.com/balcony'
+        type='chat'
+        xml:lang='en'>
+      <body>Wherefore art thou, Romeo?</body>
+      <x xmlns='jabber:x:data' type='form'>
+        <field var='field-name' type='text-single' label='description' />
+      </x>
+      <paused xmlns="http://jabber.org/protocol/chatstates"/>
+    </message>
+  XML
+end
 describe Blather::Stanza::Message do
   it 'registers itself' do
     Blather::XMPPNode.class_from_registration(:message, nil).must_equal Blather::Stanza::Message
   end
   it 'must be importable' do
-    doc = parse_stanza <<-XML
-      <message
-          to='romeo@example.net'
-          from='juliet@example.com/balcony'
-          type='chat'
-          xml:lang='en'>
-        <body>Wherefore art thou, Romeo?</body>
-      </message>
-    XML
-    Blather::XMPPNode.import(doc.root).must_be_instance_of Blather::Stanza::Message
+    Blather::XMPPNode.import(parse_stanza(message_xml).root).must_be_instance_of Blather::Stanza::Message
   end
   it 'provides "attr_accessor" for body' do
@@ -103,8 +110,9 @@ describe Blather::Stanza::Message do
     msg = Blather::Stanza::Message.new
     msg << (h = Blather::XMPPNode.new('html', msg.document))
     h.namespace = Blather::Stanza::Message::HTML_NS
-    h << (b = Blather::XMPPNode.new('body', msg.document))
+    b = Blather::XMPPNode.new('body', msg.document)
     b.namespace = Blather::Stanza::Message::HTML_BODY_NS
+    h << b
     msg.xhtml_node.must_equal(b)
   end
@@ -113,14 +121,21 @@ describe Blather::Stanza::Message do
     msg = Blather::Stanza::Message.new
     xhtml = "<some>xhtml</some>"
     msg.xhtml = xhtml
-    msg.xhtml_node.content.strip.must_equal(xhtml)
+    msg.xhtml_node.inner_html.strip.must_equal(xhtml)
   end
   it 'sets valid xhtml even if the input is not valid' do
     msg = Blather::Stanza::Message.new
     xhtml = "<some>xhtml"
     msg.xhtml = xhtml
-    msg.xhtml_node.content.strip.must_equal("<some>xhtml</some>")
+    msg.xhtml_node.inner_html.strip.must_equal("<some>xhtml</some>")
+  end
+  it 'sets xhtml with more than one root node' do
+    msg = Blather::Stanza::Message.new
+    xhtml = "<i>xhtml</i> more xhtml"
+    msg.xhtml = xhtml
+    msg.xhtml_node.inner_html.strip.must_equal("<i>xhtml</i> more xhtml")
   end
   it 'has an xhtml getter' do
@@ -129,4 +144,64 @@ describe Blather::Stanza::Message do
     msg.xhtml = xhtml
     msg.xhtml.must_equal(xhtml)
   end
-end
+  it 'has a chat state setter' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :composing
+    msg.xpath('ns:composing', :ns => Blather::Stanza::Message::CHAT_STATE_NS).wont_be_empty
+  end
+  it 'will only add one chat state at a time' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :composing
+    msg.chat_state = :paused
+    msg.xpath('ns:*', :ns => Blather::Stanza::Message::CHAT_STATE_NS).size.must_equal(1)
+  end
+  it 'ensures chat state setter accepts strings' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = "gone"
+    msg.xpath('ns:gone', :ns => Blather::Stanza::Message::CHAT_STATE_NS).wont_be_empty
+  end
+  it 'ensures chat state is one of Blather::Stanza::Message::VALID_CHAT_STATES' do
+    lambda do
+      msg = Blather::Stanza::Message.new
+      msg.chat_state = :invalid_chat_state
+    end.must_raise(Blather::ArgumentError)
+    Blather::Stanza::Message::VALID_CHAT_STATES.each do |valid_chat_state|
+      msg = Blather::Stanza::Message.new
+      msg.chat_state = valid_chat_state
+      msg.chat_state.must_equal valid_chat_state
+    end
+  end
+  it 'has a chat state getter' do
+    msg = Blather::Stanza::Message.new
+    msg.chat_state = :paused
+    msg.chat_state.must_equal(:paused)
+  end
+  it 'imports correct chat state' do
+    Blather::XMPPNode.import(parse_stanza(message_xml).root).chat_state.must_equal :paused
+  end
+  it 'makes a form child available' do
+    n = Blather::XMPPNode.import(parse_stanza(message_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::Message.new
+    r.form.type = :form
+    r.form.type.must_equal :form
+  end
+  it 'ensures the form child is a direct child' do
+    r = Blather::Stanza::Message.new
+    r.form
+    r.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).wont_be_empty
+  end
+end

data/spec/blather/stanza/pubsub/retract_spec.rb CHANGED

@@ -69,7 +69,7 @@ describe Blather::Stanza::PubSub::Retract do
   it 'will iterate over each retraction' do
     Blather::XMPPNode.import(parse_stanza(retract_xml).root).each do |i|
-      i.must_include %w[ae890ac52d0df67ed7cfdf51b644e901]
+      i.must_include "ae890ac52d0df67ed7cfdf51b644e901"
     end
   end
 end

data/spec/blather/stanza/pubsub_spec.rb CHANGED

@@ -59,9 +59,4 @@ describe Blather::Stanza::PubSub::PubSubItem do
     item.payload = nil
     item.payload.must_be_nil
   end
-  it 'must have an entry child to item' do
-    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'foo', 'payload'
-    item.find_first('ns:entry', :ns => 'http://www.w3.org/2005/Atom').wont_be_nil
-  end
 end

data/spec/blather/stanza/x_spec.rb ADDED

@@ -0,0 +1,235 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+def x_xml
+  <<-XML
+  <x xmlns='jabber:x:data'
+     type='form'>
+    <title/>
+    <instructions/>
+    <field var='field-name'
+           type='text-single'
+           label='description' />
+    <field var='field-name2'
+           type='text-single'
+           label='description' />
+    <field var='field-name3'
+           type='text-single'
+           label='description' />
+    <field var='field-name4'
+           type='list-multi'
+           label='description'>
+      <desc/>
+      <required/>
+      <value>field-value4</value>
+      <option label='option-label'><value>option-value</value></option>
+      <option label='option-label'><value>option-value</value></option>
+    </field>
+  </x>
+  XML
+end
+describe Blather::Stanza::X do
+  it 'can be created from an XML string' do
+    x = Blather::Stanza::X.new parse_stanza(x_xml).root
+    x.type.must_equal :form
+    x.must_be_instance_of Blather::Stanza::X
+  end
+  [:cancel, :form, :result, :submit].each do |type|
+    it "type can be set as \"#{type}\"" do
+      x = Blather::Stanza::X.new type
+      x.type.must_equal type
+    end
+  end
+  it 'is constructed properly' do
+    n = Blather::Stanza::X.new :form
+    n.find("/ns:x[@type='form']", :ns => Blather::Stanza::X.registered_ns).wont_be_empty
+  end
+  it 'has an action attribute' do
+    n = Blather::Stanza::X.new :form
+    n.type.must_equal :form
+    n.type = :submit
+    n.type.must_equal :submit
+  end
+  it 'has a title attribute' do
+    n = Blather::Stanza::X.new :form
+    n.title.must_equal nil
+    n.title = "Hello World!"
+    n.title.must_equal "Hello World!"
+    n.title = "goodbye"
+    n.title.must_equal "goodbye"
+  end
+  it 'has an instructions attribute' do
+    n = Blather::Stanza::X.new :form
+    n.instructions.must_equal nil
+    n.instructions = "Please fill in this form"
+    n.instructions.must_equal "Please fill in this form"
+    n.instructions = "goodbye"
+    n.instructions.must_equal "goodbye"
+  end
+  it 'inherits a list of fields' do
+    n = Blather::Stanza::Iq::Command.new
+    n.command << parse_stanza(x_xml).root
+    r = Blather::Stanza::X.new.inherit n.form
+    r.fields.size.must_equal 4
+    r.fields.map { |f| f.class }.uniq.must_equal [Blather::Stanza::X::Field]
+  end
+  it 'returns a field object for a particular var' do
+    x = Blather::Stanza::X.new parse_stanza(x_xml).root
+    f = x.field 'field-name4'
+    f.must_be_instance_of Blather::Stanza::X::Field
+    f.value.must_equal 'field-value4'
+  end
+  it 'takes a list of hashes for fields' do
+    fields = [
+      {:label => 'label', :type => 'text-single', :var => 'var'},
+      {:label => 'label1', :type => 'text-single', :var => 'var1'},
+    ]
+    control = [ Blather::Stanza::X::Field.new(*%w[var text-single label]),
+                Blather::Stanza::X::Field.new(*%w[var1 text-single label1])]
+    di = Blather::Stanza::X.new nil, fields
+    di.fields.size.must_equal 2
+    di.fields.each { |f| control.include?(f).must_equal true }
+  end
+  it 'takes a list of Field objects as fields' do
+    control = [ Blather::Stanza::X::Field.new(*%w[var text-single label1]),
+                Blather::Stanza::X::Field.new(*%w[var1 text-single label1])]
+    di = Blather::Stanza::X.new nil, control
+    di.fields.size.must_equal 2
+    di.fields.each { |f| control.include?(f).must_equal true }
+  end
+  it 'takes a mix of hashes and field objects as fields' do
+    fields = [
+      {:label => 'label', :type => 'text-single', :var => 'var'},
+      Blather::Stanza::X::Field.new(*%w[var1 text-single label1]),
+    ]
+    control = [ Blather::Stanza::X::Field.new(*%w[var text-single label]),
+                Blather::Stanza::X::Field.new(*%w[var1 text-single label1])]
+    di = Blather::Stanza::X.new nil, fields
+    di.fields.size.must_equal 2
+    di.fields.each { |f| control.include?(f).must_equal true }
+  end
+  it 'allows adding of fields' do
+    di = Blather::Stanza::X.new nil
+    di.fields.size.must_equal 0
+    di.fields = [{:label => 'label', :type => 'text-single', :var => 'var', :required => true}]
+    di.fields.size.must_equal 1
+    di.fields += [Blather::Stanza::X::Field.new(*%w[var1 text-single label1])]
+    di.fields.size.must_equal 2
+  end
+end
+describe Blather::Stanza::X::Field do
+  it 'will auto-inherit nodes' do
+    n = parse_stanza "<field type='text-single' var='music' label='Music from the time of Shakespeare' />"
+    i = Blather::Stanza::X::Field.new n.root
+    i.type.must_equal 'text-single'
+    i.var.must_equal 'music'
+    i.label.must_equal 'Music from the time of Shakespeare'
+  end
+  it 'has a type attribute' do
+    n = Blather::Stanza::X::Field.new 'var', 'text-single'
+    n.type.must_equal 'text-single'
+    n.type = 'hidden'
+    n.type.must_equal 'hidden'
+  end
+  it 'has a var attribute' do
+    n = Blather::Stanza::X::Field.new 'name', 'text-single'
+    n.var.must_equal 'name'
+    n.var = 'email'
+    n.var.must_equal 'email'
+  end
+  it 'has a label attribute' do
+    n = Blather::Stanza::X::Field.new 'subject', 'text-single', 'Music from the time of Shakespeare'
+    n.label.must_equal 'Music from the time of Shakespeare'
+    n.label = 'Books by and about Shakespeare'
+    n.label.must_equal 'Books by and about Shakespeare'
+  end
+  it 'has a desc attribute' do
+    n = Blather::Stanza::X::Field.new 'subject', 'text-single', 'Music from the time of Shakespeare'
+    n.desc.must_equal nil
+    n.desc = 'Books by and about Shakespeare'
+    n.desc.must_equal 'Books by and about Shakespeare'
+    n.desc = 'goodbye'
+    n.desc.must_equal 'goodbye'
+  end
+  it 'has a required? attribute' do
+    n = Blather::Stanza::X::Field.new 'subject', 'text-single', 'Music from the time of Shakespeare'
+    n.required?.must_equal false
+    n.required = true
+    n.required?.must_equal true
+    n.required = false
+    n.required?.must_equal false
+  end
+  it 'has a value attribute' do
+    n = Blather::Stanza::X::Field.new 'subject', 'text-single', 'Music from the time of Shakespeare'
+    n.value.must_equal nil
+    n.value = 'book1'
+    n.value.must_equal 'book1'
+    n.value = 'book2'
+    n.value.must_equal 'book2'
+  end
+  # Option child elements
+  it 'allows adding of options' do
+    di = Blather::Stanza::X::Field.new nil
+    di.options.size.must_equal 0
+    di.options += [{:label => 'Person', :value => 'person'}]
+    di.options.size.must_equal 1
+    di.options += [Blather::Stanza::X::Field::Option.new(*%w[person1 Person1])]
+    di.options.size.must_equal 2
+  end
+  it 'raises an error when compared against a non X::Field' do
+    a = Blather::Stanza::X::Field.new('secret_message', 'hidden')
+    lambda { a == 'test' }.must_raise RuntimeError
+  end
+  it 'can determine equality' do
+    a = Blather::Stanza::X::Field.new('subject', 'text-single')
+    a.must_equal Blather::Stanza::X::Field.new('subject', 'text-single')
+    a.wont_equal Blather::Stanza::X::Field.new('subject1', 'text-single')
+  end
+end
+describe Blather::Stanza::X::Field::Option do
+  it 'has a value attribute' do
+    n = Blather::Stanza::X::Field::Option.new 'person1', 'Person 1'
+    n.value.must_equal 'person1'
+    n.value = 'book1'
+    n.value.must_equal 'book1'
+  end
+  it 'has a label attribute' do
+    n = Blather::Stanza::X::Field::Option.new 'person1', 'Person 1'
+    n.label.must_equal 'Person 1'
+    n.label = 'Book 1'
+    n.label.must_equal 'Book 1'
+    n.label = 'Book 2'
+    n.label.must_equal 'Book 2'
+  end
+end

data/spec/blather/stream/client_spec.rb CHANGED

@@ -45,7 +45,7 @@ describe Blather::Stream::Client do
   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({
+    dns.expects(:detect).yields(mock({
       :target => 'd',
       :port => 5222
     }))
@@ -1008,4 +1008,17 @@ describe Blather::Stream::Client do
     comp.expects(:send_data).with { |s| s.wont_match(/^<message[^>]*from=/); true }
     comp.send msg
   end
+  it 'sends xml without formatting' do
+    client = mock()
+    client.stubs(:jid)
+    client.stubs(:jid=)
+    msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
+    msg.xhtml = '<i>xhtml</i> body'
+    comp = Blather::Stream::Client.new nil, client, 'node@jid.com/resource', 'pass'
+    comp.expects(:send_data).with { |s| s.wont_match(/\n/); true }
+    comp.send msg
+  end
 end

data/spec/blather/stream/parser_spec.rb CHANGED

@@ -89,6 +89,12 @@ describe Blather::Stream::Parser do
     @client.data[0].xpath('//*[namespace-uri()="urn:ietf:params:xml:ns:xmpp-stanzas"]').size.must_equal 2
   end
+  it 'handles not absolute namespaces' do
+    assert_nothing_raised do
+      @parser.receive_data '<iq type="result" id="blather0007" to="n@d/r"><vCard xmlns="vcard-temp"/></iq>'
+    end
+  end
   it 'responds with stream:stream as a separate response' do
     data = [
       '<stream:stream xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams" to="example.com" version="1.0">',

data/spec/blather/xmpp_node_spec.rb CHANGED

@@ -135,10 +135,11 @@ describe Blather::XMPPNode do
     c.namespace = 'foo:bar'
     n << c
-    n.find(:bar).size.must_equal 2
-    n.remove_child 'bar', 'foo:bar'
     n.find(:bar).size.must_equal 1
-    n.find(:bar).first.namespace.must_be_nil
+    n.find('//xmlns:bar', :xmlns => 'foo:bar').size.must_equal 1
+    n.remove_child '//xmlns:bar', :xmlns => 'foo:bar'
+    n.find(:bar).size.must_equal 1
+    n.find('//xmlns:bar', :xmlns => 'foo:bar').size.must_equal 0
   end
   it 'will remove all child elements' do