em-xmpp 0.0.7 → 0.0.8

data/lib/em-xmpp/connection.rb

@@ -104,7 +104,7 @@ module EM::Xmpp
     def send_stanza(stanza)
       send_raw stanza.xml
       if block_given?
-        on(:anything) do |ctx|
+        upon(:anything) do |ctx|
           if ctx.id == stanza.params['id']
             yield ctx
             ctx.delete_xpath_handler!
@@ -115,7 +115,7 @@ module EM::Xmpp
       end
     end
 
-    %w{on on_exception on_presence on_iq on_message}.each do |meth|
+    %w{upon on on_exception on_presence on_iq on_message on_decorator on_iq_decorator on_presence_decorator on_message_decorator}.each do |meth|
       define_method(meth) do |*args,&blk|
         @handler.send meth, *args, &blk
       end

data/lib/em-xmpp/entity.rb

@@ -30,7 +30,14 @@ module EM::Xmpp
       jid.to_s
     end
 
-    #TODO: say, pub, sub, etc.
+    #TODO: pub, sub, etc.
+
+    def say(body)
+      msg = connection.message_stanza(:to => jid) do |x|
+        x.body body
+      end
+      connection.send_stanza msg
+    end
 
     def subscribe
       pres = connection.presence_stanza('to'=>jid.bare, 'type' => 'subscribe')

data/lib/em-xmpp/handler.rb

@@ -14,73 +14,81 @@ module EM::Xmpp
     def initialize(conn)
       @connection         = conn
       @handlers           = []
+      @decorator_handlers = []
       @exception_handlers = []
 
       stack_decorators
     end
 
-    def on_presence(&blk)
-      on('//xmlns:presence', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
-    end
-
-    def on_message(&blk)
-      on('//xmlns:message', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    # wraps the stanza in a context and calls handle_context
+    def handle(stanza)
+      handle_context Context.new(@connection, stanza)
     end
 
-    def on_iq(&blk)
-      on('//xmlns:iq', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
-    end
+    private
 
     def stack_decorators
-      on_presence do |ctx| 
+      on_presence_decorator do |ctx| 
         ctx = ctx.with(:presence) 
         ctx = ctx.with(:error) if ctx.error?
         ctx
       end
-      on_message  do |ctx| 
+      on_message_decorator  do |ctx| 
         ctx = ctx.with(:message) 
         ctx = ctx.with(:error) if ctx.error?
         ctx
       end
-      on_iq       do |ctx| 
+      on_iq_decorator       do |ctx| 
         ctx = ctx.with(:iq) 
         ctx = ctx.with(:error) if ctx.error?
         ctx
       end
-      on('//xmlns:delay', 'xmlns' => Delay) do |ctx|
+      on_decorator('//xmlns:delay', 'xmlns' => Delay) do |ctx|
         ctx.with(:delay)
       end
-      on('//xmlns:query', 'xmlns' => DiscoverInfos) do |ctx|
+      on_decorator('//xmlns:query', 'xmlns' => DiscoverInfos) do |ctx|
         ctx.with(:discoinfos)
       end
-      on('//xmlns:query', 'xmlns' => DiscoverItems) do |ctx|
+      on_decorator('//xmlns:query', 'xmlns' => DiscoverItems) do |ctx|
         ctx.with(:discoitems)
       end
-      on('//xmlns:query', 'xmlns' => Roster) do |ctx|
+      on_decorator('//xmlns:query', 'xmlns' => Roster) do |ctx|
         ctx.with(:roster)
       end
-      on('//xmlns:command', 'xmlns' => Commands) do |ctx|
+      on_decorator('//xmlns:command', 'xmlns' => Commands) do |ctx|
         ctx.with(:command)
       end
-      on('//xmlns:x', 'xmlns' => DataForms) do |ctx|
+      on_decorator('//xmlns:x', 'xmlns' => DataForms) do |ctx|
         ctx.with(:dataforms)
       end
-      on('//xmlns:nick', 'xmlns' => Nick) do |ctx|
+      on_decorator('//xmlns:nick', 'xmlns' => Nick) do |ctx|
         ctx.with(:nickname)
       end
-      on('//xmlns:x', 'xmlns' => MucUser) do |ctx|
+      on_decorator('//xmlns:x', 'xmlns' => MucUser) do |ctx|
         ctx.with(:mucuser)
       end
     end
 
+    def add_decorator_handler(handler)
+      @decorator_handlers << handler
+    end
+
     def add_handler(handler)
       @handlers << handler
     end
 
+    def add_handler_before_the_other_handlers(handler)
+      @handlers.unshift handler
+    end
+
     def add_exception_handler(handler)
       @exception_handlers << handler
     end
 
+    def remove_decorator_handler(handler)
+      @decorator_handlers.delete handler
+    end
+
     def remove_handler(handler)
       @handlers.delete handler
     end
@@ -94,6 +102,44 @@ module EM::Xmpp
       handler = StanzaHandler.new(matcher, blk)
     end
 
+    public
+
+    def on_presence(&blk)
+      on('//xmlns:presence', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_message(&blk)
+      on('//xmlns:message', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_iq(&blk)
+      on('//xmlns:iq', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_presence_decorator(&blk)
+      on_decorator('//xmlns:presence', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_message_decorator(&blk)
+      on_decorator('//xmlns:message', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_iq_decorator(&blk)
+      on_decorator('//xmlns:iq', 'xmlns' => EM::Xmpp::Namespaces::Client, &blk)
+    end
+
+    def on_decorator(path, args={}, &blk)
+      handler = handler_for path, args, &blk
+      add_decorator_handler handler
+      handler
+    end
+
+    def upon(path, args={}, &blk)
+      handler = handler_for path, args, &blk
+      add_handler_before_the_other_handlers handler
+      handler
+    end
+
     def on(path, args={}, &blk)
       handler = handler_for path, args, &blk
       add_handler handler
@@ -106,11 +152,9 @@ module EM::Xmpp
       handler
     end
 
-    # wraps the stanza in a context and calls handle_context
-    def handle(stanza)
-      handle_context Context.new(@connection, stanza)
-    end
+    private
 
+    # runs all decorator_handlers against the stanza context so that the context has all needed methods
     # runs all handlers against the stanza context
     # catches all exception (in which case, the context gets passed to all
     # exception_handlers)
@@ -122,14 +166,15 @@ module EM::Xmpp
     # handlers such as request/responses
     def handle_context(ctx)
       catch :halt do
+        run_xpath_handlers ctx, @decorator_handlers.dup, :remove_decorator_handler
         run_xpath_handlers ctx, @handlers.dup, :remove_handler
       end
     rescue => err
       ctx['error'] = err
-      run_xpath_handlers ctx, @exception_handlers, :remove_exception_handler
+      run_xpath_handlers ctx, @exception_handlers.dup, :remove_exception_handler
     end
 
-    # runs all handlers and returns a list of handlers for the next stanza
+    # runs all handlers, calls the remover method if a handler should be removed
     def run_xpath_handlers(ctx, handlers, remover)
       handlers.each do |h|
         if (not ctx.done?) and (h.match?(ctx.stanza))
@@ -143,9 +188,10 @@ module EM::Xmpp
   end
 
   class XmppSASL < ::SASL::Preferences
-    attr_accessor :handler
+    attr_accessor :handler, :authzid
     def initialize(handler)
       @handler = handler
+      @authzid = handler.jid.bare.to_s
     end
     def realm
       handler.jid.domain
@@ -162,6 +208,9 @@ module EM::Xmpp
     def password
       ret = handler.pass
     end
+    def allow_plaintext?
+      true
+    end
   end
 
   class Routine < Handler
@@ -252,10 +301,12 @@ module EM::Xmpp
       end
 
       on(:anything) do |ctx|
-        @connection.unhandled ctx.stanza
+        @connection.unhandled_stanza ctx.stanza
       end
     end
 
+    private
+
     def extract_jid(stanza)
       jid = stanza.xpath('//bind:jid', {'bind' => Bind})
       jid.text if jid.any?
@@ -270,15 +321,26 @@ module EM::Xmpp
     end
 
     def start_session
-      c.send_stanza(c.iq_stanza('type' => 'set', 'to' => jid.domain) do |x|
+      session_request = c.iq_stanza('type' => 'set', 'to' => jid.domain) do |x|
         x.session('xmlns' => Session) 
-      end)
+      end
+
+      c.send_stanza(session_request) do |ctx|
+        if ctx.type == 'result'
+          @connection.negotiation_finished
+          ctx.delete_xpath_handler!.done!
+        else
+          @connection.negotiation_failed(ctx)
+        end
+      end
     end
 
     def start_sasl(methods)
       @sasl = ::SASL.new(methods, XmppSASL.new(self))
       msg,val = sasl.start
       mech = sasl.mechanism
+      @sasl.preferences.authzid = nil if mech == "DIGEST-MD5"
+      val       =  Base64.strict_encode64(val) if val 
       reply_sasl(msg,val,mech)
     end
 

data/lib/em-xmpp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-xmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000Z
+date: 2012-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2155062040 !ruby/object:Gem::Requirement
+  requirement: &2157880740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155062040
+  version_requirements: *2157880740
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2155061620 !ruby/object:Gem::Requirement
+  requirement: &2157880320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155061620
+  version_requirements: *2157880320
 - !ruby/object:Gem::Dependency
   name: ruby-sasl
-  requirement: &2155061200 !ruby/object:Gem::Requirement
+  requirement: &2157879900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155061200
+  version_requirements: *2157879900
 description: XMPP client for event machine
 email:
 - crapooze@gmail.com