vines 0.3.2 → 0.4.0

data/lib/vines.rb

@@ -2,26 +2,34 @@
 
 module Vines
   NAMESPACES = {
-    :stream       => 'http://etherx.jabber.org/streams'.freeze,
-    :client       => 'jabber:client'.freeze,
-    :server       => 'jabber:server'.freeze,
-    :component    => 'jabber:component:accept'.freeze,
-    :roster       => 'jabber:iq:roster'.freeze,
-    :non_sasl     => 'jabber:iq:auth'.freeze,
-    :storage      => 'jabber:iq:private'.freeze,
-    :version      => 'jabber:iq:version'.freeze,
-    :sasl         => 'urn:ietf:params:xml:ns:xmpp-sasl'.freeze,
-    :tls          => 'urn:ietf:params:xml:ns:xmpp-tls'.freeze,
-    :bind         => 'urn:ietf:params:xml:ns:xmpp-bind'.freeze,
-    :session      => 'urn:ietf:params:xml:ns:xmpp-session'.freeze,
-    :ping         => 'urn:xmpp:ping'.freeze,
-    :disco_items  => 'http://jabber.org/protocol/disco#items'.freeze,
-    :disco_info   => 'http://jabber.org/protocol/disco#info'.freeze,
-    :http_bind    => 'http://jabber.org/protocol/httpbind'.freeze,
-    :bosh         => 'urn:xmpp:xbosh'.freeze,
-    :vcard        => 'vcard-temp'.freeze,
-    :si           => 'http://jabber.org/protocol/si'.freeze,
-    :byte_streams => 'http://jabber.org/protocol/bytestreams'.freeze
+    :stream           => 'http://etherx.jabber.org/streams'.freeze,
+    :client           => 'jabber:client'.freeze,
+    :server           => 'jabber:server'.freeze,
+    :component        => 'jabber:component:accept'.freeze,
+    :roster           => 'jabber:iq:roster'.freeze,
+    :non_sasl         => 'jabber:iq:auth'.freeze,
+    :storage          => 'jabber:iq:private'.freeze,
+    :version          => 'jabber:iq:version'.freeze,
+    :sasl             => 'urn:ietf:params:xml:ns:xmpp-sasl'.freeze,
+    :tls              => 'urn:ietf:params:xml:ns:xmpp-tls'.freeze,
+    :bind             => 'urn:ietf:params:xml:ns:xmpp-bind'.freeze,
+    :session          => 'urn:ietf:params:xml:ns:xmpp-session'.freeze,
+    :ping             => 'urn:xmpp:ping'.freeze,
+    :pubsub           => 'http://jabber.org/protocol/pubsub'.freeze,
+    :pubsub_event     => 'http://jabber.org/protocol/pubsub#event'.freeze,
+    :pubsub_create    => 'http://jabber.org/protocol/pubsub#create-nodes'.freeze,
+    :pubsub_delete    => 'http://jabber.org/protocol/pubsub#delete-nodes'.freeze,
+    :pubsub_instant   => 'http://jabber.org/protocol/pubsub#instant-nodes'.freeze,
+    :pubsub_item_ids  => 'http://jabber.org/protocol/pubsub#item-ids'.freeze,
+    :pubsub_publish   => 'http://jabber.org/protocol/pubsub#publish'.freeze,
+    :pubsub_subscribe => 'http://jabber.org/protocol/pubsub#subscribe'.freeze,
+    :disco_items      => 'http://jabber.org/protocol/disco#items'.freeze,
+    :disco_info       => 'http://jabber.org/protocol/disco#info'.freeze,
+    :http_bind        => 'http://jabber.org/protocol/httpbind'.freeze,
+    :bosh             => 'urn:xmpp:xbosh'.freeze,
+    :vcard            => 'vcard-temp'.freeze,
+    :si               => 'http://jabber.org/protocol/si'.freeze,
+    :byte_streams     => 'http://jabber.org/protocol/bytestreams'.freeze
   }.freeze
 
   module Log
@@ -47,21 +55,23 @@ module Vines
 end
 
 %w[
-  resolv-replace
   active_record
   base64
   bcrypt
   digest/sha1
   em-http
-  em-redis
+  em-hiredis
   eventmachine
   fiber
   fileutils
   http/parser
   logger
+  mongo
   net/ldap
   nokogiri
   openssl
+  resolv
+  set
   socket
   uri
   yaml
@@ -92,17 +102,26 @@ end
   vines/stanza/presence/unavailable
   vines/stanza/presence/unsubscribe
   vines/stanza/presence/unsubscribed
+  vines/stanza/pubsub
+  vines/stanza/pubsub/create
+  vines/stanza/pubsub/delete
+  vines/stanza/pubsub/publish
+  vines/stanza/pubsub/subscribe
+  vines/stanza/pubsub/unsubscribe
 
   vines/storage
   vines/storage/couchdb
   vines/storage/ldap
   vines/storage/local
+  vines/storage/mongodb
+  vines/storage/null
   vines/storage/redis
   vines/storage/sql
 
   vines/config
   vines/config/host
   vines/config/port
+  vines/config/pubsub
 
   vines/store
   vines/contact
@@ -115,6 +134,13 @@ end
   vines/version
   vines/xmpp_server
 
+  vines/cluster
+  vines/cluster/connection
+  vines/cluster/publisher
+  vines/cluster/pubsub
+  vines/cluster/sessions
+  vines/cluster/subscriber
+
   vines/stream
   vines/stream/state
   vines/stream/parser

data/test/cluster/publisher_test.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'minitest/autorun'
+
+class ClusterPublisherTest < MiniTest::Unit::TestCase
+  def setup
+    @connection = MiniTest::Mock.new
+    @cluster = MiniTest::Mock.new
+    @cluster.expect(:id, 'abc')
+    @cluster.expect(:connection, @connection)
+  end
+
+  def test_broadcast
+    msg = {from: 'abc', type: 'online', time: Time.now.to_i}.to_json
+    @connection.expect(:publish, nil, ["cluster:nodes:all", msg])
+
+    publisher = Vines::Cluster::Publisher.new(@cluster)
+    publisher.broadcast(:online)
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_route
+    stanza = "<message>hello</message>"
+    msg = {from: 'abc', type: 'stanza', stanza: stanza}.to_json
+    @connection.expect(:publish, nil, ["cluster:nodes:node-42", msg])
+
+    publisher = Vines::Cluster::Publisher.new(@cluster)
+    publisher.route(stanza, "node-42")
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_update_user
+    jid = Vines::JID.new('alice@wonderland.lit')
+    msg = {from: 'abc', type: 'user', jid: jid.to_s}.to_json
+    @connection.expect(:publish, nil, ["cluster:nodes:node-42", msg])
+
+    publisher = Vines::Cluster::Publisher.new(@cluster)
+    publisher.update_user(jid, "node-42")
+    assert @connection.verify
+    assert @cluster.verify
+  end
+end

data/test/cluster/sessions_test.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'storage/storage_tests'
+require 'storage/mock_redis'
+require 'minitest/autorun'
+
+class ClusterSessionsTest < MiniTest::Unit::TestCase
+  def setup
+    @connection = MockRedis.new
+    @cluster = MiniTest::Mock.new
+    @cluster.expect(:connection, @connection)
+  end
+
+  def test_save
+    StorageTests::EMLoop.new do
+      @cluster.expect(:id, 'abc')
+      jid1 = 'alice@wonderland.lit/tea'
+      jid2 = 'alice@wonderland.lit/cake'
+      sessions = Vines::Cluster::Sessions.new(@cluster)
+      sessions.save(jid1, {available: true, interested: true})
+      sessions.save(jid2, {available: false, interested: false})
+      EM.next_tick do
+        session1 = {node: 'abc', available: true, interested: true}
+        session2 = {node: 'abc', available: false, interested: false}
+        assert_equal 2, @connection.db["sessions:alice@wonderland.lit"].size
+        assert_equal session1.to_json, @connection.db["sessions:alice@wonderland.lit"]['tea']
+        assert_equal session2.to_json, @connection.db["sessions:alice@wonderland.lit"]['cake']
+        assert_equal [jid1, jid2], @connection.db["cluster:nodes:abc"].to_a
+        assert @cluster.verify
+      end
+    end
+  end
+
+  def test_delete
+    StorageTests::EMLoop.new do
+      jid1 = 'alice@wonderland.lit/tea'
+      jid2 = 'alice@wonderland.lit/cake'
+      @connection.db["sessions:alice@wonderland.lit"] = {}
+      @connection.db["sessions:alice@wonderland.lit"]['tea'] = {node: 'abc', available: true}.to_json
+      @connection.db["sessions:alice@wonderland.lit"]['cake'] = {node: 'abc', available: true}.to_json
+      @connection.db["cluster:nodes:abc"] = Set.new([jid1, jid2])
+
+      sessions = Vines::Cluster::Sessions.new(@cluster)
+      sessions.delete(jid1)
+      EM.next_tick do
+        assert_equal 1, @connection.db["sessions:alice@wonderland.lit"].size
+        assert_equal [jid2], @connection.db["cluster:nodes:abc"].to_a
+        assert @cluster.verify
+      end
+    end
+  end
+end

data/test/cluster/subscriber_test.rb

@@ -0,0 +1,94 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class ClusterSubscriberTest < MiniTest::Unit::TestCase
+  def setup
+    @connection = MiniTest::Mock.new
+    @cluster = MiniTest::Mock.new
+    @cluster.expect(:id, 'abc')
+  end
+
+  def test_subscribe
+    @cluster.expect(:connect, @connection)
+    @connection.expect(:subscribe, nil, ['cluster:nodes:all'])
+    @connection.expect(:subscribe, nil, ['cluster:nodes:abc'])
+    @connection.expect(:on, nil, [:message])
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.subscribe
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_heartbeat
+    now = Time.now.to_i
+    msg = {from: 'node-42', type: 'heartbeat', time: now}.to_json
+    @cluster.expect(:poke, nil, ['node-42', now])
+
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.send(:on_message, 'cluster:nodes:all', msg)
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_online
+    now = Time.now.to_i
+    msg = {from: 'node-42', type: 'online', time: now}.to_json
+    @cluster.expect(:poke, nil, ['node-42', now])
+
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.send(:on_message, 'cluster:nodes:all', msg)
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_offline
+    now = Time.now.to_i
+    msg = {from: 'node-42', type: 'offline', time: now}.to_json
+    @cluster.expect(:delete_sessions, nil, ['node-42'])
+
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.send(:on_message, 'cluster:nodes:all', msg)
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_route_stanza
+    stanza = "<message to='alice@wonderland.lit/tea'>hello</message>"
+    node = Nokogiri::XML(stanza).root rescue nil
+    msg = {from: 'node-42', type: 'stanza', stanza: stanza}.to_json
+
+    stream = MiniTest::Mock.new
+    stream.expect(:write, nil, [node])
+    @cluster.expect(:connected_resources, [stream], ['alice@wonderland.lit/tea'])
+
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.send(:on_message, 'cluster:nodes:abc', msg)
+    assert stream.verify
+    assert @connection.verify
+    assert @cluster.verify
+  end
+
+  def test_update_user
+    alice = Vines::User.new(jid: 'alice@wonderland.lit/tea')
+    msg = {from: 'node-42', type: 'user', jid: alice.jid.to_s}.to_json
+
+    storage = MiniTest::Mock.new
+    storage.expect(:find_user, alice, [alice.jid.bare])
+
+    stream = MiniTest::Mock.new
+    stream.expect(:user, alice)
+
+    @cluster.expect(:storage, storage, ['wonderland.lit'])
+    @cluster.expect(:connected_resources, [stream], [alice.jid.bare])
+
+    subscriber = Vines::Cluster::Subscriber.new(@cluster)
+    subscriber.send(:on_message, 'cluster:nodes:abc', msg)
+    assert storage.verify
+    assert stream.verify
+    assert @connection.verify
+    assert @cluster.verify
+  end
+end

data/test/config/host_test.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'tmpdir'
 require 'vines'
 require 'minitest/autorun'
 
@@ -30,8 +31,8 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage('fs') { dir '.' }
-          storage('fs') { dir '.' }
+          storage('fs') { dir Dir.tmpdir }
+          storage('fs') { dir Dir.tmpdir }
         end
       end
     end
@@ -41,7 +42,7 @@ class HostTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         storage 'fs' do
-          dir '.'
+          dir Dir.tmpdir
         end
       end
     end
@@ -51,7 +52,7 @@ class HostTest < MiniTest::Unit::TestCase
   def test_ldap_added_to_storage
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         # added after storage
         ldap 'ldap.wonderland.lit', 1636 do
           tls true
@@ -76,7 +77,7 @@ class HostTest < MiniTest::Unit::TestCase
           name_attr 'cn'
         end
         # added before storage
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     %w[wonderland.lit verona.lit].each do |domain|
@@ -89,7 +90,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components '' => 'secr3t'
         end
       end
@@ -100,7 +101,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components nil => 'secr3t'
         end
       end
@@ -111,7 +112,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'tea' => ''
         end
       end
@@ -122,7 +123,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'tea' => nil
         end
       end
@@ -133,7 +134,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'tea' => 'one'
           components 'TEA' => 'two'
         end
@@ -145,7 +146,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'tea' => 'one', 'TEA' => 'two'
         end
       end
@@ -156,7 +157,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'tea' => 'one'
           components :TEA => 'two'
         end
@@ -168,7 +169,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) do
       Vines::Config.new do
         host 'wonderland.lit ' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
         end
       end
     end
@@ -178,7 +179,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'alice@wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
         end
       end
     end
@@ -188,7 +189,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'exam ple' => 'one'
         end
       end
@@ -199,7 +200,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'alice@example' => 'one'
         end
       end
@@ -210,7 +211,7 @@ class HostTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
-          storage(:fs) { dir '.' }
+          storage(:fs) { dir Dir.tmpdir }
           components 'exam.ple' => 'one'
         end
       end
@@ -220,7 +221,7 @@ class HostTest < MiniTest::Unit::TestCase
   def test_case_insensitive_component_name
     config = Vines::Config.new do
       host 'WONDERLAND.LIT' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'TEA' => 'secr3t', CAKE: 'Passw0rd'
       end
     end
@@ -234,7 +235,7 @@ class HostTest < MiniTest::Unit::TestCase
   def test_component?
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
         components 'tea' => 'secr3t', cake: 'passw0rd'
       end
     end
@@ -244,6 +245,7 @@ class HostTest < MiniTest::Unit::TestCase
     refute host.component?('tea')
     refute host.component?(:cake)
     assert host.component?('tea.wonderland.lit')
+    assert host.component?(Vines::JID.new('tea.wonderland.lit'))
     assert host.component?('cake.wonderland.lit')
     assert_nil host.password(nil)
     assert_nil host.password('bogus')
@@ -256,6 +258,7 @@ class HostTest < MiniTest::Unit::TestCase
     refute config.component?('tea')
     refute config.component?('bogus')
     assert config.component?('tea.wonderland.lit')
+    assert config.component?(Vines::JID.new('tea.wonderland.lit'))
     assert config.component?('cake.wonderland.lit')
     assert config.component?('tea.wonderland.lit', 'cake.wonderland.lit')
     refute config.component?('tea.wonderland.lit', 'bogus.wonderland.lit')
@@ -266,10 +269,83 @@ class HostTest < MiniTest::Unit::TestCase
     assert_equal 'passw0rd', config.component_password('cake.wonderland.lit')
   end
 
+  def test_invalid_pubsub_domain_raises
+    assert_raises(ArgumentError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+          pubsub 'exam ple'
+        end
+      end
+    end
+  end
+
+  def test_invalid_jid_pubsub_domain_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+          pubsub 'alice@example'
+        end
+      end
+    end
+  end
+
+  def test_multi_subdomain_pubsub_raises
+    assert_raises(RuntimeError) do
+      Vines::Config.new do
+        host 'wonderland.lit' do
+          storage(:fs) { dir Dir.tmpdir }
+          pubsub 'exam.ple'
+        end
+      end
+    end
+  end
+
+  def test_case_insensitive_pubsub_name
+    config = Vines::Config.new do
+      host 'WONDERLAND.LIT' do
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'TEA', :CAKE
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    assert_equal 2, host.pubsubs.size
+    refute_nil host.pubsubs['tea.wonderland.lit']
+    refute_nil host.pubsubs['cake.wonderland.lit']
+  end
+
+  def test_pubsub?
+    config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir Dir.tmpdir }
+        pubsub 'tea', :cake
+      end
+    end
+    host = config.vhosts['wonderland.lit']
+    refute_nil host
+    refute host.pubsub?(nil)
+    refute host.pubsub?('tea')
+    refute host.pubsub?(:cake)
+    assert host.pubsub?('tea.wonderland.lit')
+    assert host.pubsub?(Vines::JID.new('tea.wonderland.lit'))
+    assert host.pubsub?('cake.wonderland.lit')
+    assert_equal ['tea.wonderland.lit', 'cake.wonderland.lit'], host.pubsubs.keys
+
+    refute config.pubsub?(nil)
+    refute config.pubsub?('tea')
+    refute config.pubsub?('bogus')
+    assert config.pubsub?('tea.wonderland.lit')
+    assert config.pubsub?(Vines::JID.new('tea.wonderland.lit'))
+    assert config.pubsub?('cake.wonderland.lit')
+    refute config.pubsub?('alice@cake.wonderland.lit')
+  end
+
   def test_default_private_storage_is_off
     config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     host = config.vhosts['wonderland.lit']
@@ -281,12 +357,15 @@ class HostTest < MiniTest::Unit::TestCase
     config = Vines::Config.new do
       host 'wonderland.lit' do
         private_storage true
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
     host = config.vhosts['wonderland.lit']
     refute_nil host
     assert host.private_storage?
     assert config.private_storage?('wonderland.lit')
+    assert config.private_storage?(Vines::JID.new('wonderland.lit'))
+    refute config.private_storage?(Vines::JID.new('alice@wonderland.lit'))
+    refute config.private_storage?(nil)
   end
 end