em-xmpp 0.0.6 → 0.0.7

data/lib/em-xmpp/connection.rb

@@ -13,13 +13,14 @@ module EM::Xmpp
     include Namespaces
     include Connector
 
-    attr_reader :jid, :pass
+    attr_reader :jid, :pass, :user_data
 
     def initialize(jid, pass, mod=nil, cfg={})
       @jid        = jid
       @pass       = pass.dup.freeze
       self.extend mod if mod
       certdir     = cfg[:certificates]
+      @user_data  = cfg[:data]
       @certstore  = if certdir
                       CertStore.new(certdir)
                     else

data/lib/em-xmpp/entity.rb

@@ -5,6 +5,7 @@ require 'fiber'
 
 module EM::Xmpp
   class Entity
+    include Namespaces
     attr_reader :jid, :connection
 
     def initialize(connection, jid)

data/lib/em-xmpp/handler.rb

@@ -89,16 +89,19 @@ module EM::Xmpp
       @exception_handlers.delete handler
     end
 
-    def on(path, args={}, &blk)
+    def handler_for(path,args,&blk)
       matcher = StanzaMatcher.new(path, args)
       handler = StanzaHandler.new(matcher, blk)
+    end
+
+    def on(path, args={}, &blk)
+      handler = handler_for path, args, &blk
       add_handler handler
       handler
     end
 
     def on_exception(path, args={}, &blk)
-      matcher = StanzaMatcher.new(path, args)
-      handler = StanzaHandler.new(matcher, &blk)
+      handler = handler_for path, args, &blk
       add_exception_handler handler
       handler
     end
@@ -119,18 +122,23 @@ module EM::Xmpp
     # handlers such as request/responses
     def handle_context(ctx)
       catch :halt do
-        @handlers = run_xpath_handlers ctx, @handlers.dup
+        run_xpath_handlers ctx, @handlers.dup, :remove_handler
       end
     rescue => err
       ctx['error'] = err
-      @exception_handlers = run_xpath_handlers ctx, @exception_handlers
+      run_xpath_handlers ctx, @exception_handlers, :remove_exception_handler
     end
 
     # runs all handlers and returns a list of handlers for the next stanza
-    def run_xpath_handlers(ctx, handlers)
-      handlers.map do |x|
-        x.call ctx
-      end.compact
+    def run_xpath_handlers(ctx, handlers, remover)
+      handlers.each do |h|
+        if (not ctx.done?) and (h.match?(ctx.stanza))
+          ctx['xpath.handler'] = h
+          ctx = h.call(ctx)
+          raise RuntimeError, "xpath handlers should return a Context" unless ctx.is_a?(Context)
+          send remover, h unless ctx.reuse_handler?
+        end
+      end
     end
   end
 

data/lib/em-xmpp/stanza_handler.rb

@@ -13,15 +13,7 @@ module EM::Xmpp
     end
 
     def call(ctx)
-      if (not ctx.done?) and (match?(ctx.stanza))
-        ctx['xpath.handler'] = self
-        ctx = callback.call(ctx)
-        raise RuntimeError, "xpath handlers should return a Context" unless ctx.is_a?(Context)
-
-        self if ctx.reuse_handler?
-      else
-        self
-      end
+      callback.call(ctx)
     end
   end
 end

data/lib/em-xmpp/version.rb

@@ -1,5 +1,5 @@
 module Em
   module Xmpp
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-xmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2154466840 !ruby/object:Gem::Requirement
+  requirement: &2155062040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154466840
+  version_requirements: *2155062040
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154466420 !ruby/object:Gem::Requirement
+  requirement: &2155061620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154466420
+  version_requirements: *2155061620
 - !ruby/object:Gem::Dependency
   name: ruby-sasl
-  requirement: &2154466000 !ruby/object:Gem::Requirement
+  requirement: &2155061200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154466000
+  version_requirements: *2155061200
 description: XMPP client for event machine
 email:
 - crapooze@gmail.com