blather 0.3.4 → 0.4.0

data/spec/blather/stream/component_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 
-describe 'Blather::Stream::Component' do
+describe Blather::Stream::Component do
   class MockServer; end
   module ServerMock
     def receive_data(data)
@@ -19,8 +19,8 @@ describe 'Blather::Stream::Component' do
       # Mocked server
       EventMachine::start_server '127.0.0.1', 12345, ServerMock
 
-      # Stream connection
-      EM.connect('127.0.0.1', 12345, Stream::Component, @client, @jid || 'comp.id', 'secret') { |c| @stream = c }
+      # Blather::Stream connection
+      EM.connect('127.0.0.1', 12345, Blather::Stream::Component, @client, @jid || 'comp.id', 'secret') { |c| @stream = c }
     }
   end
 
@@ -34,7 +34,7 @@ describe 'Blather::Stream::Component' do
       parms[4] == 'comp.id'
     end
 
-    Stream::Component.start *params
+    Blather::Stream::Component.start *params
   end
 
   it 'shakes hands with the server' do
@@ -63,7 +63,7 @@ describe 'Blather::Stream::Component' do
     @client = mock(:post_init)
     @client.expects(:receive_data).with do |n|
       EM.stop
-      n.kind_of?(Stanza::Message) && @stream.ready?.must_equal(true)
+      n.kind_of? Blather::XMPPNode
     end
 
     state = nil
@@ -83,4 +83,13 @@ describe 'Blather::Stream::Component' do
     end
   end
 
+  it 'sends stanzas to the wire with ensuring from is set' do
+    client = mock()
+    client.stubs(:jid)
+    client.stubs(:jid=)
+    msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
+    comp = Blather::Stream::Component.new nil, client, 'jid.com', 'pass'
+    comp.expects(:send_data).with { |s| s.must_match(/^<message[^>]*from="jid\.com"/) }
+    comp.send msg
+  end
 end

data/spec/blather/stream/parser_spec.rb

@@ -0,0 +1,145 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+
+describe Blather::Stream::Parser do
+  before do
+    @client = Class.new do
+      attr_reader :data
+      def stopped?; false; end
+      def receive(data)
+        @data ||= []
+        @data << data
+      end
+    end.new
+    @parser = Blather::Stream::Parser.new @client
+  end
+
+  after { @client = @parser = nil}
+
+  def check_parse(data)
+    @parser.receive_data data
+    @client.data.size.must_equal 1
+    @client.data[0].to_s.gsub(/\n\s*/,'').must_equal data
+  end
+
+  it 'handles fragmented parsing' do
+    @parser.receive_data '<foo>'
+    @parser.receive_data '<bar/>'
+    @parser.receive_data '</foo>'
+    @client.data.size.must_equal 1
+    @client.data[0].to_s.gsub(/\n\s*/,'').must_equal '<foo><bar/></foo>'
+  end
+
+  it 'handles a basic example' do
+    check_parse "<foo/>"
+  end
+
+  it 'handles a basic namespace definition' do
+    check_parse '<foo xmlns="bar:baz"/>'
+  end
+
+  it 'handles multiple namespace definitions' do
+    check_parse '<foo xmlns="bar:baz" xmlns:bar="baz"/>'
+  end
+
+  it 'handles prefix namespacing' do
+    check_parse '<bar:foo xmlns="bar:baz" xmlns:bar="baz"/>'
+  end
+
+  it 'handles namespaces with children' do
+    check_parse "<foo xmlns=\"bar:baz\"><bar/></foo>"
+  end
+
+  it 'handles multiple namespaces with children' do
+    check_parse "<foo xmlns=\"bar:baz\" xmlns:bar=\"baz\"><bar/></foo>"
+  end
+
+  it 'handles prefix namespaces with children' do
+    check_parse "<bar:foo xmlns=\"bar:baz\" xmlns:bar=\"baz\"><bar/></bar:foo>"
+  end
+
+  it 'handles prefix namespaces with children in the namespace' do
+    check_parse "<bar:foo xmlns=\"bar:baz\" xmlns:bar=\"baz\"><bar:bar/></bar:foo>"
+  end
+
+  it 'handles prefix namespaces with children in the namespace' do
+    check_parse "<bar:foo xmlns=\"bar:baz\" xmlns:bar=\"baz\"><baz><bar:buz/></baz></bar:foo>"
+  end
+
+  it 'handles attributes' do
+    check_parse '<foo bar="baz"/>'
+  end
+
+  it 'handles character input' do
+    check_parse '<foo>bar baz fizbuz</foo>'
+  end
+
+  it 'handles a complex input' do
+    data = [
+      '<message type="error" id="another-id">',
+        '<error type="modify">',
+          '<undefined-condition xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>',
+          '<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Some special application diagnostic information...</text>',
+          '<special-application-condition xmlns="application-ns"/>',
+        "</error>",
+      "</message>"
+    ]
+    data.each { |d| @parser.receive_data d }
+    @client.data.size.must_equal 1
+    @client.data[0].to_s.split("\n").map{|n|n.strip}.must_equal data
+    @client.data[0].xpath('//*[namespace-uri()="urn:ietf:params:xml:ns:xmpp-stanzas"]').size.must_equal 2
+  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">',
+      '<foo/>'
+    ]
+    data.each { |d| @parser.receive_data d }
+    @client.data.size.must_equal 2
+    @client.data[0].document.xpath('/stream:stream[@to="example.com" and @version="1.0"]', 'xmlns' => 'jabber:client', 'stream' => 'http://etherx.jabber.org/streams').size.must_equal 1
+    @client.data[1].to_s.must_equal '<foo/>'
+  end
+
+  it 'response with stream:end when receiving </stream:stream>' do
+    @parser.receive_data '<stream:stream xmlns:stream="http://etherx.jabber.org/streams"/>'
+    @client.data.size.must_equal 2
+    @client.data[1].to_s.must_equal '<stream:end xmlns:stream="http://etherx.jabber.org/streams"/>'
+  end
+
+  it 'raises ParseError when an error is sent' do
+    lambda { @parser.receive_data "<stream:stream>" }.must_raise(Blather::ParseError)
+  end
+
+  it 'handles stream stanzas without an issue' do
+    data = [
+      '<stream:stream xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams" to="example.com" version="1.0">',
+      '<stream:features/>'
+    ]
+    data.each { |d| @parser.receive_data d }
+    @client.data.size.must_equal 2
+    @client.data[0].document.xpath('/stream:stream[@to="example.com" and @version="1.0"]', 'xmlns' => 'jabber:client', 'stream' => 'http://etherx.jabber.org/streams').size.must_equal 1
+    @client.data[1].to_s.must_equal '<stream:features xmlns:stream="http://etherx.jabber.org/streams"/>'
+  end
+
+  it 'ignores the client namespace on stanzas' do
+    [ "<message type='chat' to='n@d' from='n@d/r' id='id1' xmlns='jabber:client'>",
+      "<body>exit</body>",
+      "<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>exit</body></html>",
+      "</message>"
+    ].each { |d| @parser.receive_data d }
+    @client.data.size.must_equal 1
+    @client.data[0].document.xpath('/message/body[.="exit"]').wont_be_empty
+    @client.data[0].document.xpath('/message/im:html/xhtml:body[.="exit"]', 'im' => 'http://jabber.org/protocol/xhtml-im', 'xhtml' => 'http://www.w3.org/1999/xhtml').wont_be_empty
+  end
+
+  it 'ignores the component namespace on stanzas' do
+    [ "<message type='chat' to='n@d' from='n@d/r' id='id1' xmlns='jabber:component:accept'>",
+      "<body>exit</body>",
+      "<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>exit</body></html>",
+      "</message>"
+    ].each { |d| @parser.receive_data d }
+    @client.data.size.must_equal 1
+    @client.data[0].document.xpath('/message/body[.="exit"]').wont_be_empty
+    @client.data[0].document.xpath('/message/im:html/xhtml:body[.="exit"]', 'im' => 'http://jabber.org/protocol/xhtml-im', 'xhtml' => 'http://www.w3.org/1999/xhtml').wont_be_empty
+  end
+end

data/spec/blather/xmpp_node_spec.rb

@@ -1,104 +1,182 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
-describe 'Blather::XMPPNode' do
-  it 'generates a new node' do
-    n = XMPPNode.new 'foo'
+describe Blather::XMPPNode do
+  before { @doc = Nokogiri::XML::Document.new }
+
+  it 'generates a new node automatically setting the document' do
+    n = Blather::XMPPNode.new 'foo'
     n.element_name.must_equal 'foo'
