blather 0.3.4 → 0.4.0

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

data/spec/blather/errors/stanza_error_spec.rb

@@ -1,47 +1,42 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 
 def stanza_error_node(type = 'cancel', error = 'internal-server-error', msg = nil)
-  node = Stanza::Message.new 'error@jabber.local', 'test message', :error
-  XML::Document.new.root = node
+  node = Blather::Stanza::Message.new 'error@jabber.local', 'test message', :error
 
-  error_node = XMPPNode.new('error')
+  node << (error_node = Blather::XMPPNode.new('error'))
   error_node['type'] = type.to_s
   
-  err = XMPPNode.new(error)
+  error_node << (err = Blather::XMPPNode.new(error, error_node.document))
   err.namespace = 'urn:ietf:params:xml:ns:xmpp-stanzas'
-  error_node << err
 
   if msg
-    text = XMPPNode.new('text')
+    error_node << (text = Blather::XMPPNode.new('text', error_node.document))
     text.namespace = 'urn:ietf:params:xml:ns:xmpp-stanzas'
-    text << msg
-    error_node << text
+    text.content = msg
   end
 
-  extra = XMPPNode.new('extra-error')
+  error_node << (extra = Blather::XMPPNode.new('extra-error', error_node.document))
   extra.namespace = 'blather:stanza:error'
-  extra << 'Blather Error'
-  error_node << extra
+  extra.content = 'Blather Error'
 
-  node << error_node
   node
 end
 
-describe 'Blather::StanzaError' do
+describe Blather::StanzaError do
   it 'can import a node' do
-    StanzaError.must_respond_to :import
-    e = StanzaError.import stanza_error_node
-    e.must_be_kind_of StanzaError
+    Blather::StanzaError.must_respond_to :import
+    e = Blather::StanzaError.import stanza_error_node
+    e.must_be_kind_of Blather::StanzaError
   end
 
   describe 'valid types' do
-    before { @original = Stanza::Message.new 'error@jabber.local', 'test message', :error }
+    before { @original = Blather::Stanza::Message.new 'error@jabber.local', 'test message', :error }
 
     it 'ensures type is one of Stanza::Message::VALID_TYPES' do
-      lambda { StanzaError.new @original, :gone, :invalid_type_name }.must_raise(Blather::ArgumentError)
+      lambda { Blather::StanzaError.new @original, :gone, :invalid_type_name }.must_raise(Blather::ArgumentError)
 
-      StanzaError::VALID_TYPES.each do |valid_type|
-        msg = StanzaError.new @original, :gone, valid_type
+      Blather::StanzaError::VALID_TYPES.each do |valid_type|
+        msg = Blather::StanzaError.new @original, :gone, valid_type
         msg.type.must_equal valid_type
       end
     end
@@ -52,7 +47,7 @@ describe 'Blather::StanzaError' do
       @type = 'cancel'
       @err_name = 'internal-server-error'
       @msg = 'the server has experienced a misconfiguration'
-      @err = StanzaError.import stanza_error_node(@type, @err_name, @msg)
+      @err = Blather::StanzaError.import stanza_error_node(@type, @err_name, @msg)
     end
 
     it 'provides a type attribute' do
@@ -72,7 +67,7 @@ describe 'Blather::StanzaError' do
 
     it 'provides a reader to the original node' do
       @err.must_respond_to :original
-      @err.original.must_be_instance_of Stanza::Message
+      @err.original.must_be_instance_of Blather::Stanza::Message
     end
 
     it 'provides an extras attribute' do
@@ -91,14 +86,13 @@ describe 'Blather::StanzaError' do
 
     it 'can be turned into xml' do
       @err.must_respond_to :to_xml
