test/config_test.rb in vines-0.3.2 vs test/config_test.rb in vines-0.4.0

@@ -1,7 +1,8 @@
 # encoding: UTF-8
 
+require 'tmpdir'
 require 'vines'
 require 'minitest/autorun'
 
 class ConfigTest < MiniTest::Unit::TestCase
   def test_missing_host
@@ -15,16 +16,16 @@
   def test_duplicate_host
     assert_raises(RuntimeError) do
       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
     end
   end
@@ -32,45 +33,46 @@
   def test_duplicate_host_in_one_call
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit', 'wonderland.lit' do
           storage 'fs' do
-            dir '.'
+            dir Dir.tmpdir
           end
         end
       end
     end
   end
 
   def test_configure
     config = Vines::Config.configure do
       host 'wonderland.lit' do
         storage :fs do
-          dir '.'
+          dir Dir.tmpdir
         end
       end
     end
     refute_nil config
     assert_same config, Vines::Config.instance
   end
 
   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?('[e-mail]')
     refute config.vhost?('tea.wonderland.lit')
     refute config.vhost?('bogus')
   end
 
   def test_port_lookup
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       client
     end
     refute_nil config[:client]
     assert_raises(ArgumentError) { config[:server] }
@@ -78,47 +80,101 @@
   end
 
   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
     end
   end
 
   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
     end
   end
 
   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
     end
   end
 
   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
     port = config.ports.first
     refute_nil port
@@ -133,11 +189,11 @@
   end
 
   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
         max_resources_per_account 1
       end
@@ -155,11 +211,11 @@
   end
 
   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
       end
     end
@@ -167,11 +223,11 @@
   end
 
   def test_default_server
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       server
     end
     port = config.ports.first
     refute_nil port
@@ -186,22 +242,25 @@
   end
 
   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
         hosts ['verona.lit', 'denmark.lit']
       end
     end
     port = config.ports.first
     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('[e-mail]'))
+    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
     assert_equal 60_000, port.max_stanza_size
     assert_equal Vines::Stream::Server, port.stream
@@ -210,11 +269,11 @@
   end
 
   def test_default_http
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       http
     end
     port = config.ports.first
     refute_nil port
@@ -231,11 +290,11 @@
   end
 
   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'
         max_stanza_size 60_000
         max_resources_per_account 1
@@ -257,11 +316,11 @@
   end
 
   def test_default_component
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
       component
     end
     port = config.ports.first
     refute_nil port
@@ -275,11 +334,11 @@
   end
 
   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
       end
     end
@@ -297,81 +356,95 @@
   def test_invalid_log_level
     assert_raises(RuntimeError) do
       config = Vines::Config.new do
         log 'bogus'
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
         end
       end
     end
   end
 
   def test_valid_log_level
     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?
     assert config.vhosts['verona.lit'].cross_domain_messages?
   end
 
   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?('[e-mail]', nil)
     assert config.local_jid?('[e-mail]')
+    assert config.local_jid?(Vines::JID.new('[e-mail]'))
+    assert config.local_jid?(Vines::JID.new('wonderland.lit'))
     assert config.local_jid?('[e-mail]', '[e-mail]')
     refute config.local_jid?('[e-mail]', '[e-mail]')
     refute config.local_jid?('[e-mail]')
     refute config.local_jid?('[e-mail]')
   end
 
   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)
     refute config.allowed?('', '')
   end
 
   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('[e-mail]')
     hatter = Vines::JID.new('[e-mail]')
     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('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
     assert config.allowed?(alice, romeo)
@@ -380,28 +453,87 @@
 
   def test_one_vhost_with_cross_domain_not_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('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
     refute config.allowed?(alice, romeo)
     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('[e-mail]')
+    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('[e-mail]')
+    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('[e-mail]')
+    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
     alice = Vines::JID.new('[e-mail]')
     hatter = Vines::JID.new('[e-mail]')
@@ -412,11 +544,11 @@
 
   def test_cross_domain_component_to_component_allowed
     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
     alice = Vines::JID.new('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
@@ -426,18 +558,16 @@
 
   def test_cross_domain_component_to_component_not_allowed
     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
     alice = Vines::JID.new('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
@@ -447,11 +577,11 @@
 
   def test_same_domain_user_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
     alice = Vines::JID.new('[e-mail]')
     comp = Vines::JID.new('[e-mail]')
@@ -461,11 +591,11 @@
 
   def test_cross_domain_user_to_component_allowed
     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
     alice = Vines::JID.new('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
@@ -475,18 +605,16 @@
 
   def test_cross_domain_user_to_component_not_allowed
     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('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
     refute config.allowed?(alice, romeo)
@@ -495,16 +623,16 @@
 
   def test_remote_user_to_component_allowed
     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
     alice = Vines::JID.new('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
@@ -513,19 +641,73 @@
     assert config.allowed?(hamlet, alice)
     refute config.allowed?(romeo, hamlet)
     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('[e-mail]')
+    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('[e-mail]')
+    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('[e-mail]')
+    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('[e-mail]')
     romeo = Vines::JID.new('[e-mail]')
     hamlet = Vines::JID.new('[e-mail]')
@@ -537,10 +719,10 @@
 
   def test_remote_user_to_remote_user_not_allowed
     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('[e-mail]')
     hamlet = Vines::JID.new('[e-mail]')
     refute config.allowed?(romeo, hamlet)