vines 0.3.2 → 0.4.0

data/test/config_test.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'tmpdir'
 require 'vines'
 require 'minitest/autorun'
 
@@ -17,12 +18,12 @@ class ConfigTest < MiniTest::Unit::TestCase
       Vines::Config.new do
         host 'wonderland.lit' do
           storage 'fs' do
-            dir '.'
+            dir Dir.tmpdir
           end
         end
         host 'WONDERLAND.LIT' do
           storage 'fs' do
-            dir '.'
+            dir Dir.tmpdir
           end
         end
       end
@@ -34,7 +35,7 @@ class ConfigTest < MiniTest::Unit::TestCase
       Vines::Config.new do
         host 'wonderland.lit', 'wonderland.lit' do
           storage 'fs' do
-            dir '.'
+            dir Dir.tmpdir
           end
         end
       end
@@ -45,7 +46,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.configure do
       host 'wonderland.lit' do
         storage :fs do
-          dir '.'
+          dir Dir.tmpdir
         end
       end
     end
@@ -56,11 +57,12 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_vhost
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     assert_equal ['wonderland.lit'], config.vhosts.keys
     assert config.vhost?('wonderland.lit')
+    refute config.vhost?('alice@wonderland.lit')
     refute config.vhost?('tea.wonderland.lit')
     refute config.vhost?('bogus')
   end
@@ -68,7 +70,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_port_lookup
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       client
     end
@@ -80,6 +82,9 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_duplicate_client
     assert_raises(RuntimeError) do
       Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+        end
         client
         client
       end
@@ -89,6 +94,9 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_duplicate_server
     assert_raises(RuntimeError) do
       Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+        end
         server
         server
       end
@@ -98,6 +106,9 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_duplicate_http
     assert_raises(RuntimeError) do
       Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+        end
         http
         http
       end
@@ -107,16 +118,61 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_duplicate_component
     assert_raises(RuntimeError) do
       Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+        end
         component
         component
       end
     end
   end
 
+  def test_duplicate_cluster
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+        end
+        cluster {}
+        cluster {}
+      end
+    end
+  end
+
+  def test_missing_cluster
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+    end
+    assert_nil config.cluster
+    refute config.cluster?
+  end
+
+  def test_cluster
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+      cluster do
+        host 'redis.wonderland.lit'
+        port 12345
+        database 8
+        password 'secr3t'
+      end
+    end
+    refute_nil config.cluster
+    assert config.cluster?
+    assert_equal 'redis.wonderland.lit', config.cluster.host
+    assert_equal 12345, config.cluster.port
+    assert_equal 8, config.cluster.database
+    assert_equal 'secr3t', config.cluster.password
+  end
+
   def test_default_client
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       client
     end
@@ -135,7 +191,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_configured_client
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       client '0.0.0.1', 42 do
         max_stanza_size 60_000
@@ -157,7 +213,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_max_stanza_size
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       client do
         max_stanza_size 0
@@ -169,7 +225,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_default_server
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       server
     end
@@ -188,7 +244,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_configured_server
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       server '0.0.0.1', 42 do
         max_stanza_size 60_000
@@ -199,7 +255,10 @@ class ConfigTest < MiniTest::Unit::TestCase
     refute_nil port
     assert config.s2s?('verona.lit')
     assert config.s2s?('denmark.lit')
-    assert !config.s2s?('bogus')
+    assert config.s2s?(Vines::JID.new('denmark.lit'))
+    refute config.s2s?(Vines::JID.new('hamlet@denmark.lit'))
+    refute config.s2s?('bogus')
+    refute config.s2s?(nil)
     assert_equal Vines::Config::ServerPort, port.class
     assert_equal '0.0.0.1', port.host
     assert_equal 42, port.port
@@ -212,7 +271,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_default_http
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       http
     end
@@ -233,7 +292,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_configured_http
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       http '0.0.0.1', 42 do
         bind '/custom'
@@ -259,7 +318,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_default_component
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       component
     end
@@ -277,7 +336,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_configured_component
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       component '0.0.0.1', 42 do
         max_stanza_size 60_000
@@ -299,7 +358,7 @@ class ConfigTest < MiniTest::Unit::TestCase
       config = Vines::Config.new do
         log 'bogus'
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
         end
       end
     end
@@ -309,20 +368,30 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       log :error
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     assert_equal Logger::ERROR, Class.new.extend(Vines::Log).log.level
   end
 
+  def test_null_storage
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+      end
+    end
+    assert_equal Vines::Storage::Local, config.storage('wonderland.lit').class
+    assert_equal Vines::Storage::Null, config.storage('bogus').class
+  end
+
   def test_cross_domain_messages
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       host 'verona.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     refute config.vhosts['wonderland.lit'].cross_domain_messages?
@@ -332,12 +401,14 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_local_jid?
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     refute config.local_jid?(nil)
     refute config.local_jid?('alice@wonderland.lit', nil)
     assert config.local_jid?('alice@wonderland.lit')
+    assert config.local_jid?(Vines::JID.new('alice@wonderland.lit'))
+    assert config.local_jid?(Vines::JID.new('wonderland.lit'))
     assert config.local_jid?('alice@wonderland.lit', 'romeo@verona.lit')
     refute config.local_jid?('alice@wonderland.lit', 'romeo@bogus.lit')
     refute config.local_jid?('alice@tea.wonderland.lit')
@@ -347,7 +418,7 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_missing_addresses_not_allowed
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     refute config.allowed?(nil, nil)
@@ -357,19 +428,21 @@ class ConfigTest < MiniTest::Unit::TestCase
   def test_same_domain_allowed
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     alice = Vines::JID.new('alice@wonderland.lit')
     hatter = Vines::JID.new('hatter@wonderland.lit')
     assert config.allowed?(alice, hatter)
+    assert config.allowed?(hatter, alice)
+    assert config.allowed?('wonderland.lit', alice)
   end
 
   def test_both_vhosts_with_cross_domain_allowed
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     alice = Vines::JID.new('alice@wonderland.lit')
@@ -382,11 +455,11 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       host 'verona.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     alice = Vines::JID.new('alice@wonderland.lit')
@@ -395,11 +468,70 @@ class ConfigTest < MiniTest::Unit::TestCase
     refute config.allowed?(romeo, alice)
   end
 
+  def test_same_domain_component_to_pubsub_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        cross_domain_messages false
+        storage(:fs) { dir Dir.tmpdir }
+        components 'tea' => 'secr3t', cake: 'passw0rd'
+        pubsub 'games'
+      end
+    end
+    alice = Vines::JID.new('alice@tea.wonderland.lit')
+    tea = Vines::JID.new('tea.wonderland.lit')
+    pubsub = Vines::JID.new('games.wonderland.lit')
+    assert config.allowed?(alice, pubsub)
+    assert config.allowed?(pubsub, alice)
+    assert config.allowed?(tea, pubsub)
+    assert config.allowed?(pubsub, tea)
+  end
+
+  def test_cross_domain_component_to_pubsub_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit', 'verona.lit' do
+        cross_domain_messages true
+        storage(:fs) { dir Dir.tmpdir }
+        components 'tea' => 'secr3t', cake: 'passw0rd'
+        pubsub 'games'
+      end
+    end
+    alice = Vines::JID.new('alice@tea.wonderland.lit')
+    tea = Vines::JID.new('tea.wonderland.lit')
+    pubsub = Vines::JID.new('games.verona.lit')
+    assert config.allowed?(alice, pubsub)
+    assert config.allowed?(pubsub, alice)
+    assert config.allowed?(tea, pubsub)
+    assert config.allowed?(pubsub, tea)
+  end
+
+  def test_cross_domain_component_to_pubsub_not_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        cross_domain_messages true
+        storage(:fs) { dir Dir.tmpdir }
+        components 'tea' => 'secr3t', cake: 'passw0rd'
+        pubsub 'games'
+      end
+      host 'verona.lit' do
+        cross_domain_messages false
+        storage(:fs) { dir Dir.tmpdir }
+        components 'party' => 'secr3t'
+      end
+    end
+    romeo = Vines::JID.new('romeo@party.verona.lit')
+    party = Vines::JID.new('party.verona.lit')
+    pubsub = Vines::JID.new('games.wonderland.lit')
+    refute config.allowed?(romeo, pubsub)
+    refute config.allowed?(pubsub, romeo)
+    refute config.allowed?(party, pubsub)
+    refute config.allowed?(pubsub, party)
+  end
+
   def test_same_domain_component_to_component_allowed
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -414,7 +546,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -428,14 +560,12 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
-    end
-    config = Vines::Config.new do
       host 'verona.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'party' => 'secr3t'
       end
     end
@@ -449,7 +579,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -463,7 +593,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit', 'verona.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -477,14 +607,12 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
-    end
-    config = Vines::Config.new do
       host 'verona.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     alice = Vines::JID.new('alice@tea.wonderland.lit')
@@ -497,12 +625,12 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
       host 'verona.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -515,15 +643,69 @@ class ConfigTest < MiniTest::Unit::TestCase
     refute config.allowed?(hamlet, romeo)
   end
 
+  def test_same_domain_user_to_pubsub_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        cross_domain_messages false
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'games'
+      end
+    end
+    alice = Vines::JID.new('alice@wonderland.lit')
+    pubsub = Vines::JID.new('games.wonderland.lit')
+    assert config.allowed?(alice, pubsub)
+    assert config.allowed?(pubsub, alice)
+  end
+
+  def test_cross_domain_user_to_pubsub_not_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        cross_domain_messages true
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'games'
+      end
+      host 'verona.lit' do
+        cross_domain_messages false
+        storage(:fs) { dir Dir.tmpdir }
+      end
+    end
+    pubsub = Vines::JID.new('games.wonderland.lit')
+    romeo = Vines::JID.new('romeo@verona.lit')
+    refute config.allowed?(pubsub, romeo)
+    refute config.allowed?(romeo, pubsub)
+  end
+
+  def test_remote_user_to_pubsub_allowed
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        cross_domain_messages true
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'games'
+      end
+      host 'verona.lit' do
+        cross_domain_messages false
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'games'
+      end
+    end
+    wonderland = Vines::JID.new('games.wonderland.lit')
+    verona = Vines::JID.new('games.verona.lit')
+    hamlet = Vines::JID.new('hamlet@denmark.lit')
+    assert config.allowed?(wonderland, hamlet)
+    assert config.allowed?(hamlet, wonderland)
+    refute config.allowed?(verona, hamlet)
+    refute config.allowed?(hamlet, verona)
+  end
+
   def test_remote_user_to_local_user_allowed
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       host 'verona.lit' do
         cross_domain_messages false
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     alice = Vines::JID.new('alice@wonderland.lit')
@@ -539,7 +721,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         cross_domain_messages true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     romeo = Vines::JID.new('romeo@verona.lit')

data/test/jid_test.rb

@@ -14,6 +14,7 @@ class JidTest < MiniTest::Unit::TestCase
       assert_equal '', jid.to_s
       assert_equal '', jid.bare.to_s
       assert jid.empty?
+      refute jid.domain?
     end
   end
 
@@ -32,6 +33,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_nil jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    assert jid.domain?
     refute jid.empty?
   end
 
@@ -42,6 +44,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    refute jid.domain?
     refute jid.empty?
   end
 
@@ -52,6 +55,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_nil jid.resource
     assert_equal jid, jid.bare
+    refute jid.domain?
     refute jid.empty?
   end
 
@@ -62,6 +66,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
     refute_equal jid, jid.bare
+    refute jid.domain?
     refute jid.empty?
   end
 
@@ -72,6 +77,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
     refute_equal jid, jid.bare
+    refute jid.domain?
     refute jid.empty?
   end
 
@@ -87,6 +93,7 @@ class JidTest < MiniTest::Unit::TestCase
     assert_nil jid.node
     assert_equal 'wonderland.lit', jid.domain
     assert_equal 'foo/bar@blarg', jid.resource
+    refute jid.domain?
   end
 
   def test_empty_part_raises