-      control = "<body>test message</body>\n<error>\n<internal-server-error xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>\n<text xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">the server has experienced a misconfiguration</text>\n<extra-error xmlns=\"blather:stanza:error\">Blather Error</extra-error>\n</error>\n</message>".split("\n")
-      test = @err.to_xml.split("\n")
-      test_msg = test.shift
-      test.must_equal control
-
-      test_msg.must_match(/<message[^>]*id="#{@err.original.id}"/)
-      test_msg.must_match(/<message[^>]*from="error@jabber\.local"/)
-      test_msg.must_match(/<message[^>]*type="error"/)
+      doc = parse_stanza @err.to_xml
+
+      doc.xpath("/message[@from='error@jabber.local' and @type='error']").wont_be_empty
+      doc.xpath("/message/error").wont_be_empty
+      doc.xpath("/message/error/err_ns:internal-server-error", :err_ns => Blather::StanzaError::STANZA_ERR_NS).wont_be_empty
+      doc.xpath("/message/error/err_ns:text[.='the server has experienced a misconfiguration']", :err_ns => Blather::StanzaError::STANZA_ERR_NS).wont_be_empty
+      doc.xpath("/message/error/extra_ns:extra-error[.='Blather Error']", :extra_ns => 'blather:stanza:error').wont_be_empty
     end
   end
 
@@ -127,11 +121,9 @@ describe 'Blather::StanzaError' do
         unexpected-request
       ].each do |error_type|
         it "handles the name for #{error_type}" do
-          e = StanzaError.import stanza_error_node(:cancel, error_type)
+          e = Blather::StanzaError.import stanza_error_node(:cancel, error_type)
           e.name.must_equal error_type.gsub('-','_').to_sym
         end
       end
   end
 end
-
-

data/spec/blather/errors/stream_error_spec.rb

@@ -1,33 +1,35 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 
 def stream_error_node(error = 'internal-server-error', msg = nil)
-  node = XMPPNode.new('stream:error')
-  XML::Document.new.root = node
+  node = Blather::XMPPNode.new('error')
+  node.namespace = {'stream' => Blather::Stream::STREAM_NS}
   
-  err = XMPPNode.new(error)
+  node << (err = Blather::XMPPNode.new(error, node.document))
   err.namespace = 'urn:ietf:params:xml:ns:xmpp-streams'
-  node << err
 
   if msg
-    text = XMPPNode.new('text')
+    node << (text = Blather::XMPPNode.new('text', node.document))
     text.namespace = 'urn:ietf:params:xml:ns:xmpp-streams'
-    text << msg
-    node << text
+    text.content = msg
   end
 
-  extra = XMPPNode.new('extra-error')
+  node << (extra = Blather::XMPPNode.new('extra-error', node.document))
   extra.namespace = 'blather:stream:error'
-  extra << 'Blather Error'
+  extra.content = 'Blather Error'
 
-  node << extra
   node
 end
 
 describe 'Blather::StreamError' do
   it 'can import a node' do
-    StreamError.must_respond_to :import
-    e = StreamError.import stream_error_node
-    e.must_be_kind_of StreamError
+    err = stream_error_node 'internal-server-error', 'the message'
+    Blather::StreamError.must_respond_to :import
+    e = Blather::StreamError.import err
+    e.must_be_kind_of Blather::StreamError
+
+    e.name.must_equal :internal_server_error
+    e.text.must_equal 'the message'
+    e.extras.must_equal err.find('descendant::*[name()="extra-error"]', 'blather:stream:error').map {|n|n}
   end
 end
 
@@ -35,7 +37,7 @@ describe 'Blather::StreamError when instantiated' do
   before do
     @err_name = 'internal-server-error'
     @msg = 'the server has experienced a misconfiguration'
-    @err = StreamError.import stream_error_node(@err_name, @msg)
+    @err = Blather::StreamError.import stream_error_node(@err_name, @msg)
   end
 
   it 'provides a err_name attribute' do
@@ -65,7 +67,10 @@ describe 'Blather::StreamError when instantiated' do
 
   it 'can be turned into xml' do
     @err.must_respond_to :to_xml
