vines 0.2.1 → 0.3.0

data/test/stanza/iq/roster_test.rb

@@ -48,6 +48,20 @@ class RosterTest < MiniTest::Unit::TestCase
     assert @stream.verify
   end
 
+  def test_roster_get_with_invalid_to_address
+    alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
+    @stream.expect(:user, alice)
+
+    node = node(%q{
+      <iq id="42" type="get" to="romeo@verona.lit">
+        <query xmlns="jabber:iq:roster"/>
+      </iq>}.strip.gsub(/\n|\s{2,}/, ''))
+
+    stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
+    assert_raises(Vines::StanzaErrors::Forbidden) { stanza.process }
+    assert @stream.verify
+  end
+
   def test_roster_set_with_invalid_to_address
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     @stream.expect(:user, alice)
@@ -150,12 +164,9 @@ class RosterTest < MiniTest::Unit::TestCase
       @nodes << node
     end
 
-    router = MiniTest::Mock.new
-    router.expect(:interested_resources, [recipient], [alice.jid])
-
     @stream.expect(:user, alice)
+    @stream.expect(:interested_resources, [recipient], [alice.jid])
     @stream.expect(:update_user_streams, nil, [alice])
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
     @stream.expect(:storage, storage, ['wonderland.lit'])
     expected = node(%q{<iq id="42" type="result"/>})
@@ -174,7 +185,6 @@ class RosterTest < MiniTest::Unit::TestCase
     stanza.process
     assert @stream.verify
     assert storage.verify
-    assert router.verify
 
     expected = node(%q{
       <iq to="alice@wonderland.lit/tea" type="set">

data/test/stanza/iq/vcard_test.rb

@@ -7,6 +7,11 @@ require 'minitest/autorun'
 class VcardTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
   end
 
   def test_vcard_get_on_remote_jid_routes
@@ -14,9 +19,9 @@ class VcardTest < MiniTest::Unit::TestCase
     node = node(%q{<iq id="42" to="romeo@verona.lit" type="get"><vCard xmlns="vcard-temp"/></iq>})
 
     router = MiniTest::Mock.new
-    router.expect(:local?, false, [node])
     router.expect(:route, nil, [node])
 
+    @stream.expect(:config, @config)
     @stream.expect(:user, alice)
     @stream.expect(:router, router)
 
@@ -30,16 +35,12 @@ class VcardTest < MiniTest::Unit::TestCase
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     node = node(%q{<iq id="42" type="get"><vCard xmlns="vcard-temp"/></iq>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-
     card = node(%q{<vCard xmlns="vcard-temp"><FN>Alice in Wonderland</FN></vCard>})
 
     storage = MiniTest::Mock.new
     storage.expect(:find_vcard, card, [alice.jid.bare])
 
     @stream.expect(:user, alice)
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
     @stream.expect(:storage, storage, ['wonderland.lit'])
     expected = node(%q{
@@ -53,7 +54,6 @@ class VcardTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 
@@ -61,16 +61,13 @@ class VcardTest < MiniTest::Unit::TestCase
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     node = node(%q{<iq id="42" to="hatter@wonderland.lit" type="get"><vCard xmlns="vcard-temp"/></iq>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-
     card = node(%q{<vCard xmlns="vcard-temp"><FN>Mad Hatter</FN></vCard>})
 
     storage = MiniTest::Mock.new
     storage.expect(:find_vcard, card, [Vines::JID.new('hatter@wonderland.lit')])
 
+    @stream.expect(:config, @config)
     @stream.expect(:user, alice)
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
     @stream.expect(:storage, storage, ['wonderland.lit'])
     expected = node(%q{
@@ -84,7 +81,6 @@ class VcardTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 
@@ -92,21 +88,16 @@ class VcardTest < MiniTest::Unit::TestCase
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     node = node(%q{<iq id="42" type="get"><vCard xmlns="vcard-temp"/></iq>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-
     storage = MiniTest::Mock.new
     storage.expect(:find_vcard, nil, [alice.jid.bare])
 
     @stream.expect(:user, alice)
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
     @stream.expect(:storage, storage, ['wonderland.lit'])
 
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
     assert_raises(Vines::StanzaErrors::ItemNotFound) { stanza.process }
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 
@@ -114,11 +105,8 @@ class VcardTest < MiniTest::Unit::TestCase
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     node = node(%q{<iq id="42" to="hatter@wonderland.lit" type="set"><vCard xmlns="vcard-temp"><FN>Alice</FN></vCard></iq>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-
+    @stream.expect(:config, @config)
     @stream.expect(:user, alice)
-    @stream.expect(:router, router)
 
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
     assert_raises(Vines::StanzaErrors::Forbidden) { stanza.process }
@@ -130,14 +118,10 @@ class VcardTest < MiniTest::Unit::TestCase
     node = node(%q{<iq id="42" type="set"><vCard xmlns="vcard-temp"><FN>Alice</FN></vCard></iq>})
     card = node(%q{<vCard xmlns="vcard-temp"><FN>Alice</FN></vCard>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-
     storage = MiniTest::Mock.new
     storage.expect(:save_vcard, nil, [alice.jid, card])
 
     @stream.expect(:user, alice)
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
     @stream.expect(:storage, storage, ['wonderland.lit'])
     expected = node(%q{<iq id="42" to="alice@wonderland.lit/tea" type="result"/>})
@@ -146,7 +130,6 @@ class VcardTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 

data/test/stanza/iq/version_test.rb

@@ -0,0 +1,62 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class VersionTest < MiniTest::Unit::TestCase
+  def setup
+    @stream = MiniTest::Mock.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
+  end
+
+  def test_to_address_routes
+    alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
+    node = node(%q{<iq id="42" to="romeo@verona.lit" type="get"><query xmlns="jabber:iq:version"/></iq>})
+
+    router = MiniTest::Mock.new
+    router.expect(:route, nil, [node])
+
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
+    @stream.expect(:user, alice)
+    @stream.expect(:router, router)
+
+    stanza = Vines::Stanza::Iq::Version.new(node, @stream)
+    stanza.process
+    assert @stream.verify
+    assert router.verify
+  end
+
+  def test_version_get_returns_result
+    alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
+    node = node(%q{<iq id="42" type="get"><query xmlns="jabber:iq:version"/></iq>})
+
+    @stream.expect(:user, alice)
+    @stream.expect(:domain, 'wonderland.lit')
+
+    expected = node(%Q{
+      <iq from="wonderland.lit" id="42" to="alice@wonderland.lit/tea" type="result">
+        <query xmlns="jabber:iq:version">
+          <name>Vines</name>
+          <version>#{Vines::VERSION}</version>
+        </query>
+      </iq>}.strip.gsub(/\n|\s{2,}/, ''))
+
+    @stream.expect(:write, nil, [expected])
+
+    stanza = Vines::Stanza::Iq::Version.new(node, @stream)
+    stanza.process
+    assert @stream.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

data/test/stanza/iq_test.rb

@@ -8,8 +8,13 @@ class IqTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
     @stream.expect(:domain, 'wonderland.lit')
+     @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
   end
-  
+
   def test_allow_other_iq_to_route
     alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     hatter = Vines::User.new(:jid => 'hatter@wonderland.lit/crumpets')
@@ -30,31 +35,29 @@ class IqTest < MiniTest::Unit::TestCase
               </x>
             </feature>
           </si>
-        </iq>}.strip.gsub(/\n|\s{2,}/, ''))
+        </iq>
+    }.strip.gsub(/\n|\s{2,}/, ''))
 
     recipient = MiniTest::Mock.new
     recipient.expect(:write, nil, [node])
 
-    router = MiniTest::Mock.new
-    router.expect(:available_resources, [recipient], [alice.jid])
-    router.expect(:local?, true, [node])
-    
+    @stream.expect(:config, @config)
     @stream.expect(:user, hatter)
-    @stream.expect(:router, router)
     @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:available_resources, [recipient], [alice.jid.to_s])
 
     stanza = Vines::Stanza::Iq.new(node, @stream)
     stanza.process
     assert @stream.verify
     assert recipient.verify
   end
-  
+
   def test_feature_not_implemented
-    node = node('<iq type="set" id="42">')
+    node = node('<iq type="set" id="42"/>')
     stanza = Vines::Stanza::Iq.new(node, @stream)
     assert_raises(Vines::StanzaErrors::FeatureNotImplemented) { stanza.process }
   end
-  
+
   private
 
   def node(xml)

data/test/stanza/message_test.rb

@@ -7,6 +7,11 @@ require 'minitest/autorun'
 class MessageTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
   end
 
   def test_bad_type_returns_error
@@ -23,17 +28,12 @@ class MessageTest < MiniTest::Unit::TestCase
     recipient.expect(:user, alice)
     recipient.expect(:write, nil, [node])
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-    router.expect(:connected_resources, [recipient], [alice.jid.bare])
-
-    @stream.expect(:router, router)
     @stream.expect(:user, alice)
+    @stream.expect(:connected_resources, [recipient], [alice.jid.bare])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert recipient.verify
   end
 
@@ -41,20 +41,16 @@ class MessageTest < MiniTest::Unit::TestCase
     bogus = Vines::JID.new('bogus@wonderland.lit/cake')
     node = node(%Q{<message to="#{bogus}">hello!</message>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-    router.expect(:connected_resources, [], [bogus])
-
     storage = MiniTest::Mock.new
     storage.expect(:find_user, nil, [bogus])
 
-    @stream.expect(:router, router)
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, [bogus.domain])
+    @stream.expect(:connected_resources, [], [bogus])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 
@@ -62,20 +58,16 @@ class MessageTest < MiniTest::Unit::TestCase
     hatter = Vines::User.new(:jid => 'hatter@wonderland.lit/cake')
     node = node(%Q{<message to="#{hatter.jid}">hello!</message>})
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-    router.expect(:connected_resources, [], [hatter.jid])
-
     storage = MiniTest::Mock.new
     storage.expect(:find_user, hatter, [hatter.jid])
 
-    @stream.expect(:router, router)
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, [hatter.jid.domain])
+    @stream.expect(:connected_resources, [], [hatter.jid])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
     assert_raises(Vines::StanzaErrors::ServiceUnavailable) { stanza.process }
     assert @stream.verify
-    assert router.verify
     assert storage.verify
   end
 
@@ -89,17 +81,17 @@ class MessageTest < MiniTest::Unit::TestCase
     recipient.expect(:user, romeo)
     recipient.expect(:write, nil, [expected])
 
-    router = MiniTest::Mock.new
-    router.expect(:local?, true, [node])
-    router.expect(:connected_resources, [recipient], [romeo.jid])
+    @config.host 'verona.lit' do
+      storage(:fs) { dir '.' }
+    end
 
-    @stream.expect(:router, router)
+    @stream.expect(:config, @config)
     @stream.expect(:user, alice)
+    @stream.expect(:connected_resources, [recipient], [romeo.jid])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
     stanza.process
     assert @stream.verify
-    assert router.verify
     assert recipient.verify
   end
 
@@ -110,7 +102,7 @@ class MessageTest < MiniTest::Unit::TestCase
     expected = node(%Q{<message to="#{romeo.jid}" from="#{alice.jid}">hello!</message>})
 
     router = MiniTest::Mock.new
-    router.expect(:local?, false, [node])
+    @stream.expect(:config, @config)
     router.expect(:route, nil, [expected])
 
     @stream.expect(:router, router)

data/test/stanza/presence/probe_test.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class ProbeTest < MiniTest::Unit::TestCase
+  def setup
+    @alice = Vines::JID.new('alice@wonderland.lit/tea')
+    @stream = MiniTest::Mock.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
+  end
+
+  def test_missing_to_address_raises
+    node = node(%q{<presence id="42" type="probe"/>})
+    stanza = Vines::Stanza::Presence::Probe.new(node, @stream)
+    def stanza.inbound?; false; end
+
+    @stream.expect(:user, Vines::User.new(jid: @alice))
+
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert @stream.verify
+  end
+
+  def test_to_remote_address_routes
+    node = node(%q{<presence id="42" to="romeo@verona.lit" type="probe"/>})
+    stanza = Vines::Stanza::Presence::Probe.new(node, @stream)
+    def stanza.inbound?; false; end
+
+    expected = node(%Q{<presence id="42" to="romeo@verona.lit" type="probe" from="#{@alice}"/>})
+    router = MiniTest::Mock.new
+    router.expect(:route, nil, [expected])
+
+    @stream.expect(:router, router)
+    @stream.expect(:user, Vines::User.new(jid: @alice))
+    @stream.expect(:config, @config)
+
+    stanza.process
+    assert @stream.verify
+    assert router.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end