RubyGems - blather - Versions diffs - 0.2.1 → 0.2.2 - Mend

blather 0.2.1 → 0.2.2

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 (84) hide show

data/LICENSE +2 -0
data/README.rdoc +54 -29
data/Rakefile +94 -13
data/VERSION.yml +4 -0
data/examples/drb_client.rb +2 -4
data/examples/echo.rb +13 -8
data/examples/pubsub/cli.rb +64 -0
data/examples/pubsub/ping_pong.rb +18 -0
data/examples/pubsub/pubsub_dsl.rb +52 -0
data/examples/pubsub_client.rb +39 -0
data/examples/rosterprint.rb +14 -0
data/examples/xmpp4r/echo.rb +35 -0
data/ext/extconf.rb +65 -0
data/lib/blather.rb +18 -121
data/lib/blather/client.rb +13 -0
data/lib/blather/client/client.rb +165 -0
data/lib/blather/client/dsl.rb +99 -0
data/lib/blather/client/pubsub.rb +53 -0
data/lib/blather/client/pubsub/node.rb +27 -0
data/lib/blather/core_ext/active_support.rb +1 -0
data/lib/blather/core_ext/libxml.rb +7 -1
data/lib/blather/errors.rb +39 -18
data/lib/blather/errors/sasl_error.rb +87 -0
data/lib/blather/errors/stanza_error.rb +262 -0
data/lib/blather/errors/stream_error.rb +253 -0
data/lib/blather/jid.rb +9 -16
data/lib/blather/roster.rb +9 -0
data/lib/blather/roster_item.rb +7 -4
data/lib/blather/stanza.rb +19 -25
data/lib/blather/stanza/disco.rb +9 -0
data/lib/blather/stanza/disco/disco_info.rb +84 -0
data/lib/blather/stanza/disco/disco_items.rb +59 -0
data/lib/blather/stanza/iq.rb +16 -4
data/lib/blather/stanza/iq/query.rb +6 -4
data/lib/blather/stanza/iq/roster.rb +38 -38
data/lib/blather/stanza/pubsub.rb +33 -0
data/lib/blather/stanza/pubsub/affiliations.rb +52 -0
data/lib/blather/stanza/pubsub/errors.rb +9 -0
data/lib/blather/stanza/pubsub/event.rb +21 -0
data/lib/blather/stanza/pubsub/items.rb +59 -0
data/lib/blather/stanza/pubsub/owner.rb +9 -0
data/lib/blather/stanza/pubsub/subscriptions.rb +57 -0
data/lib/blather/stream.rb +125 -57
data/lib/blather/stream/client.rb +26 -0
data/lib/blather/stream/component.rb +34 -0
data/lib/blather/stream/parser.rb +17 -27
data/lib/blather/stream/resource.rb +21 -24
data/lib/blather/stream/sasl.rb +60 -37
data/lib/blather/stream/session.rb +12 -19
data/lib/blather/stream/stream_handler.rb +39 -0
data/lib/blather/stream/tls.rb +22 -18
data/lib/blather/xmpp_node.rb +91 -17
data/spec/blather/core_ext/libxml_spec.rb +58 -0
data/spec/blather/errors/sasl_error_spec.rb +56 -0
data/spec/blather/errors/stanza_error_spec.rb +148 -0
data/spec/blather/errors/stream_error_spec.rb +114 -0
data/spec/blather/errors_spec.rb +40 -0
data/spec/blather/jid_spec.rb +0 -7
data/spec/blather/roster_item_spec.rb +5 -0
data/spec/blather/roster_spec.rb +6 -6
data/spec/blather/stanza/discos/disco_info_spec.rb +207 -0
data/spec/blather/stanza/discos/disco_items_spec.rb +136 -0
data/spec/blather/stanza/iq/query_spec.rb +9 -2
data/spec/blather/stanza/iq/roster_spec.rb +117 -1
data/spec/blather/stanza/iq_spec.rb +29 -0
data/spec/blather/stanza/presence/subscription_spec.rb +12 -1
data/spec/blather/stanza/presence_spec.rb +29 -0
data/spec/blather/stanza/pubsub/affiliations_spec.rb +46 -0
data/spec/blather/stanza/pubsub/items_spec.rb +59 -0
data/spec/blather/stanza/pubsub/subscriptions_spec.rb +63 -0
data/spec/blather/stanza/pubsub_spec.rb +26 -0
data/spec/blather/stanza_spec.rb +13 -1
data/spec/blather/stream/client_spec.rb +787 -0
data/spec/blather/stream/component_spec.rb +86 -0
data/spec/blather/xmpp_node_spec.rb +75 -22
data/spec/fixtures/pubsub.rb +157 -0
data/spec/spec_helper.rb +6 -14
metadata +86 -74
data/CHANGELOG +0 -5
data/Manifest +0 -47
data/blather.gemspec +0 -41
data/lib/blather/stanza/error.rb +0 -31
data/spec/blather/stream_spec.rb +0 -462
data/spec/build_safe.rb +0 -20

data/spec/blather/stream/component_spec.rb ADDED

@@ -0,0 +1,86 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+describe 'Blather::Stream::Component' do
+  class MockServer; end
+  module ServerMock
+    def receive_data(data)
+      @server ||= MockServer.new
+      @server.receive_data data, self
+    end
+  end
+  def mocked_server(times = nil, &block)
+    @client ||= mock()
+    @client.stubs(:stopped) unless @client.respond_to?(:stopped)
+    @client.stubs(:jid=) unless @client.respond_to?(:jid=)
+    MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
+    EventMachine::run {
+      # 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 }
+    }
+  end
+  it 'can be started' do
+    client = mock()
+    params = [client, 'comp.id', 'secret', 'host', 1234]
+    EM.expects(:connect).with do |*parms|
+      parms[0] == 'host'    &&
+      parms[1] == 1234      &&
+      parms[3] == client    &&
+      parms[4] == 'comp.id'
+    end
+    Stream::Component.start *params
+  end
+  it 'shakes hands with the server' do
+    state = nil
+    mocked_server(2) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:component:accept' xmlns:stream='http://etherx.jabber.org/streams' id='12345'>"
+        val.must_match(/stream:stream/)
+      when :started
+        server.send_data '<handshake/>'
+        EM.stop
+        val.must_equal "<handshake>#{Digest::SHA1.hexdigest('12345'+"secret")}</handshake>"
+      end
+    end
+  end
+  it 'starts the stream once the connection is complete' do
+    mocked_server(1) { |val, _| EM.stop; val.must_match(/stream:stream/) }
+  end
+  it 'sends stanzas to the client when the stream is ready' do
+    @client = mock(:stream_started)
+    @client.expects(:call).with do |n|
+      EM.stop
+      n.kind_of?(Stanza::Message) && @stream.ready?.must_equal(true)
+    end
+    state = nil
+    mocked_server(2) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:component:accept' xmlns:stream='http://etherx.jabber.org/streams' id='12345'>"
+        val.must_match(/stream:stream/)
+      when :started
+        server.send_data '<handshake/>'
+        server.send_data "<message to='comp.id' from='d@e/f' type='chat' xml:lang='en'><body>Message!</body></message>"
+        val.must_equal "<handshake>#{Digest::SHA1.hexdigest('12345'+"secret")}</handshake>"
+      end
+    end
+  end
+end

data/spec/blather/xmpp_node_spec.rb CHANGED

@@ -14,38 +14,85 @@ describe 'Blather::XMPPNode' do
   it 'sets the namespace on creation' do
     class Foo < XMPPNode; end
-    Foo.xmlns = 'foo'
-    Foo.new('foo').xmlns.must_equal 'foo'
+    Foo.ns = 'foo'
+    Foo.new('foo').namespace.must_equal 'foo'
   end
   it 'registers sub classes' do
     class Foo < XMPPNode; register 'foo', 'foo:bar'; end
     Foo.name.must_equal 'foo'
-    Foo.xmlns.must_equal 'foo:bar'
+    Foo.ns.must_equal 'foo:bar'
     XMPPNode.class_from_registration('foo', 'foo:bar').must_equal Foo
   end
   it 'imports another node' do
     class Foo < XMPPNode; register 'foo', 'foo:bar'; end
     n = XMPPNode.new('foo')
-    n.xmlns = 'foo:bar'
+    n.namespace = 'foo:bar'
     XMPPNode.import(n).must_be_kind_of Foo
   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'
+  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'
+  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'
+  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
   end
-  it 'provides "attr_accessor" for xmlns' do
+  it 'provides "attr_accessor" for namespace' do
     n = XMPPNode.new('foo')
-    n.xmlns.must_be_nil
-    n['xmlns'].must_be_nil
+    n.namespace.must_be_nil
-    n.xmlns = 'foo:bar'
-    n.xmlns.must_equal 'foo:bar'
-    n['xmlns'].must_equal 'foo:bar'
+    n.namespace = 'foo:bar'
+    n.namespace.must_equal 'foo:bar'
   end
   it 'will remove a child element' do
@@ -53,22 +100,22 @@ describe 'Blather::XMPPNode' do
     n << XMPPNode.new('bar')
     n << XMPPNode.new('bar')
-    n.find('bar').size.must_equal 2
+    n.find(:bar).size.must_equal 2
     n.remove_child 'bar'
-    n.find('bar').size.must_equal 1
+    n.find(:bar).size.must_equal 1
   end
   it 'will remove a child with a specific xmlns' do
     n = XMPPNode.new 'foo'
     n << XMPPNode.new('bar')
     c = XMPPNode.new('bar')
-    c.xmlns = 'foo:bar'
+    c.namespace = 'foo:bar'
     n << c
-    n.find('bar').size.must_equal 2
+    n.find(:bar).size.must_equal 2
     n.remove_child 'bar', 'foo:bar'
-    n.find('bar').size.must_equal 1
-    n.find('bar').first.xmlns.must_be_nil
+    n.find(:bar).size.must_equal 1
+    n.find(:bar).first.namespace.must_be_nil
   end
   it 'will remove all child elements' do
@@ -76,9 +123,9 @@ describe 'Blather::XMPPNode' do
     n << XMPPNode.new('bar')
     n << XMPPNode.new('bar')
-    n.find('bar').size.must_equal 2
+    n.find(:bar).size.must_equal 2
     n.remove_children 'bar'
-    n.find('bar').size.must_equal 0
+    n.find(:bar).size.must_equal 0
   end
   it 'provides a helper to grab content from a child' do
@@ -113,18 +160,24 @@ describe 'Blather::XMPPNode' do
     n['foo'].must_equal 'bar'
   end
-  it 'cuts line breaks out of #to_s' do
+  it 'cuts line breaks out of #to_xml' do
     n = XMPPNode.new 'foo'
     n << XMPPNode.new('bar', 'baz')
-    n.to_s.scan(">\n<").size.must_equal 0
+    n.to_xml.scan(">\n<").size.must_equal 0
   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
+    n.find(:bar).must_be_kind_of Array
     XML::Document.new.root = n
-    n.find('bar').must_be_kind_of XML::XPath::Object
+    n.find(:bar).must_be_kind_of XML::XPath::Object
+  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>"
   end
 end

data/spec/fixtures/pubsub.rb ADDED

@@ -0,0 +1,157 @@
+def items_all_nodes_xml
+<<-ITEMS
+<iq type='result'
+    from='pubsub.shakespeare.lit'
+    to='francisco@denmark.lit/barracks'
+    id='items1'>
+  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+    <items node='princely_musings'>
+      <item id='368866411b877c30064a5f62b917cffe'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>The Uses of This World</title>
+          <summary>
+O, that this too too solid flesh would melt
+Thaw and resolve itself into a dew!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-12T17:47:23Z</published>
+          <updated>2003-12-12T17:47:23Z</updated>
+        </entry>
+      </item>
+      <item id='3300659945416e274474e469a1f0154c'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>Ghostly Encounters</title>
+          <summary>
+O all you host of heaven! O earth! what else?
+And shall I couple hell? O, fie! Hold, hold, my heart;
+And you, my sinews, grow not instant old,
+But bear me stiffly up. Remember thee!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-12T23:21:34Z</published>
+          <updated>2003-12-12T23:21:34Z</updated>
+        </entry>
+      </item>
+      <item id='4e30f35051b7b8b42abe083742187228'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>Alone</title>
+          <summary>
+Now I am alone.
+O, what a rogue and peasant slave am I!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-13T11:09:53Z</published>
+          <updated>2003-12-13T11:09:53Z</updated>
+        </entry>
+      </item>
+      <item id='ae890ac52d0df67ed7cfdf51b644e901'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>Soliloquy</title>
+          <summary>
+To be, or not to be: that is the question:
+Whether 'tis nobler in the mind to suffer
+The slings and arrows of outrageous fortune,
+Or to take arms against a sea of troubles,
+And by opposing end them?
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32397</id>
+          <published>2003-12-13T18:30:02Z</published>
+          <updated>2003-12-13T18:30:02Z</updated>
+        </entry>
+      </item>
+    </items>
+  </pubsub>
+</iq>
+ITEMS
+end
+def pubsub_items_some_xml
+<<-ITEMS
+<iq type='result'
+    from='pubsub.shakespeare.lit'
+    to='francisco@denmark.lit/barracks'
+    id='items1'>
+  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+    <items node='princely_musings'>
+      <item id='368866411b877c30064a5f62b917cffe'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>The Uses of This World</title>
+          <summary>
+O, that this too too solid flesh would melt
+Thaw and resolve itself into a dew!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-12T17:47:23Z</published>
+          <updated>2003-12-12T17:47:23Z</updated>
+        </entry>
+      </item>
+      <item id='3300659945416e274474e469a1f0154c'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>Ghostly Encounters</title>
+          <summary>
+O all you host of heaven! O earth! what else?
+And shall I couple hell? O, fie! Hold, hold, my heart;
+And you, my sinews, grow not instant old,
+But bear me stiffly up. Remember thee!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-12T23:21:34Z</published>
+          <updated>2003-12-12T23:21:34Z</updated>
+        </entry>
+      </item>
+      <item id='4e30f35051b7b8b42abe083742187228'>
+        <entry xmlns='http://www.w3.org/2005/Atom'>
+          <title>Alone</title>
+          <summary>
+Now I am alone.
+O, what a rogue and peasant slave am I!
+          </summary>
+          <link rel='alternate' type='text/html'
+                href='http://denmark.lit/2003/12/13/atom03'/>
+          <id>tag:denmark.lit,2003:entry-32396</id>
+          <published>2003-12-13T11:09:53Z</published>
+          <updated>2003-12-13T11:09:53Z</updated>
+        </entry>
+      </item>
+    </items>
+    <set xmlns='http://jabber.org/protocol/rsm'>
+      <first index='0'>368866411b877c30064a5f62b917cffe</first>
+      <last>4e30f35051b7b8b42abe083742187228</last>
+      <count>19</count>
+    </set>
+  </pubsub>
+</iq>
+ITEMS
+end
+def affiliations_xml
+<<-NODE
+<iq type='result'
+    from='pubsub.shakespeare.lit'
+    to='francisco@denmark.lit'
+    id='affil1'>
+  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+    <affiliations>
+      <affiliation node='node1' affiliation='owner'/>
+      <affiliation node='node2' affiliation='owner'/>
+      <affiliation node='node3' affiliation='publisher'/>
+      <affiliation node='node4' affiliation='outcast'/>
+      <affiliation node='node5' affiliation='member'/>
+      <affiliation node='node6' affiliation='none'/>
+    </affiliations>
+  </pubsub>
+</iq>
+NODE
+end

data/spec/spec_helper.rb CHANGED

@@ -2,27 +2,23 @@ require File.join(File.dirname(__FILE__), *%w[.. lib blather])
 require 'rubygems'
 require 'minitest/spec'
 require 'mocha'
+require 'mocha/expectation_error'
 module MiniTest
-  if MINI_DIR =~ %r{^./}
-    require 'pathname'
-    path = Pathname.new(MINI_DIR).realpath
-#    remove_const 'MINI_DIR'
-#    const_set 'MINI_DIR', path.to_s
-  end
+  require 'pathname' if MINI_DIR =~ %r{^./}
   module Assertions
-    def assert_change(obj, method, args = {}, msg = nil)
+    def assert_change(stmt, args = {}, msg = nil)
       msg ||= proc {
-        m = "Expected #{obj}.#{method} to change"
+        m = "Expected #{stmt} to change"
         m << " by #{mu_pp args[:by]}" if args[:by]
         m << (args[:from] ? " from #{mu_pp args[:from]}" : '') + " to #{mu_pp args[:to]}" if args[:to]
         m
       }.call
-      init_val = eval(obj).__send__(method)
+      init_val = eval(stmt)
       yield
-      new_val = eval(obj).__send__(method)
+      new_val = eval(stmt)
       assert_equal(args[:by], (new_val - init_val), msg) if args[:by]
       assert_equal([args[:from], args[:to]], [(init_val if args[:from]), new_val], msg) if args[:to]
@@ -37,11 +33,7 @@ class Object
   end
 end
-require 'mocha/expectation_error'
 include Blather
 include MiniTest
-LOG.level = Logger::INFO
 Unit.autorun