+    n.document.wont_equal @doc
+  end
+
+  it 'sets the new document root to the node' do
+    n = Blather::XMPPNode.new 'foo'
+    n.document.root.must_equal n
   end
 
-  it 'generates a node based on the current name' do
-    class Foo < XMPPNode; end
-    Foo.name = 'foo'
-    Foo.new.element_name.must_equal 'foo'
+  it 'does not set the document root if the document is provided' do
+    n = Blather::XMPPNode.new 'foo', @doc
+    n.document.root.wont_equal n
+  end
+
+  it 'generates a new node with the given document' do
+    n = Blather::XMPPNode.new 'foo', @doc
+    n.element_name.must_equal 'foo'
+    n.document.must_equal @doc
+  end
+
+  it 'generates a node based on the registered_name' do
+    foo = Class.new(Blather::XMPPNode)
+    foo.registered_name = 'foo'
+    foo.new.element_name.must_equal 'foo'
   end
 
   it 'sets the namespace on creation' do
-    class Foo < XMPPNode; end
-    Foo.ns = 'foo'
-    Foo.new('foo').namespace.must_equal 'foo'
+    foo = Class.new(Blather::XMPPNode)
+    foo.registered_ns = 'foo'
+    foo.new('foo').namespace.href.must_equal 'foo'
   end
 
   it 'registers sub classes' do
-    class Foo < XMPPNode; register 'foo', 'foo:bar'; end
-    Foo.name.must_equal 'foo'
-    Foo.ns.must_equal 'foo:bar'
-    XMPPNode.class_from_registration('foo', 'foo:bar').must_equal Foo
+    class RegistersSubClass < Blather::XMPPNode; register 'foo', 'foo:bar'; end
+    RegistersSubClass.registered_name.must_equal 'foo'
+    RegistersSubClass.registered_ns.must_equal 'foo:bar'
+    Blather::XMPPNode.class_from_registration('foo', 'foo:bar').must_equal RegistersSubClass
   end
 
   it 'imports another node' do
-    class Foo < XMPPNode; register 'foo', 'foo:bar'; end
-    n = XMPPNode.new('foo')
+    class ImportSubClass < Blather::XMPPNode; register 'foo', 'foo:bar'; end
+    n = Blather::XMPPNode.new('foo')
     n.namespace = 'foo:bar'
-    XMPPNode.import(n).must_be_kind_of Foo
+    Blather::XMPPNode.import(n).must_be_kind_of ImportSubClass
   end
 
   it 'provides an attribute_reader' do
-    class Foo < XMPPNode
-      attribute_reader :foo
-    end
-    f = Foo.new
-    f.must_respond_to :foo
-    f.foo.must_be_nil
-    f.attributes[:foo] = 'bar'
-    f.foo.must_equal :bar
-  end
-
-  it 'provides an attribute_reader and not convert to syms' do
-    class Foo < XMPPNode
-      attribute_reader :foo, :to_sym => false
-    end
-    f = Foo.new
-    f.must_respond_to :foo
-    f.foo.must_be_nil
-    f.attributes[:foo] = 'bar'
-    f.foo.must_equal 'bar'
+    foo = Class.new(Blather::XMPPNode) { attribute_reader :bar }.new
+    foo.must_respond_to :bar
+    foo.bar.must_be_nil
+    foo[:bar] = 'baz'
+    foo.bar.must_equal 'baz'
+  end
+
+  it 'provides an attribute_reader with converstion' do
+    foo = Class.new(Blather::XMPPNode) { attribute_reader :bar, :call => :to_sym }.new
+    foo.must_respond_to :bar
+    foo.bar.must_be_nil
+    foo[:bar] = 'baz'
+    foo.bar.must_equal :baz
   end
 
   it 'provides an attribute_writer' do
-    class Foo < XMPPNode
-      attribute_writer :foo
-    end
-    f = Foo.new
-    f.attributes[:foo].must_be_nil
-    f.foo = 'bar'
-    f.attributes[:foo].must_equal 'bar'
+    foo = Class.new(Blather::XMPPNode) { attribute_writer :bar }.new
+    foo[:bar].must_be_nil
+    foo.bar = 'baz'
+    foo[:bar].must_equal 'baz'
   end
 
   it 'provides an attribute_accessor' do
-    class Foo < XMPPNode
-      attribute_accessor :foo
-      attribute_accessor :bar, :to_sym => false
-    end
-    f = Foo.new
-    f.must_respond_to :foo
-    f.foo.must_be_nil
-    f.foo = 'bar'
-    f.foo.must_equal :bar
-
-    f.must_respond_to :bar
-    f.bar.must_be_nil
-    f.bar = 'baz'
-    f.bar.must_equal 'baz'
+    foo = Class.new(Blather::XMPPNode) do
+      attribute_accessor :bar, :call => :to_sym
+      attribute_accessor :baz
+    end.new
+    foo.must_respond_to :bar
+    foo.bar.must_be_nil
+    foo.bar = 'fiz'
+    foo.bar.must_equal :fiz
+
+    foo.must_respond_to :baz
+    foo.baz.must_be_nil
+    foo.baz = 'buz'
+    foo.baz.must_equal 'buz'
+  end
+
+  it 'provides a content reader' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar }.new('foo')
+    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
+    bar.content = 'baz'
+    foo.must_respond_to :bar
+    foo.bar.must_equal 'baz'
+  end
+
+  it 'provides a content reader that converts the value' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar, :to_sym }.new('foo')
+    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
+    bar.content = 'baz'
+    foo.must_respond_to :bar
+    foo.bar.must_equal :baz
+  end
+
+  it 'provides a content reader with a different node' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar, nil, :fiz }.new('foo')
+    foo << (fiz = Blather::XMPPNode.new('fiz', foo.document))
+    fiz.content = 'baz'
+    foo.must_respond_to :bar
+    foo.bar.must_equal 'baz'
+  end
+
+  it 'provides a content writer' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar }.new('foo')
+    foo.must_respond_to :bar=
+    foo.bar = 'baz'
+    foo.content_from(:bar).must_equal 'baz'
+  end
+
+  it 'provides a content writer with a different node' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar, :fiz }.new('foo')
+    foo.must_respond_to :bar=
+    foo.bar = 'baz'
+    foo.content_from(:fiz).must_equal 'baz'
+  end
+
+  it 'provides a content accessor' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_accessor :bar }.new('foo')
+    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
+    foo.must_respond_to :bar=
+    foo.must_respond_to :bar
+    foo.bar = 'baz'
+    foo.bar.must_equal 'baz'
+  end
+
+  it 'provides a content accessor with conversion' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_accessor :bar, :to_sym }.new('foo')
+    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
+    foo.must_respond_to :bar=
+    foo.must_respond_to :bar
+    foo.bar = 'baz'
+    foo.bar.must_equal :baz
+  end
+
+  it 'provides a content writer that removes a child when set to nil' do
+    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar }.new('foo')
+    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
+    bar.content = 'baz'
+    foo.content_from(:bar).must_equal 'baz'
+    foo.xpath('bar').wont_be_empty
+
+    foo.must_respond_to :bar=
+    foo.bar = nil
+    foo.content_from(:bar).must_be_nil
+    foo.xpath('bar').must_be_empty
   end
 
   it 'can convert itself into a stanza' do
-    class Foo < XMPPNode; register 'foo'; end
-    n = XMPPNode.new('foo')
-    n.to_stanza.must_be_kind_of Foo
+    class StanzaConvert < Blather::XMPPNode; register 'foo'; end
+    n = Blather::XMPPNode.new('foo')
+    n.to_stanza.must_be_kind_of StanzaConvert
   end
 
   it 'provides "attr_accessor" for namespace' do
-    n = XMPPNode.new('foo')
+    n = Blather::XMPPNode.new('foo')
     n.namespace.must_be_nil
 
     n.namespace = 'foo:bar'
-    n.namespace.must_equal 'foo:bar'
+    n.namespace_href.must_equal 'foo:bar'
   end
 
   it 'will remove a child element' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar')
-    n << XMPPNode.new('bar')
+    n = Blather::XMPPNode.new 'foo'
+    n << Blather::XMPPNode.new('bar', n.document)
+    n << Blather::XMPPNode.new('bar', n.document)
 
     n.find(:bar).size.must_equal 2
     n.remove_child 'bar'
@@ -106,9 +184,9 @@ describe 'Blather::XMPPNode' do
   end
 
   it 'will remove a child with a specific xmlns' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar')
-    c = XMPPNode.new('bar')
+    n = Blather::XMPPNode.new 'foo'
+    n << Blather::XMPPNode.new('bar')
+    c = Blather::XMPPNode.new('bar')
     c.namespace = 'foo:bar'
     n << c
 
@@ -119,31 +197,26 @@ describe 'Blather::XMPPNode' do
   end
 
   it 'will remove all child elements' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar')
-    n << XMPPNode.new('bar')
+    n = Blather::XMPPNode.new 'foo'
+    n << Blather::XMPPNode.new('bar')
+    n << Blather::XMPPNode.new('bar')
 
     n.find(:bar).size.must_equal 2
     n.remove_children 'bar'
     n.find(:bar).size.must_equal 0
   end
 
-  it 'provides a helper to grab content from a child' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar', 'baz')
-    n.content_from(:bar).must_equal 'baz'
-  end
-
   it 'provides a copy mechanism' do
-    n = XMPPNode.new 'foo'
+    n = Blather::XMPPNode.new 'foo'
     n2 = n.copy
     n2.object_id.wont_equal n.object_id
     n2.element_name.must_equal n.element_name
   end
 
   it 'provides an inhert mechanism' do
-    n = XMPPNode.new 'foo'
-    n2 = XMPPNode.new 'foo', 'bar'
+    n = Blather::XMPPNode.new 'foo'
+    n2 = Blather::XMPPNode.new 'foo'
+    n2.content = 'bar'
     n2['foo'] = 'bar'
 
     n.inherit(n2)
@@ -152,32 +225,55 @@ describe 'Blather::XMPPNode' do
   end
 
   it 'provides a mechanism to inherit attrs' do
-    n = XMPPNode.new 'foo'
-    n2 = XMPPNode.new 'foo'
+    n = Blather::XMPPNode.new 'foo'
+    n2 = Blather::XMPPNode.new 'foo'
     n2['foo'] = 'bar'
 
     n.inherit_attrs(n2.attributes)
     n['foo'].must_equal 'bar'
   end
 
-  it 'cuts line breaks out of #to_xml' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar', 'baz')
-    n.to_xml.scan(">\n<").size.must_equal 0
+  it 'has a content_from helper that pulls the content from a child node' do
+    f = Blather::XMPPNode.new('foo')
+    f << (b = Blather::XMPPNode.new('bar'))
+    b.content = 'content'
+    f.content_from(:bar).must_equal 'content'
   end
 
-  it 'overrides #find to find without xpath' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar', 'baz')
-    n.find(:bar).must_be_kind_of Array
+  it 'returns nil when sent #content_from and a missing node' do
+    f = Blather::XMPPNode.new('foo')
+    f.content_from(:bar).must_be_nil
+  end
+
+  it 'creates a new node and sets content when sent #set_content_for' do
+    f = Blather::XMPPNode.new('foo')
+    f.must_respond_to :set_content_for
+    f.xpath('bar').must_be_empty
+    f.set_content_for :bar, :baz
+    f.xpath('bar').wont_be_empty
+    f.xpath('bar').first.content.must_equal 'baz'
+  end
 
-    XML::Document.new.root = n
-    n.find(:bar).must_be_kind_of XML::XPath::Object
+  it 'removes a child node when sent #set_content_for with nil' do
+    f = Blather::XMPPNode.new('foo')
+    f << (b = Blather::XMPPNode.new('bar'))
+    f.must_respond_to :set_content_for
+    f.xpath('bar').wont_be_empty
+    f.set_content_for :bar, nil
+    f.xpath('bar').must_be_empty
   end
 
-  it 'can find using a symbol' do
-    n = XMPPNode.new 'foo'
-    n << XMPPNode.new('bar', 'baz')
-    n.find(:bar).first.to_s.must_equal "<bar>baz</bar>"
+  it 'will change the content of an existing node when sent #set_content_for' do
+    f = Blather::XMPPNode.new('foo')
+    f << (b = Blather::XMPPNode.new('bar'))
+    b.content = 'baz'
+    f.must_respond_to :set_content_for
+    f.xpath('bar').wont_be_empty
+    f.xpath('bar').first.content.must_equal 'baz'
+    control = f.xpath('bar').first.pointer_id
+
+    f.set_content_for :bar, 'fiz'
+    f.xpath('bar').first.content.must_equal 'fiz'
+    f.xpath('bar').first.pointer_id.must_equal control
   end
 end