vines 0.2.1 → 0.3.0

data/test/contact_test.rb

@@ -21,8 +21,14 @@ class ContactTest < MiniTest::Unit::TestCase
     refute alice.hash == hatter.hash
   end
 
-  def test_initialize_missing_jid
+  def test_initialize_missing_jid_raises
     assert_raises(ArgumentError) { Vines::Contact.new }
+    assert_raises(ArgumentError) { Vines::Contact.new(:jid => '') }
+  end
+
+  def test_initialize_domain_only_jid_does_not_raise
+    contact = Vines::Contact.new(:jid => 'tea.wonderland.lit')
+    assert_equal 'tea.wonderland.lit', contact.jid.to_s
   end
 
   def test_to_roster_xml_sorts_groups

data/test/jid_test.rb

@@ -13,6 +13,7 @@ class JidTest < MiniTest::Unit::TestCase
       assert_equal '', jid.domain
       assert_equal '', jid.to_s
       assert_equal '', jid.bare.to_s
+      assert jid.empty?
     end
   end
 
@@ -31,6 +32,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_nil jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    refute jid.empty?
   end
 
   def test_bare_jid
@@ -40,6 +42,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    refute jid.empty?
   end
 
   def test_parsed_bare_jid
@@ -49,6 +52,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    refute jid.empty?
   end
 
   def test_full_jid
@@ -58,6 +62,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
     refute_equal jid, jid.bare
+    refute jid.empty?
   end
 
   def test_parsed_full_jid
@@ -67,5 +72,48 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
     refute_equal jid, jid.bare
+    refute jid.empty?
+  end
+
+  def test_node_with_separators_in_resource
+    jid = Vines::JID.new('alice@wonderland.lit/foo/bar@blarg')
+    assert_equal 'alice', jid.node
+    assert_equal 'wonderland.lit', jid.domain
+    assert_equal 'foo/bar@blarg', jid.resource
+  end
+
+  def test_missing_node_with_separators_in_resource
+    jid = Vines::JID.new('wonderland.lit/foo/bar@blarg')
+    assert_nil jid.node
+    assert_equal 'wonderland.lit', jid.domain
+    assert_equal 'foo/bar@blarg', jid.resource
+  end
+
+  def test_empty_part_raises
+    assert_raises(ArgumentError) { Vines::JID.new('@wonderland.lit') }
+    assert_raises(ArgumentError) { Vines::JID.new('wonderland.lit/') }
+    assert_raises(ArgumentError) { Vines::JID.new('@') }
+    assert_raises(ArgumentError) { Vines::JID.new('alice@') }
+    assert_raises(ArgumentError) { Vines::JID.new('/') }
+    assert_raises(ArgumentError) { Vines::JID.new('/res') }
+    assert_raises(ArgumentError) { Vines::JID.new('@/') }
+  end
+
+  def test_invalid_characters
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice"s@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice&s@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice's@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice:s@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice<s@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new(%q{alice>s@wonderland.lit}) }
+    assert_raises(ArgumentError) { Vines::JID.new("alice\u0000s@wonderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice\ts@wonderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new(" alice@wonderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice@wonderland.lit ") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice s@wonderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice@w onderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice@wonderland.lit/ res") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice@w\u0000onderland.lit") }
+    assert_raises(ArgumentError) { Vines::JID.new("alice@wonderland.lit/\u0000res") }
   end
 end

data/test/router_test.rb

@@ -5,57 +5,26 @@ require 'minitest/autorun'
 
 class RouterTest < MiniTest::Unit::TestCase
   def setup
+    @alice = Vines::JID.new('alice@wonderland.lit/tea')
+    @stream = MiniTest::Mock.new
     @router = Vines::Router.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
   end
 
-  def test_non_routable_stanza_is_local
-    stanza = MiniTest::Mock.new
-    stanza.expect(:name, 'auth')
-    assert @router.local?(stanza)
-    assert stanza.verify
-  end
-
-  def test_stanza_missing_to_is_local
-    stanza = MiniTest::Mock.new
-    stanza.expect(:name, 'message')
-    stanza.expect(:[], nil, ['to'])
-    assert @router.local?(stanza)
-    assert stanza.verify
-  end
-
-  def test_stanza_with_local_jid_is_local
-    config = MiniTest::Mock.new
-    config.expect(:vhost?, true, ['wonderland.lit'])
-    stream = MiniTest::Mock.new
-    stream.expect(:config, config)
-    stream.expect(:stream_type, :client)
-    @router << stream
-
-    stanza = MiniTest::Mock.new
-    stanza.expect(:name, 'message')
-    stanza.expect(:[], 'alice@wonderland.lit', ['to'])
-    assert @router.local?(stanza)
-
-    assert stanza.verify
-    assert stream.verify
-    assert config.verify
-  end
-
-  def test_stanza_with_remote_jid_is_not_local
-    config = MiniTest::Mock.new
-    config.expect(:vhost?, false, ['wonderland.lit'])
-    stream = MiniTest::Mock.new
-    stream.expect(:config, config)
-    stream.expect(:stream_type, :client)
-    @router << stream
+  def test_connected_resources
+    assert_equal 0, @router.connected_resources(@alice, @alice).size
 
-    stanza = MiniTest::Mock.new
-    stanza.expect(:name, 'message')
-    stanza.expect(:[], 'alice@wonderland.lit', ['to'])
-    assert !@router.local?(stanza)
+    @stream.expect(:config, @config)
+    @stream.expect(:stream_type, :client)
+    @stream.expect(:connected?, true)
+    @stream.expect(:user, Vines::User.new(jid: @alice))
+    @router << @stream
 
-    assert stanza.verify
-    assert stream.verify
-    assert config.verify
+    assert_equal 1, @router.connected_resources(@alice, @alice).size
+    assert @stream.verify
   end
 end

data/test/stanza/iq/disco_info_test.rb

@@ -0,0 +1,76 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class DiscoInfoTest < MiniTest::Unit::TestCase
+  ALICE = Vines::User.new(:jid => 'alice@wonderland.lit/home')
+
+  def setup
+    @config = MiniTest::Mock.new
+    @stream = MiniTest::Mock.new
+    @stream.expect(:user, ALICE)
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
+  end
+
+  def test_private_storage_disabled
+    query = %q{<query xmlns="http://jabber.org/protocol/disco#info"/>}
+    node = node(%Q{<iq id="42" to="wonderland.lit" type="get">#{query}</iq>})
+
+    expected = node(%Q{
+      <iq from="wonderland.lit" id="42" to="#{ALICE.jid}" type="result">
+        <query xmlns="http://jabber.org/protocol/disco#info">
+          <identity category="server" type="im"/>
+          <feature var="http://jabber.org/protocol/disco#info"/>
+          <feature var="http://jabber.org/protocol/disco#items"/>
+          <feature var="urn:xmpp:ping"/>
+          <feature var="vcard-temp"/>
+          <feature var="jabber:iq:version"/>
+        </query>
+      </iq>
+    }.strip.gsub(/\n|\s{2,}/, ''))
+
+    @config.expect(:private_storage?, false, ['wonderland.lit'])
+    @stream.expect(:write, nil, [expected])
+
+    stanza = Vines::Stanza::Iq::DiscoInfo.new(node, @stream)
+    stanza.process
+    assert @stream.verify
+    assert @config.verify
+  end
+
+  def test_private_storage_enabled
+    query = %q{<query xmlns="http://jabber.org/protocol/disco#info"/>}
+    node = node(%Q{<iq id="42" to="wonderland.lit" type="get">#{query}</iq>})
+
+    expected = node(%Q{
+      <iq from="wonderland.lit" id="42" to="#{ALICE.jid}" type="result">
+        <query xmlns="http://jabber.org/protocol/disco#info">
+          <identity category="server" type="im"/>
+          <feature var="http://jabber.org/protocol/disco#info"/>
+          <feature var="http://jabber.org/protocol/disco#items"/>
+          <feature var="urn:xmpp:ping"/>
+          <feature var="vcard-temp"/>
+          <feature var="jabber:iq:version"/>
+          <feature var="jabber:iq:private"/>
+        </query>
+      </iq>
+    }.strip.gsub(/\n|\s{2,}/, ''))
+
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
+    @stream.expect(:write, nil, [expected])
+
+    stanza = Vines::Stanza::Iq::DiscoInfo.new(node, @stream)
+    stanza.process
+    assert @stream.verify
+    assert @config.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

data/test/stanza/iq/disco_items_test.rb

@@ -0,0 +1,47 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class DiscoItemsTest < MiniTest::Unit::TestCase
+  def setup
+    @stream = MiniTest::Mock.new
+  end
+
+  def test_component_items
+    query = %q{<query xmlns="http://jabber.org/protocol/disco#items"/>}
+    node = node(%Q{<iq id="42" to="wonderland.lit" type="get">#{query}</iq>})
+
+    expected = node(%q{
+      <iq from="wonderland.lit" id="42" to="alice@wonderland.lit/home" type="result">
+        <query xmlns="http://jabber.org/protocol/disco#items">
+          <item jid="cake.wonderland.lit"/>
+          <item jid="tea.wonderland.lit"/>
+        </query>
+      </iq>
+    }.strip.gsub(/\n|\s{2,}/, ''))
+
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+        components 'tea' => 'secr3t', 'cake' => 'passw0rd'
+      end
+    end
+
+    @stream.expect(:config, config)
+    @stream.expect(:user, Vines::User.new(:jid => 'alice@wonderland.lit/home'))
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:write, nil, [expected])
+
+    stanza = Vines::Stanza::Iq::DiscoItems.new(node, @stream)
+    stanza.process
+    assert @stream.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

data/test/stanza/iq/private_storage_test.rb

@@ -6,6 +6,7 @@ require 'minitest/autorun'
 
 class PrivateStorageTest < MiniTest::Unit::TestCase
   def setup
+    @config = MiniTest::Mock.new
     @stream = MiniTest::Mock.new
   end
 
@@ -13,11 +14,14 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"><one xmlns="a"/></query>}
     node = node(%Q{<iq id="42" type="get">#{query}</iq>})
 
-    @stream.expect(:private_storage?, false)
+    @config.expect(:private_storage?, false, ['wonderland.lit'])
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::ServiceUnavailable) { stanza.process }
     assert @stream.verify
+    assert @config.verify
   end
 
   def test_get_another_user_fragment_raises_error
@@ -25,7 +29,6 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"><one xmlns="a"/></query>}
     node = node(%Q{<iq id="42" to="hatter@wonderland.lit" type="get">#{query}</iq>})
 
-    @stream.expect(:private_storage?, true)
     @stream.expect(:user, alice)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
@@ -38,11 +41,14 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"></query>}
     node = node(%Q{<iq id="42" type="get">#{query}</iq>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::NotAcceptable) { stanza.process }
     assert @stream.verify
+    assert @config.verify
   end
 
   def test_get_with_two_children_raises_error
@@ -50,11 +56,14 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"><one xmlns="a"/><two xmlns="b"/></query>}
     node = node(%Q{<iq id="42" type="get">#{query}</iq>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::NotAcceptable) { stanza.process }
     assert @stream.verify
+    assert @config.verify
   end
 
   def test_set_with_zero_children_raises_error
@@ -62,11 +71,14 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"></query>}
     node = node(%Q{<iq id="42" type="set">#{query}</iq>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::NotAcceptable) { stanza.process }
     assert @stream.verify
+    assert @config.verify
   end
 
   def test_get_without_namespace_raises_error
@@ -74,11 +86,14 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     query = %q{<query xmlns="jabber:iq:private"><one/></query>}
     node = node(%Q{<iq id="42" type="get">#{query}</iq>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
+    @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::NotAcceptable) { stanza.process }
     assert @stream.verify
+    assert @config.verify
   end
 
   def test_get_missing_fragment_raises_error
@@ -89,14 +104,16 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     storage = MiniTest::Mock.new
     storage.expect(:find_fragment, nil, [alice.jid, node.elements[0].elements[0]])
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
     @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, ['wonderland.lit'])
     @stream.expect(:user, alice)
 
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     assert_raises(Vines::StanzaErrors::ItemNotFound) { stanza.process }
     assert @stream.verify
+    assert @config.verify
     assert storage.verify
   end
 
@@ -112,8 +129,9 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     storage = MiniTest::Mock.new
     storage.expect(:find_fragment, node(data), [alice.jid, node.elements[0].elements[0]])
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
     @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, ['wonderland.lit'])
     @stream.expect(:user, alice)
     @stream.expect(:write, nil, [expected])
@@ -121,6 +139,7 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     stanza.process
     assert @stream.verify
+    assert @config.verify
     assert storage.verify
   end
 
@@ -134,8 +153,9 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
 
     expected = node(%Q{<iq from="#{alice.jid}" id="42" to="#{alice.jid}" type="result"/>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
     @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, ['wonderland.lit'])
     @stream.expect(:user, alice)
     @stream.expect(:write, nil, [expected])
@@ -143,6 +163,7 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     stanza.process
     assert @stream.verify
+    assert @config.verify
     assert storage.verify
   end
 
@@ -157,8 +178,9 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
 
     expected = node(%Q{<iq from="#{alice.jid}" id="42" to="#{alice.jid}" type="result"/>})
 
-    @stream.expect(:private_storage?, true)
+    @config.expect(:private_storage?, true, ['wonderland.lit'])
     @stream.expect(:domain, 'wonderland.lit')
+    @stream.expect(:config, @config)
     @stream.expect(:storage, storage, ['wonderland.lit'])
     @stream.expect(:user, alice)
     @stream.expect(:write, nil, [expected])
@@ -166,6 +188,7 @@ class PrivateStorageTest < MiniTest::Unit::TestCase
     stanza = Vines::Stanza::Iq::PrivateStorage.new(node, @stream)
     stanza.process
     assert @stream.verify
+    assert @config.verify
     assert storage.verify
   end