blather 0.4.3 → 0.4.4

data/README.rdoc

@@ -57,6 +57,18 @@ Setup handlers by calling their names as methods.
   # and #body == 'exit'
   message :chat?, :body => 'exit'
 
+=== Non-Stanza Handlers
+
+So far there are two non-stanza related handlers.
+
+  when_ready (or handle(:ready) {})
+    Called after the connection has been connected. It's good for initializing your system.
+
+  disconnected (or handle(:disconnected) {})
+    Called after the connection has been terminated. Good for teardown or automatic reconnection.
+    The following will reconnect every time the connection is lost:
+    disconnected { client.connect }
+
 === Handler Guards
 
 Guards act like AND statements. Each condition must be met if the handler is to be used.

data/lib/blather/client/client.rb

@@ -80,6 +80,7 @@ module Blather #:nodoc:
       klass = @setup[0].node ? Blather::Stream::Client : Blather::Stream::Component
       klass.start self, *@setup
     end
+    alias_method :connect, :run
 
     ##
     # Register a filter to be run before or after the handler chain is run.
@@ -141,7 +142,7 @@ module Blather #:nodoc:
     end
 
     def unbind # :nodoc:
-      EM.stop if EM.reactor_running?
+      call_handler_for(:disconnected, nil) || (EM.reactor_running? && EM.stop)
     end
 
     def receive_data(stanza) # :nodoc:
@@ -176,7 +177,7 @@ module Blather #:nodoc:
     end
 
     def current_handlers
-      [:ready] + Stanza.handler_list + BlatherError.handler_list
+      [:ready, :disconnected] + Stanza.handler_list + BlatherError.handler_list
     end
 
     def setup_initial_handlers # :nodoc:
@@ -184,9 +185,9 @@ module Blather #:nodoc:
         raise err
       end
 
-      register_handler :iq, :type => [:get, :set] do |iq|
-        write StanzaError.new(iq, 'service-unavailable', :cancel).to_node
-      end
+      # register_handler :iq, :type => [:get, :set] do |iq|
+      #   write StanzaError.new(iq, 'service-unavailable', :cancel).to_node
+      # end
 
       register_handler :status do |status|
         roster[status.from].status = status if roster[status.from]

data/lib/blather/client/dsl.rb

@@ -11,7 +11,7 @@ module Blather
     module_function :client
 
     def pubsub
-      @pubsub ||= PubSub.new jid.domain
+      @pubsub ||= PubSub.new client, jid.domain
     end
 
     ##
@@ -62,6 +62,12 @@ module Blather
       handle :ready, &block
     end
 
+    ##
+    # Wrapper for "handle :disconnected"
+    def disconnected(&block)
+      handle :disconnected, &block
+    end
+
     ##
     # Set current status
     def set_status(state = nil, msg = nil)

data/lib/blather/client/dsl/pubsub.rb

@@ -4,7 +4,8 @@ module DSL
   class PubSub
     attr_accessor :host
 
-    def initialize(host)
+    def initialize(client, host)
+      @client = client
       @host = host
     end
 
@@ -60,7 +61,7 @@ module DSL
     # * +node+ is the node to subscribe to
     # * +jid+ is the jid that should be used. Defaults to the stripped current JID
     def subscribe(node, jid = nil, host = nil)
-      jid ||= DSL.client.jid.stripped
+      jid ||= client.jid.stripped
       request(Stanza::PubSub::Subscribe.new(:set, send_to(host), node, jid)) { |n| yield n if block_given? }
     end
 
@@ -70,7 +71,7 @@ module DSL
     # * +node+ is the node to subscribe to
     # * +jid+ is the jid that should be used. Defaults to the stripped current JID
     def unsubscribe(node, jid = nil, host = nil)
-      jid ||= DSL.client.jid.stripped
+      jid ||= client.jid.stripped
       request(Stanza::PubSub::Unsubscribe.new(:set, send_to(host), node, jid)) { |n| yield n if block_given? }
     end
 
@@ -120,13 +121,17 @@ module DSL
   private
     def request(node, method = nil, callback = nil, &block)
       block = lambda { |node| callback.call(method ? node.__send__(method) : node) } unless block_given?
-      DSL.client.write_with_handler(node, &block)
+      client.write_with_handler(node, &block)
     end
 
     def send_to(host = nil)
       raise 'You must provide a host' unless (host ||= @host)
       host
     end
+
+    def client
+      @client
+    end
   end
 
 end

data/spec/blather/client/client_spec.rb

@@ -76,6 +76,32 @@ describe Blather::Client do
     @client.unbind
   end
 
+  it 'calls the :disconnected handler with #unbind is called' do
+    EM.expects(:reactor_running?).returns false
+    disconnected = mock()
+    disconnected.expects(:call)
+    @client.register_handler(:disconnected) { disconnected.call }
+    @client.unbind    
+  end
+
+  it 'does not call EM.stop on #unbind if a handler returns positive' do
+    EM.expects(:reactor_running?).never
+    EM.expects(:stop).never
+    disconnected = mock()
+    disconnected.expects(:call).returns true
+    @client.register_handler(:disconnected) { disconnected.call }
+    @client.unbind
+  end
+
+  it 'calls EM.stop on #unbind if a handler returns negative' do
+    EM.expects(:reactor_running?).returns true
+    EM.expects(:stop)
+    disconnected = mock()
+    disconnected.expects(:call).returns false
+    @client.register_handler(:disconnected) { disconnected.call }
+    @client.unbind
+  end
+
   it 'can register a temporary handler based on stanza ID' do
     stanza = Blather::Stanza::Iq.new
     response = mock()
@@ -212,26 +238,26 @@ describe 'Blather::Client default handlers' do
     lambda { @client.receive_data err }.must_raise Blather::BlatherError
   end
 
-  it 'responds to iq:get with a "service-unavailable" error' do
-    get = Blather::Stanza::Iq.new :get
-    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
-    @client.expects(:write).with err
-    @client.receive_data get
-  end
-
-  it 'responds to iq:get with a "service-unavailable" error' do
-    get = Blather::Stanza::Iq.new :get
-    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
-    @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
-    @client.receive_data get
-  end
-
-  it 'responds to iq:set with a "service-unavailable" error' do
-    get = Blather::Stanza::Iq.new :set
-    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
-    @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
-    @client.receive_data get
-  end
+  # it 'responds to iq:get with a "service-unavailable" error' do
+  #   get = Blather::Stanza::Iq.new :get
+  #   err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
+  #   @client.expects(:write).with err
+  #   @client.receive_data get
+  # end
+
+  # it 'responds to iq:get with a "service-unavailable" error' do
+  #   get = Blather::Stanza::Iq.new :get
+  #   err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
+  #   @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
+  #   @client.receive_data get
+  # end
+
+  # it 'responds to iq:set with a "service-unavailable" error' do
+  #   get = Blather::Stanza::Iq.new :set
+  #   err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
+  #   @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
+  #   @client.receive_data get
+  # end
 
   it 'handles status changes by updating the roster if the status is from a Blather::JID in the roster' do
     jid = 'friend@jabber.local'

data/spec/blather/client/dsl/pubsub_spec.rb

@@ -5,10 +5,9 @@ require 'blather/client/dsl'
 describe Blather::DSL::PubSub do
   before do
     @host = 'host.name'
-    @pubsub = Blather::DSL::PubSub.new @host
     @client = mock()
     @client.stubs(:jid).returns Blather::JID.new('n@d/r')
-    Blather::DSL.stubs(:client).returns @client
+    @pubsub = Blather::DSL::PubSub.new @client, @host
   end
 
   it 'raises an error when trying to send a stanza without a host' do
@@ -273,9 +272,8 @@ end
 describe 'Blather::DSL::PubSub callbacks' do
   before do
     @host = 'host.name'
-    @pubsub = Blather::DSL::PubSub.new @host
     @client = Blather::Client.setup Blather::JID.new('n@d/r'), 'pass'
-    Blather::DSL.stubs(:client).returns @client
+    @pubsub = Blather::DSL::PubSub.new @client, @host
   end
 
   it 'returns a list of affiliations when requesting affiliations' do

data/spec/blather/client/dsl_spec.rb

@@ -63,6 +63,11 @@ describe Blather::DSL do
     @dsl.when_ready
   end
 
+  it 'provides a helper for disconnected' do
+    @client.expects(:register_handler).with :disconnected
+    @dsl.disconnected
+  end
+
   it 'sets the initial status' do
     state = :away
     msg = 'do not disturb'

data/spec/blather/stream/parser_spec.rb

@@ -79,9 +79,9 @@ describe Blather::Stream::Parser do
         '<error type="modify">',
           '<undefined-condition xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>',
           '<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Some special application diagnostic information...</text>',
-          '<special-application-condition xmlns="application-ns"/>',
+          '<special-application-condition xmlns="special:application-ns"/>',
         "</error>",
-      "</message>"
+      "</message>",
     ]
     data.each { |d| @parser.receive_data d }
     @client.data.size.must_equal 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-18 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: squishtech
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed