diaspora-vines 0.2.0.develop.2 → 0.2.0.develop.3

data/test/stream/server/outbound/authoritative_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class RouterWrapper
   def initialize(stream); @stream = stream; end
@@ -15,47 +15,67 @@ describe Vines::Stream::Server::Outbound::Authoritative do
   end
 
   def test_invalid_stanza
-    node = node('<message/>')
-    @stream.expect(:router, @router)
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
-    assert @stream.verify
+    EM.run {
+      node = node("<message/>")
+      @stream.expect(:router, @router)
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_invalid_token
-    node = node('<db:verify/>')
-    router = RouterWrapper.new(nil)
-    @stream.expect(:router, router)
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
-    assert @stream.verify
+    EM.run {
+      node = node("<db:verify/>")
+      router = RouterWrapper.new(nil)
+      @stream.expect(:router, router)
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_valid_verification
-    node = node(%Q{<db:verify xmlns:db="#{Vines::NAMESPACES[:legacy_dialback]}" from="remote.host" to="local.host" id="1234" type="valid"/>})
-    result = "<db:result xmlns:db='#{Vines::NAMESPACES[:legacy_dialback]}' from='#{node[:to]}' to='#{node[:from]}' type='#{node[:type]}'/>"
-    @stream.expect(:router, @router)
-    # NOTE this tests the 'inbound' stream var
-    @stream.expect(:write, nil, [result])
-    @stream.expect(:advance, nil, [Vines::Stream::Server::Ready])
-    @stream.expect(:notify_connected, nil)
-    # end
-    @stream.expect(:nil?, false)
-    @stream.expect(:close_connection, nil)
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<db:verify xmlns:db="#{Vines::NAMESPACES[:legacy_dialback]}" ) +
+        %(from="remote.host" to="local.host" id="1234" type="valid"/>)
+      )
+      result = %(<db:result xmlns:db='#{Vines::NAMESPACES[:legacy_dialback]}' ) +
+        %(from='#{node[:to]}' to='#{node[:from]}' type='#{node[:type]}'/>)
+      @stream.expect(:router, @router)
+      # NOTE this tests the "inbound" stream var
+      @stream.expect(:write, nil, [result])
+      @stream.expect(:advance, nil, [Vines::Stream::Server::Ready])
+      @stream.expect(:notify_connected, nil)
+      # end
+      @stream.expect(:nil?, false)
+      @stream.expect(:close_connection, nil)
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_invalid_verification
-    node = node(%Q{<db:verify xmlns:db="#{Vines::NAMESPACES[:legacy_dialback]}" from="remote.host" to="local.host" id="1234" type="invalid"/>})
-    result = "<db:result xmlns:db='#{Vines::NAMESPACES[:legacy_dialback]}' from='#{node[:to]}' to='#{node[:from]}' type='#{node[:type]}'/>"
-    @stream.expect(:router, @router)
-    # NOTE this tests the 'inbound' stream var
-    @stream.expect(:close_connection_after_writing, nil)
-    @stream.expect(:write, nil, [result])
-    # end
-    @stream.expect(:nil?, false)
-    @stream.expect(:close_connection, nil)
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<db:verify xmlns:db="#{Vines::NAMESPACES[:legacy_dialback]}" ) +
+        %(from="remote.host" to="local.host" id="1234" type="invalid"/>)
+      )
+      result = %(<db:result xmlns:db='#{Vines::NAMESPACES[:legacy_dialback]}' ) +
+        %(from='#{node[:to]}' to='#{node[:from]}' type='#{node[:type]}'/>)
+      @stream.expect(:router, @router)
+      # NOTE this tests the "inbound" stream var
+      @stream.expect(:close_connection_after_writing, nil)
+      @stream.expect(:write, nil, [result])
+      # end
+      @stream.expect(:nil?, false)
+      @stream.expect(:close_connection, nil)
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   private

data/test/stream/server/outbound/start_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 describe Vines::Stream::Server::Outbound::Start do
   before do
@@ -9,20 +9,32 @@ describe Vines::Stream::Server::Outbound::Start do
   end
 
   def test_missing_namespace
-    node = node('<stream:stream/>')
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node("<stream:stream/>")
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_invalid_namespace
-    node = node(%Q{<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>})
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node(%(<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>))
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_valid_stream
-    node = node(%Q{<stream:stream xmlns='jabber:client' xmlns:stream='#{Vines::NAMESPACES[:stream]}' xml:lang='en' id='1234' from='host.com' version='1.0'>})
-    @stream.expect(:advance, nil, [Vines::Stream::Server::Outbound::Auth])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" ) +
+        %(xml:lang="en" id="1234" from="host.com" version="1.0">)
+      )
+      @stream.expect(:advance, nil, [Vines::Stream::Server::Outbound::Auth])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   private

data/test/stream/server/ready_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 describe Vines::Stream::Server::Ready do
   subject      { Vines::Stream::Server::Ready.new(stream, nil) }
@@ -22,72 +22,96 @@ describe Vines::Stream::Server::Ready do
     SERVER_STANZAS.clear
   end
 
-  it 'processes a valid node' do
-    config = MiniTest::Mock.new
-    config.expect(:local_jid?, true, [Vines::JID.new('romeo@verona.lit')])
-
-    stream.expect(:config, config)
-    stream.expect(:remote_domain, 'wonderland.lit')
-    stream.expect(:domain, 'verona.lit')
-    stream.expect(:user=, nil, [Vines::User.new(jid: 'alice@wonderland.lit')])
-
-    node = node(%Q{<message from="alice@wonderland.lit" to="romeo@verona.lit"/>})
-    subject.node(node)
-    assert_equal 1, SERVER_STANZAS.size
-    assert stream.verify
-    assert config.verify
+  it "processes a valid node" do
+    EM.run {
+      config = MiniTest::Mock.new
+      config.expect(:local_jid?, true, [Vines::JID.new("romeo@verona.lit")])
+
+      stream.expect(:config, config)
+      stream.expect(:remote_domain, "wonderland.lit")
+      stream.expect(:domain, "verona.lit")
+      stream.expect(:user=, nil, [Vines::User.new(jid: "alice@wonderland.lit")])
+
+      node = node(%(<message from="alice@wonderland.lit" to="romeo@verona.lit"/>))
+      subject.node(node)
+      assert_equal 1, SERVER_STANZAS.size
+      assert stream.verify
+      assert config.verify
+      EM.stop
+    }
   end
 
-  it 'raises unsupported-stanza-type stream error' do
-    node = node('<bogus/>')
-    -> { subject.node(node) }.must_raise Vines::StreamErrors::UnsupportedStanzaType
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises unsupported-stanza-type stream error" do
+    EM.run {
+      node = node("<bogus/>")
+      -> { subject.node(node) }.must_raise Vines::StreamErrors::UnsupportedStanzaType
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises improper-addressing stream error when to address is missing' do
-    node = node(%Q{<message from="alice@wonderland.lit"/>})
-    -> { subject.node(node) }.must_raise Vines::StreamErrors::ImproperAddressing
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises improper-addressing stream error when to address is missing" do
+    EM.run {
+      node = node(%(<message from="alice@wonderland.lit"/>))
+      -> { subject.node(node) }.must_raise Vines::StreamErrors::ImproperAddressing
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises jid-malformed stanza error when to address is invalid' do
-    node = node(%Q{<message from="alice@wonderland.lit" to=" "/>})
-    -> { subject.node(node) }.must_raise Vines::StanzaErrors::JidMalformed
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises jid-malformed stanza error when to address is invalid" do
+    EM.run {
+      node = node(%(<message from="alice@wonderland.lit" to=" "/>))
+      -> { subject.node(node) }.must_raise Vines::StanzaErrors::JidMalformed
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises improper-addressing stream error' do
-    node = node(%Q{<message to="romeo@verona.lit"/>})
-    -> { subject.node(node) }.must_raise Vines::StreamErrors::ImproperAddressing
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises improper-addressing stream error" do
+    EM.run {
+      node = node(%(<message to="romeo@verona.lit"/>))
+      -> { subject.node(node) }.must_raise Vines::StreamErrors::ImproperAddressing
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises jid-malformed stanza error for invalid from address' do
-    node = node(%Q{<message from=" " to="romeo@verona.lit"/>})
-    -> { subject.node(node) }.must_raise Vines::StanzaErrors::JidMalformed
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises jid-malformed stanza error for invalid from address" do
+    EM.run {
+      node = node(%(<message from=" " to="romeo@verona.lit"/>))
+      -> { subject.node(node) }.must_raise Vines::StanzaErrors::JidMalformed
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises invalid-from stream error' do
-    stream.expect(:remote_domain, 'wonderland.lit')
-    node = node(%Q{<message from="alice@bogus.lit" to="romeo@verona.lit"/>})
-    -> { subject.node(node) }.must_raise Vines::StreamErrors::InvalidFrom
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises invalid-from stream error" do
+    EM.run {
+      stream.expect(:remote_domain, "wonderland.lit")
+      node = node(%(<message from="alice@bogus.lit" to="romeo@verona.lit"/>))
+      -> { subject.node(node) }.must_raise Vines::StreamErrors::InvalidFrom
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
-  it 'raises host-unknown stream error' do
-    stream.expect(:remote_domain, 'wonderland.lit')
-    stream.expect(:domain, 'verona.lit')
-    node = node(%Q{<message from="alice@wonderland.lit" to="romeo@bogus.lit"/>})
-    -> { subject.node(node) }.must_raise Vines::StreamErrors::HostUnknown
-    assert SERVER_STANZAS.empty?
-    assert stream.verify
+  it "raises host-unknown stream error" do
+    EM.run {
+      stream.expect(:remote_domain, "wonderland.lit")
+      stream.expect(:domain, "verona.lit")
+      node = node(%(<message from="alice@wonderland.lit" to="romeo@bogus.lit"/>))
+      -> { subject.node(node) }.must_raise Vines::StreamErrors::HostUnknown
+      assert SERVER_STANZAS.empty?
+      assert stream.verify
+      EM.stop
+    }
   end
 
   private

data/test/stream/server/start_test.rb

@@ -18,48 +18,83 @@ describe Vines::Stream::Server::AuthMethod do
   end
 
   def test_missing_namespace
-    node = node('<stream:stream/>')
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node("<stream:stream/>")
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_invalid_namespace
-    node = node(%Q{<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>})
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node(%(<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>))
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_valid_stream_tls_required
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"/><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:vhost, VhostWrapper.new(false))
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, false)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<starttls xmlns="#{Vines::NAMESPACES[:tls]}"/>) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:vhost, VhostWrapper.new(false))
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, false)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_valid_stream_with_dialback_flag
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, true)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, true)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_valid_stream
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"><required/></starttls><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:vhost, VhostWrapper.new(true))
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, false)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<starttls xmlns="#{Vines::NAMESPACES[:tls]}"><required/></starttls>) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:vhost, VhostWrapper.new(true))
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, false)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   private

data/test/test_helper.rb

@@ -6,6 +6,14 @@ require 'ext/nokogiri'
 require 'minitest/autorun'
 require 'rails/all'
 
+# A simple hook allowing you to run a block of code after everything is done running
+# In this case we want to delete the old sqlite database in case we run rake-test twice
+Minitest.after_run {
+  db_file = "test.db"
+  File.delete(db_file) if File.exist?(db_file)
+  puts "After_run hook deleted #{db_file}"
+}
+
 class MiniTest::Spec
 
   # Build an <iq> xml node with the given attributes. This is useful as a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.2.0.develop.2
+  version: 0.2.0.develop.3
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -43,22 +43,16 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +95,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: pronto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: pronto-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement