blather 0.8.1 → 0.8.2

data/spec/blather/stream/component_spec.rb

@@ -1,33 +1,31 @@
 require 'spec_helper'
 
 describe Blather::Stream::Component do
-  class MockServer; end
-  module ServerMock
-    def receive_data(data)
-      @server ||= MockServer.new
-      @server.receive_data data, self
+  let(:client)      { mock 'Client' }
+  let(:server_port) { 50000 - rand(1000) }
+  let(:jid)         { 'comp.id' }
+
+  before do
+    [:unbind, :post_init, :jid=].each do |m|
+      client.stubs(m) unless client.respond_to?(m)
     end
+    client.stubs(:jid).returns jid
   end
 
   def mocked_server(times = nil, &block)
-    @client ||= mock()
-    @client.stubs(:unbind) unless @client.respond_to?(:unbind)
-    @client.stubs(:jid=) unless @client.respond_to?(:jid=)
-
-    port = 50000 - rand(1000)
-
     MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
     EventMachine::run {
       # Mocked server
-      EventMachine::start_server '127.0.0.1', port, ServerMock
+      EventMachine::start_server '127.0.0.1', server_port, ServerMock
 
       # Blather::Stream connection
-      EM.connect('127.0.0.1', port, Blather::Stream::Component, @client, @jid || 'comp.id', 'secret') { |c| @stream = c }
+      EM.connect('127.0.0.1', server_port, Blather::Stream::Component, client, jid, 'secret') { |c| @stream = c }
     }
   end
 
+  after { sleep 0.1; @stream.cleanup if @stream }
+
   it 'can be started' do
-    client = mock()
     params = [client, 'comp.id', 'secret', 'host', 1234]
     EM.expects(:connect).with do |*parms|
       parms[0] == 'host'    &&
@@ -58,12 +56,11 @@ describe Blather::Stream::Component do
   end
 
   it 'raises a NoConnection exception if the connection is unbound before it can be completed' do
-    @client = mock
     proc do
       EventMachine::run {
         EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
 
-        Blather::Stream::Component.start @client, @jid || Blather::JID.new('n@d/r'), 'pass', '127.0.0.1', 50000 - rand(1000)
+        Blather::Stream::Component.start client, jid, 'pass', '127.0.0.1', 50000 - rand(1000)
       }
     end.should raise_error Blather::Stream::ConnectionFailed
   end
@@ -73,8 +70,8 @@ describe Blather::Stream::Component do
   end
 
   it 'sends stanzas to the client when the stream is ready' do
-    @client = mock(:post_init)
-    @client.expects(:receive_data).with do |n|
+    client.stubs :post_init
+    client.expects(:receive_data).with do |n|
       EM.stop
       n.kind_of? Blather::XMPPNode
     end
@@ -97,9 +94,8 @@ describe Blather::Stream::Component do
   end
 
   it 'sends stanzas to the wire ensuring "from" is set' do
-    client = mock()
-    client.stubs(:jid)
-    client.stubs(:jid=)
+    EM.expects(:next_tick).at_least(1).yields
+
     msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
     comp = Blather::Stream::Component.new nil, client, 'jid.com', 'pass'
     comp.expects(:send_data).with { |s| s.should match(/^<message[^>]*from="jid\.com"/) }

data/spec/blather/stream/parser_spec.rb

@@ -16,6 +16,8 @@ describe Blather::Stream::Parser do
 
   subject { Blather::Stream::Parser.new client }
 
+  after { subject.finish }
+
   def process(*data)
     client.latch = CountDownLatch.new 1
     data.each { |d| subject.receive_data d }

data/spec/blather/stream/ssl_spec.rb

@@ -1,32 +1,24 @@
 require 'spec_helper'
 
 describe Blather::CertStore do
-  before do
-    @pem = "-----BEGIN CERTIFICATE-----\nMIIDszCCApugAwIBAgIETiZC5TANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJV\nUzERMA8GA1UECAwIQ29sb3JhZG8xDzANBgNVBAcMBkRlbnZlcjEaMBgGA1UECgwR\nVmluZXMgWE1QUCBTZXJ2ZXIxFDASBgNVBAMMC3ZpbmVzLmxvY2FsMB4XDTExMDcx\nOTAyNTIyMVoXDTEyMDcxOTAyNTIyMVowYzELMAkGA1UEBhMCVVMxETAPBgNVBAgM\nCENvbG9yYWRvMQ8wDQYDVQQHDAZEZW52ZXIxGjAYBgNVBAoMEVZpbmVzIFhNUFAg\nU2VydmVyMRQwEgYDVQQDDAt2aW5lcy5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD\nggEPADCCAQoCggEBAMyqj4UyXIpLYyIDaqDoN/8yZHDv281lz1UzuhPZ5r4S6teA\n90dXT6MxEoQ5vpRV2lVU21mDOoRPk9qjgGA01zimrX/YvPf2BBedFkvU18ZKiOMD\n7D89Ej2oIPLc6dJMiIx1SbfpdvUtVZFn1/jGvQPv5iajHW5n/zn1KrHOvVa6R5eY\nVGEH3DD3RkzSxWHyiNN8R5SQzyOVX9F4DVFAffPOLbkFsCi2POy3dp+ZWuYKEjBd\nMuRibrt87PCESnyXZx/Y+GBG856wQT8Ny6mmnh5z5YtopvAJh16ps2p6DFgyDtF+\nhaW3WMlStXYQPqSTrreD7qdAxi3rVft2OUJLTJkCAwEAAaNvMG0wDAYDVR0TBAUw\nAwEB/zAdBgNVHQ4EFgQUUCSlixByIPK3s20w4xHhcMax7igwPgYDVR0RBDcwNYIL\ndmluZXMubG9jYWyCJmNocmlzdG9waGVyLWpvaG5zb25zLW1hY2Jvb2stcHJvLmxv\nY2FsMA0GCSqGSIb3DQEBBQUAA4IBAQBOy1nI7H8XpnpVzpRK5RN/MzelQUl1Efo0\nl9wZ73E6EgJinl2AUp1/sYMUWkVlZ4DSflRBxBEp0CAJNoUydBh8O1xEKGTyqlLy\n/daqvNFLnYwFluAWi1xJQZv4AE62ua5wjsrhPuu3aMvPt9hx1X3CVh+8aA24/gAo\nAPJYsfT3T8GCD+MU3Uc2yADnLSUJ6Jal56/okOJA2Pfkr/K4zj1CyfAEWlpgo2Pv\nyrpv4V2WP1SL5fOONNGfOzio1LD6seAl+8SjiCefnMan2aXmna6SpMDzXB8vTDUE\nWmsD9g0621WqNz2x6lY5IYr7azE2C46Tpb9FOeSAAd83Zka4acaL\n-----END CERTIFICATE-----\n"
-    @cert = File.open("./test.crt", 'w') {|f| f.write(@pem) }
-    @store = Blather::CertStore.new("./")
-  end
+  let(:cert_dir)  { File.expand_path '../../fixtures', File.dirname(__FILE__) }
+  let(:cert_path) { File.join cert_dir, 'certificate.crt' }
+  let(:cert)      { File.read cert_path }
 
-  after do
-    File.delete("./test.crt")
+  subject do
+    Blather::CertStore.new cert_dir
   end
 
   it 'can verify valid cert' do
-    @store.trusted?(@pem).tap do |trusted|
-      trusted.should == true
-    end
+    subject.trusted?(cert).should be_true
   end
 
   it 'can verify invalid cert' do
-    @store.trusted?(@pem.gsub("L", "a")).tap do |trusted|
-      trusted.should == nil
-    end
+    subject.trusted?(cert[0..(cert.length/2)]).should be_nil
   end
 
-  it 'can verify without a cert store' do
+  it 'cannot verify when the cert authority is not trusted' do
     @store = Blather::CertStore.new("../")
-    @store.trusted?(@pem).tap do |trusted|
-      trusted.should == true
-    end
+    @store.trusted?(cert).should be_false
   end
 end

data/spec/blather_spec.rb

@@ -31,4 +31,4 @@ describe Blather do
     end
 
   end
-end
+end

data/spec/fixtures/certificate.crt

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICAzCCAWwCCQDvLJRwh2NPnjANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJH
+QjETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMCAXDTEyMTIyMDAxMjgyOVoYDzI4MzQwNTA1MDEyODI5WjBFMQsw
+CQYDVQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDj
+EoRb/MYNjHrxq6cu6TVyM4hcimy5WWy369BvarONxpmHlrvDUiMQoZNBxyV//hZH
+Y3JSHrNxMCxU1vShghNZzNEZg45UBWMs3LS/IHnFvf+4gYbffEJCGMhjyx4zAxRA
+gegDAYIeGHtWAA6SIe4SIzsMtAJC0Nf8H3AZJdjvSwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4GBAGkyf9MlpCesU7jxiZbI3jIdCEMiG5XsGp0c+nELufcsus4MySN0xZTt
+zvBBvWLpbv8zkxkw+kamvksObslx4G6hg1RvKP/Zdjue5mVnUTNKlXu/wQOTVPNo
+V3iBcJUwe3uIIlt2szA6o5BRt29XSLiNIJvFhAHCVg+3VioXChRr
+-----END CERTIFICATE-----

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'blather'
-require 'mocha'
 require 'countdownlatch'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}

data/spec/support/mock_server.rb

@@ -0,0 +1,8 @@
+class MockServer; end
+
+module ServerMock
+  def receive_data(data)
+    @server ||= MockServer.new
+    @server.receive_data data, self
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.5'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +46,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.5'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: niceogiri
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +153,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +161,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +193,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +226,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: blather@adhearsion.com
 executables: []
@@ -228,8 +250,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .autotest
-- .gemtest
 - .gitignore
 - .rspec
 - .travis.yml
@@ -239,7 +259,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - blather.gemspec
 - examples/certs/README
 - examples/certs/ca-bundle.crt
@@ -372,8 +391,10 @@ files:
 - spec/blather/stream/ssl_spec.rb
 - spec/blather/xmpp_node_spec.rb
 - spec/blather_spec.rb
+- spec/fixtures/certificate.crt
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
+- spec/support/mock_server.rb
 - yard/templates/default/class/html/handlers.erb
 - yard/templates/default/class/setup.rb
 - yard/templates/default/class/text/handlers.erb
@@ -392,7 +413,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4475657027413970395
+      hash: -2918212399470142251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -401,10 +422,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4475657027413970395
+      hash: -2918212399470142251
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
@@ -461,5 +482,8 @@ test_files:
 - spec/blather/stream/ssl_spec.rb
 - spec/blather/xmpp_node_spec.rb
 - spec/blather_spec.rb
+- spec/fixtures/certificate.crt
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
+- spec/support/mock_server.rb
+has_rdoc: 

data/.autotest

@@ -1,13 +0,0 @@
-Autotest.add_hook :initialize do |at|
-  ignore = %w[.git examples ext pkg .DS_Store CHANGELOG LICENSE VERSION.yml README.rdoc .autotest Rakefile blather.gemspec]
-
-  ignore.each { |exception| at.add_exception(exception) }
-
-  at.clear_mappings
-
-  at.add_mapping(%r%^spec/.*_spec.rb$%) { |filename, _| filename }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| ["spec/#{m[1]}_spec.rb"] }
-  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { 
-    at.files_matching %r%^spec/.*_spec\.rb$%
-  }
-end

data/TODO.md

@@ -1,2 +0,0 @@
- * Cleanup implementation of X stanzas
- * Cleanup implementation of PubSub Subscribe Events