blather 0.5.8 → 0.5.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.9
+  Bugfix(benlangfeld): Failed connections now raise a Blather::Stream::ConnectionFailed exception
+  Bugfix(crohr): Blather now supports EventMachine 1.0
+
 v0.5.8
   Bugfix(benlangfeld): JIDs now maintain case, but still compare case insensitively
   Bugfix(jmazzi): Development dependencies now resolve correctly on JRuby and Rubinius

data/blather.gemspec

@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
   s.rdoc_options = %w{--charset=UTF-8}
   s.extra_rdoc_files = %w{LICENSE README.md}
 
-  s.add_dependency "eventmachine", ["~> 0.12.6"]
+  s.add_dependency "eventmachine", [">= 0.12.6"]
   s.add_dependency "nokogiri", ["~> 1.4.0"]
-  s.add_dependency "niceogiri", [">= 0.0.4"]
+  s.add_dependency "niceogiri", [">= 0.1.0"]
   s.add_dependency "activesupport", [">= 3.0.7"]
 
   s.add_development_dependency "minitest", ["~> 1.7.1"]

data/lib/blather/stream.rb

@@ -50,6 +50,7 @@ module Blather
   class Stream < EventMachine::Connection
     # Connection not found
     class NoConnection < RuntimeError; end
+    class ConnectionFailed < RuntimeError; end
 
     # @private
     STREAM_NS = 'http://etherx.jabber.org/streams'
@@ -143,6 +144,7 @@ module Blather
     # this kicks off the starttls/authorize/bind process
     # @private
     def connection_completed
+      @connected = true
 #      @keepalive = EM::PeriodicTimer.new(60) { send_data ' ' }
       start
     end
@@ -178,13 +180,14 @@ module Blather
     # Called by EM after the connection has started
     # @private
     def post_init
-      @connected = true
+      @inited = true
     end
 
     # Called by EM when the connection is closed
     # @private
     def unbind
-      raise NoConnection unless @connected
+      raise NoConnection unless @inited
+      raise ConnectionFailed unless @connected
 
 #      @keepalive.cancel
       @state = :stopped

data/lib/blather/version.rb

@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

data/spec/blather/stream/client_spec.rb

@@ -16,15 +16,17 @@ describe Blather::Stream::Client do
     @client.stubs(:post_init) unless @client.respond_to?(:post_init)
     @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 {
       EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
 
       # Mocked server
-      EventMachine::start_server '127.0.0.1', 12345, ServerMock
+      EventMachine::start_server '127.0.0.1', port, ServerMock
 
       # Blather::Stream connection
-      EM.connect('127.0.0.1', 12345, Blather::Stream::Client, @client, @jid || Blather::JID.new('n@d/r'), 'pass') { |c| @stream = c }
+      EM.connect('127.0.0.1', port, Blather::Stream::Client, @client, @jid || Blather::JID.new('n@d/r'), 'pass') { |c| @stream = c }
     }
   end
 
@@ -111,6 +113,16 @@ describe Blather::Stream::Client do
     Blather::Stream::Client.start client, 'n@d/r', 'pass'
   end
 
+  it 'raises a NoConnection exception if the connection is unbound before it can be completed' do
+    proc do
+      EventMachine::run {
+        EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
+
+        Blather::Stream::Client.start @client, @jid || Blather::JID.new('n@d/r'), 'pass', '127.0.0.1', 50000 - rand(1000)
+      }
+    end.must_raise Blather::Stream::ConnectionFailed
+  end
+
   it 'starts the stream once the connection is complete' do
     mocked_server(1) { |val, _| EM.stop; val.must_match(/stream:stream/) }
   end

data/spec/blather/stream/component_spec.rb

@@ -14,13 +14,15 @@ describe Blather::Stream::Component do
     @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', 12345, ServerMock
+      EventMachine::start_server '127.0.0.1', port, ServerMock
 
       # Blather::Stream connection
-      EM.connect('127.0.0.1', 12345, Blather::Stream::Component, @client, @jid || 'comp.id', 'secret') { |c| @stream = c }
+      EM.connect('127.0.0.1', port, Blather::Stream::Component, @client, @jid || 'comp.id', 'secret') { |c| @stream = c }
     }
   end
 
@@ -55,6 +57,17 @@ describe Blather::Stream::Component do
     end
   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)
+      }
+    end.must_raise Blather::Stream::ConnectionFailed
+  end
+
   it 'starts the stream once the connection is complete' do
     mocked_server(1) { |val, _| EM.stop; val.must_match(/stream:stream/) }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156628380 !ruby/object:Gem::Requirement
+  requirement: &2151820120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156628380
+  version_requirements: *2151820120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156627780 !ruby/object:Gem::Requirement
+  requirement: &2151817400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +32,21 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156627780
+  version_requirements: *2151817400
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2156627280 !ruby/object:Gem::Requirement
+  requirement: &2151816340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156627280
+  version_requirements: *2151816340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156626720 !ruby/object:Gem::Requirement
+  requirement: &2151814180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156626720
+  version_requirements: *2151814180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156626180 !ruby/object:Gem::Requirement
+  requirement: &2151826240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.7.1
   type: :development
   prerelease: false
-  version_requirements: *2156626180
+  version_requirements: *2151826240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156625680 !ruby/object:Gem::Requirement
+  requirement: &2151823960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2156625680
+  version_requirements: *2151823960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156625120 !ruby/object:Gem::Requirement
+  requirement: &2151822020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156625120
+  version_requirements: *2151822020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156624600 !ruby/object:Gem::Requirement
+  requirement: &2151832740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +98,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2156624600
+  version_requirements: *2151832740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156624040 !ruby/object:Gem::Requirement
+  requirement: &2151843420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156624040
+  version_requirements: *2151843420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156623580 !ruby/object:Gem::Requirement
+  requirement: &2151848800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156623580
+  version_requirements: *2151848800
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2156623080 !ruby/object:Gem::Requirement
+  requirement: &2151861200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156623080
+  version_requirements: *2151861200
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2156622540 !ruby/object:Gem::Requirement
+  requirement: &2151857080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156622540
+  version_requirements: *2151857080
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2156621940 !ruby/object:Gem::Requirement
+  requirement: &2151869860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156621940
+  version_requirements: *2151869860
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2156621480 !ruby/object:Gem::Requirement
+  requirement: &2151865360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156621480
+  version_requirements: *2151865360
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
@@ -313,7 +312,6 @@ files:
 - yard/templates/default/class/html/handlers.erb
 - yard/templates/default/class/setup.rb
 - yard/templates/default/class/text/handlers.erb
-has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
 post_install_message: 
@@ -335,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
@@ -390,3 +388,4 @@ test_files:
 - spec/blather/xmpp_node_spec.rb
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
+has_rdoc: