@@ -6,13 +6,14 @@ shared 'eventmachine' do $bacon_thread = Thread.current def wait Thread.stop - EM.add_timer(10) do + @timer = EM::Timer.new(10) do wake should.flunk('waited too long') end end def wake $bacon_thread.wakeup + @timer.cancel if @timer end end spec/spec_runner.rb @@ -37,4 +37,21 @@ describe 'XMPP4EM' do received.should == 'hello' end -end \ No newline at end of file + + should 'fire disconnect callback and reconnect' do + user = XMPP4EM::Client.new('user@localhost', 'user', :auto_register => true) + user.on(:disconnect){ wake } + user.connect 'localhost', 5333 # invalid port + wait + + user.should.not.be.connected? + + user.instance_variable_get('@callbacks')[:disconnect] = [] + user.connection.port = 5222 + user.on(:login){ wake } + user.reconnect + wait + + user.should.be.connected? + end +end spec/xmpp4em_spec.rb @@ -16,11 +16,11 @@ module XMPP4EM class NotConnected < Exception; end class Connection < EventMachine::Connection - def initialize host - @host = host + def initialize host, port + @host, @port = host, port @client = nil end - attr_accessor :client + attr_accessor :client, :host, :port def connection_completed log 'connected' @@ -81,9 +81,14 @@ module XMPP4EM @keepalive.cancel @keepalive = nil end + @client.on(:disconnect) log 'disconnected' end + def reconnect host = @host, port = @port + super + end + def init send "<?xml version='1.0' ?>" unless @started @started = false @@ -156,11 +161,12 @@ module XMPP4EM @id_callbacks = {} @callbacks = { - :message => [], - :presence => [], - :iq => [], - :exception => [], - :login => [] + :message => [], + :presence => [], + :iq => [], + :exception => [], + :login => [], + :disconnect => [] } @opts = { :auto_register => false }.merge(opts) @@ -177,13 +183,17 @@ module XMPP4EM def connect host = jid.domain, port = 5222 EM.run { - EM.connect host, port, Connection, host do |conn| + EM.connect host, port, Connection, host, port do |conn| @connection = conn conn.client = self end } end + def reconnect + @connection.reconnect + end + def connected? @connection and !@connection.error? end @@ -268,9 +278,7 @@ module XMPP4EM send(iq){ |reply| if reply.type == :result - @callbacks[:login].each do |blk| - blk.call(stanza) - end + on(:login, stanza) end } end @@ -291,25 +299,25 @@ module XMPP4EM case stanza when Jabber::Message - @callbacks[:message].each do |blk| - blk.call(stanza) - end + on(:message, stanza) when Jabber::Iq - @callbacks[:iq].each do |blk| - blk.call(stanza) - end + on(:iq, stanza) when Jabber::Presence - @callbacks[:presence].each do |blk| - blk.call(stanza) - end + on(:presence, stanza) end end - def on type, &blk - @callbacks[type] << blk + def on type, *args, &blk + if blk + @callbacks[type] << blk + else + @callbacks[type].each do |blk| + blk.call(*args) + end + end end def add_message_callback (&blk) on :message, &blk end xmpp4em.rb 81e5d2d9899d66b053ab00a3814ab5b03ed473c5 Aman Gupta aman@tmm1.net http://github.com/tmm1/xmpp4em/commit/0593bc2571223b660bd3e8f392a9929e63df6eb8 0593bc2571223b660bd3e8f392a9929e63df6eb8 2008-07-07T14:36:59-07:00 2008-07-07T14:36:59-07:00 add #reconnect and on(:disconnect) callback 0a89aaa00837d406adca2a1f857cd65af60a419f Aman Gupta aman@tmm1.net