-    @err.to_xml.must_equal "<stream:error>\n<internal-server-error xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\"/>\n<text xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\">the server has experienced a misconfiguration</text>\n<extra-error xmlns=\"blather:stream:error\">Blather Error</extra-error>\n</stream:error>"
+    doc = parse_stanza @err.to_xml
+    doc.xpath("//err_ns:internal-server-error", :err_ns => Blather::StreamError::STREAM_ERR_NS).wont_be_empty
+    doc.xpath("//err_ns:text[.='the server has experienced a misconfiguration']", :err_ns => Blather::StreamError::STREAM_ERR_NS).wont_be_empty
+    doc.xpath("//err_ns:extra-error[.='Blather Error']", :err_ns => 'blather:stream:error').wont_be_empty
   end
 end
 
@@ -96,7 +101,7 @@ describe 'Each XMPP stream error type' do
       xml-not-well-formed
     ].each do |error_type|
       it "handles the name for #{error_type}" do
-        e = StreamError.import stream_error_node(error_type)
+        e = Blather::StreamError.import stream_error_node(error_type)
         e.name.must_equal error_type.gsub('-','_').to_sym
       end
     end

data/spec/blather/errors_spec.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
-describe 'Blather::BlatherError' do
+describe Blather::BlatherError do
   it 'is handled by :error' do
-    BlatherError.new.handler_heirarchy.must_equal [:error]
+    Blather::BlatherError.new.handler_heirarchy.must_equal [:error]
   end
 end
 
 describe 'Blather::ParseError' do
-  before { @error = ParseError.new('</generate-parse-error>"') }
+  before { @error = Blather::ParseError.new('</generate-parse-error>"') }
 
   it 'is registers with the handler heirarchy' do
     @error.handler_heirarchy.must_equal [:parse_error, :error]
@@ -19,14 +19,8 @@ describe 'Blather::ParseError' do
   end
 end
 
-describe 'Blather::TLSFailure' do
-  it 'is registers with the handler heirarchy' do
-    TLSFailure.new.handler_heirarchy.must_equal [:tls_failure, :error]
-  end
-end
-
 describe 'Blather::UnknownResponse' do
-  before { @error = UnknownResponse.new(XMPPNode.new('foo-bar')) }
+  before { @error = Blather::UnknownResponse.new(Blather::XMPPNode.new('foo-bar')) }
 
   it 'is registers with the handler heirarchy' do
     @error.handler_heirarchy.must_equal [:unknown_response_error, :error]
@@ -37,4 +31,3 @@ describe 'Blather::UnknownResponse' do
     @error.node.element_name.must_equal 'foo-bar'
   end
 end
-

data/spec/blather/jid_spec.rb

@@ -1,83 +1,84 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
-describe 'Blather::JID' do
-  it 'does nothing if creaded from JID' do
-    jid = JID.new 'n@d/r'
-    JID.new(jid).object_id.must_equal jid.object_id
+describe Blather::JID do
+  it 'does nothing if creaded from Blather::JID' do
+    jid = Blather::JID.new 'n@d/r'
+    Blather::JID.new(jid).object_id.must_equal jid.object_id
   end
 
-  it 'creates a new JID from (n,d,r)' do
-    jid = JID.new('n', 'd', 'r')
+  it 'creates a new Blather::JID from (n,d,r)' do
+    jid = Blather::JID.new('n', 'd', 'r')
     jid.node.must_equal 'n'
     jid.domain.must_equal 'd'
     jid.resource.must_equal 'r'
   end
 
-  it 'creates a new JID from (n,d)' do
-    jid = JID.new('n', 'd')
+  it 'creates a new Blather::JID from (n,d)' do
+    jid = Blather::JID.new('n', 'd')
     jid.node.must_equal 'n'
     jid.domain.must_equal 'd'
   end
 
-  it 'creates a new JID from (n@d)' do
-    jid = JID.new('n@d')
+  it 'creates a new Blather::JID from (n@d)' do
+    jid = Blather::JID.new('n@d')
     jid.node.must_equal 'n'
     jid.domain.must_equal 'd'
   end
 
-  it 'creates a new JID from (n@d/r)' do
-    jid = JID.new('n@d/r')
+  it 'creates a new Blather::JID from (n@d/r)' do
+    jid = Blather::JID.new('n@d/r')
     jid.node.must_equal 'n'
     jid.domain.must_equal 'd'
     jid.resource.must_equal 'r'
   end
 
   it 'requires at least a node' do
-    proc { JID.new }.must_raise ArgumentError
+    proc { Blather::JID.new }.must_raise ::ArgumentError
   end
 
   it 'ensures length of node is no more than 1023 characters' do
-    proc { JID.new('n'*1024) }.must_raise Blather::ArgumentError
+    proc { Blather::JID.new('n'*1024) }.must_raise Blather::ArgumentError
   end
 
   it 'ensures length of domain is no more than 1023 characters' do
-    proc { JID.new('n', 'd'*1024) }.must_raise Blather::ArgumentError
+    proc { Blather::JID.new('n', 'd'*1024) }.must_raise Blather::ArgumentError
   end
 
   it 'ensures length of resource is no more than 1023 characters' do
-    proc { JID.new('n', 'd', 'r'*1024) }.must_raise Blather::ArgumentError
+    proc { Blather::JID.new('n', 'd', 'r'*1024) }.must_raise Blather::ArgumentError
   end
 
-  it 'compares JIDs' do
-    (JID.new('a@b/c') <=> JID.new('d@e/f')).must_equal -1
-    (JID.new('a@b/c') <=> JID.new('a@b/c')).must_equal 0
-    (JID.new('d@e/f') <=> JID.new('a@b/c')).must_equal 1
+  it 'compares Blather::JIDs' do
+    (Blather::JID.new('a@b/c') <=> Blather::JID.new('d@e/f')).must_equal -1
+    (Blather::JID.new('a@b/c') <=> Blather::JID.new('a@b/c')).must_equal 0
+    (Blather::JID.new('d@e/f') <=> Blather::JID.new('a@b/c')).must_equal 1
   end
 
   it 'checks for equality' do
-    (JID.new('n@d/r') == JID.new('n@d/r')).must_equal true
+    (Blather::JID.new('n@d/r') == Blather::JID.new('n@d/r')).must_equal true
+    Blather::JID.new('n@d/r').eql?(Blather::JID.new('n@d/r')).must_equal true
   end
 
   it 'will strip' do
-    jid = JID.new('n@d/r')
-    jid.stripped.must_equal JID.new('n@d')
-    jid.must_equal JID.new('n@d/r')
+    jid = Blather::JID.new('n@d/r')
+    jid.stripped.must_equal Blather::JID.new('n@d')
+    jid.must_equal Blather::JID.new('n@d/r')
   end
 
   it 'will strip itself' do
-    jid = JID.new('n@d/r')
+    jid = Blather::JID.new('n@d/r')
     jid.strip!
-    jid.must_equal JID.new('n@d')
+    jid.must_equal Blather::JID.new('n@d')
   end
 
   it 'has a string representation' do
-    JID.new('n@d/r').to_s.must_equal 'n@d/r'
-    JID.new('n', 'd', 'r').to_s.must_equal 'n@d/r'
-    JID.new('n', 'd').to_s.must_equal 'n@d'
+    Blather::JID.new('n@d/r').to_s.must_equal 'n@d/r'
+    Blather::JID.new('n', 'd', 'r').to_s.must_equal 'n@d/r'
+    Blather::JID.new('n', 'd').to_s.must_equal 'n@d'
   end
 
   it 'provides a #stripped? helper' do
-    jid = JID.new 'a@b/c'
+    jid = Blather::JID.new 'a@b/c'
     jid.must_respond_to :stripped?
     jid.stripped?.wont_equal true
     jid.strip!