em-xmpp 0.0.11 → 0.0.12

data/bin/xmig

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift './lib'
-require 'em-xmpp'
+require 'em-xmpp/connection'
 require 'em-xmpp/helpers'
 require 'em-xmpp/conversation'
 
@@ -46,7 +46,7 @@ module Command extend self
   end
 
   def print_context_dataforms(ctx)
-    df = ctx.bit!(:dataforms)
+    df = ctx.bit(:dataforms)
     df.x_forms.each do |form|
       print_dataform form
     end
@@ -116,7 +116,7 @@ module Command extend self
       lambda do |client|
         puts "=== PubSub Subscriptions on #{jid} (#{node}) ==="
         ctx = client.entity(jid).pubsub(node).service_subscriptions
-        ctx.bit!(:pubsub).subscriptions.each do |s|
+        ctx.bit(:pubsub).subscriptions.each do |s|
           puts "#{s.node} -- #{s.subscription} (#{s.sub_id})"
         end
       end
@@ -125,7 +125,7 @@ module Command extend self
       lambda do |client|
         puts "=== PubSub Affiliations on #{jid} (#{node}) ==="
         ctx = client.entity(jid).pubsub(node).service_affiliations
-        ctx.bit!(:pubsub).affiliations.each do |s|
+        ctx.bit(:pubsub).affiliations.each do |s|
           puts "#{s.node} (#{s.affiliation})"
         end
       end
@@ -182,7 +182,7 @@ module Command extend self
       lambda do |client|
         puts "publishing #{payload.size} bytes to #{jid} (#{node})"
         ctx = client.entity(jid).pubsub(node).publish(payload)
-        ctx.bit!(:pubsub).items.each do |item|
+        ctx.bit(:pubsub).items.each do |item|
           puts "published: #{item.item_id} at #{item.node}"
         end
       end
@@ -215,7 +215,7 @@ module Command extend self
       lambda do |client|
         puts "=== PubSub Subscriptions on #{jid} ==="
         ctx = client.entity(jid).pubsub(node).subscriptions
-        ctx.bit!(:pubsubowner).subscriptions.each do |s|
+        ctx.bit(:pubsubowner).subscriptions.each do |s|
           puts "#{s.jid} -- #{s.subscription} (#{s.sub_id})"
         end
       end
@@ -224,7 +224,7 @@ module Command extend self
       lambda do |client|
         puts "=== PubSub Affiliations on #{jid} ==="
         ctx = client.entity(jid).pubsub(node).affiliations
-        ctx.bit!(:pubsubowner).affiliations.each do |s|
+        ctx.bit(:pubsubowner).affiliations.each do |s|
           puts "#{s.jid} (#{s.affiliation})"
         end
       end
@@ -366,13 +366,15 @@ module Command extend self
 
         client.entity(dst).say("",'chat', xmlproc)
         client.on_iq do |ctx|
-          bob = ctx.bit(:bob)
-          if bob and (bob.cid == item.cid)
-            puts "sending bob"
-            iq = bob.reply(item)
-            client.send_stanza iq
-            ctx.delete_xpath_handler!
-            ctx.done!
+          if ctx.bit?(:bob)
+            bob = ctx.bit(:bob)
+            if (bob.cid == item.cid)
+              puts "sending bob"
+              iq = bob.reply(item)
+              client.send_stanza iq
+              ctx.delete_xpath_handler!
+              ctx.done!
+            end
           end
           ctx
         end
@@ -484,11 +486,11 @@ module Command extend self
         disco = client.entity(dst).discover_infos(node)
 
         puts "=== Identities ==="
-        disco.bit!(:discoinfos).identities.each do |i|
+        disco.bit(:discoinfos).identities.each do |i|
           puts "#{i.category}/#{i.type}: #{i.name || "_"}"
         end
         puts "=== Features ==="
-        disco.bit!(:discoinfos).features.each do |f|
+        disco.bit(:discoinfos).features.each do |f|
           puts "#{f.var}"
         end
       end
@@ -500,7 +502,7 @@ module Command extend self
         disco = client.entity(dst).discover_items(node)
 
         puts "=== Items ==="
-        disco.bit!(:discoitems).items.each do |i|
+        disco.bit(:discoitems).items.each do |i|
           puts "#{i.entity} (#{i.node}) -- #{i.name || i.entity}"
         end
       end
@@ -594,6 +596,8 @@ module RosterClient
   attr_reader :queue
 
   def ready
+    @handler.enable_default_stack_decorators!
+
     @show_xml = false
     puts "***** #{@jid} ready"
     user_data.each{|c| handle_command c}
@@ -607,7 +611,7 @@ module RosterClient
 
     # Signal presence subscriptions
     on_presence do |ctx|
-      pre = ctx.bit!(:presence)
+      pre = ctx.bit(:presence)
       if pre.subscription_request?
         puts "=== Presence subscription request from: #{pre.from.bare}"
         ctx.done!
@@ -617,15 +621,15 @@ module RosterClient
 
     # Signal people arriving and leaving
     on_presence do |ctx|
-      pre = ctx.bit!(:presence)
+      pre = ctx.bit(:presence)
       puts "=== Presence #{pre.from}: #{pre.type}"
       ctx.done!
     end
 
     # Acknowledge roster change 
     on_iq do |ctx|
-      roster = ctx.bit(:roster)
-      if roster
+      if ctx.bit?(:roster)
+        roster = ctx.bit(:roster)
         if roster.type == 'set'
           puts "=== Roster change ==="
           roster.items.each do |item|
@@ -640,8 +644,8 @@ module RosterClient
 
     # Replies to item queries
     on_iq do |ctx|
-      query = ctx.bit(:discoitems)
-      if query
+      if ctx.bit?(:discoitems)
+        query = ctx.bit(:discoitems)
         list = items(query.to,query.node)
         puts "==== #{query.from} discovers #{list.size} items at node #{query.node} ==="
         reply = query.reply do |iq|
@@ -661,9 +665,8 @@ module RosterClient
 
     # Replies to command queries
     on_iq do |ctx|
-      query = ctx.bit(:command)
-
-      if query
+      if ctx.bit?(:command)
+        query = ctx.bit(:command)
         if query.sessionid
           key = "command:#{query.from}:#{query.node}:#{query.sessionid}"
           conv = conversation(key)
@@ -720,10 +723,10 @@ module RosterClient
 
     # Prints Pubsub event
     on_message do |ctx|
-      event = ctx.bit(:pubsubevent)
-      delay = ctx.bit(:delay)
-      stamp = delay.stamp if delay
-      if event
+      if ctx.bit?(:pubsubevent)
+        event = ctx.bit(:pubsubevent)
+        delay = ctx.bit(:delay)
+        stamp = delay.stamp
         puts "=== PubSub event #{event.service} #{stamp} ==="
         if event.items_node #oddly enough, retractions fall in items_node
           items       = event.items
@@ -763,8 +766,8 @@ module RosterClient
         ctx.done!
       end
 
-      event = ctx.bit(:pubsub)
-      if event
+      if ctx.bit?(:pubsub)
+        event = ctx.bit(:pubsub)
         puts "=== PubSub #{event.service} ==="
         event.subscriptions.each do |sub|
           puts "subscription of #{sub.jid} (#{sub.sub_id}) status is now #{sub.subscription} for #{sub.node}"
@@ -776,8 +779,8 @@ module RosterClient
     end
 
     on_iq do |ctx|
-      si =  ctx.bit(:streaminitiation)
-      if si
+      if ctx.bit?(:streaminitiation)
+        si =  ctx.bit(:streaminitiation)
         puts "=== FileTransfer request from #{si.from}:#{si.id} ==="
         puts "file details: #{si.file_name} (#{si.file_size} bytes) (mime:#{si.mime_type})"
         puts "description: #{si.description}" if si.description
@@ -796,8 +799,8 @@ module RosterClient
     end
 
     on_iq do |ctx|
-      ibb = ctx.bit(:ibb)
-      if ibb
+      if ctx.bit?(:ibb)
+        ibb = ctx.bit(:ibb)
         key = ibb_conversation_key(ibb)
 
         if ibb.open_node
@@ -954,7 +957,7 @@ module RosterClient
   end
 
   def default_dataform_conversation(ctx, banner, &action)
-    ctx.env['dataform'] = ctx.bit!(:dataforms).form
+    ctx.env['dataform'] = ctx.bit(:dataforms).form
     dataform_conversation(ctx) do |step|
       step.on(:start) do
         puts banner

data/em-xmpp.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Em::Xmpp::VERSION
   gem.add_dependency "eventmachine"
   gem.add_dependency "nokogiri"
+  gem.add_dependency "ox"
   gem.add_dependency "ruby-sasl"
 end

data/lib/em-xmpp.rb

@@ -1,6 +1,4 @@
-require 'eventmachine'
 require "em-xmpp/version"
-require "em-xmpp/connection"
 
 module EM
   module Xmpp

data/lib/em-xmpp/component.rb

@@ -0,0 +1,18 @@
+require 'em-xmpp/namespaces'
+
+module EM::Xmpp
+  module Component
+    def stream_start(node)
+      send_raw("<handshake>#{Digest::SHA1.hexdigest(node['id']+@pass)}</handshake>")
+    end
+
+    private
+    def open_xml_stream_tag
+      "<stream:stream
+  to='#{@jid}'
+  xmlns='#{Namespaces::Component}:accept'
+  xmlns:stream='#{Namespaces::Stream}'
+>"
+    end
+  end
+end

data/lib/em-xmpp/connection.rb

@@ -1,22 +1,39 @@
 
+require 'eventmachine'
+
 require 'em-xmpp/namespaces'
-require 'em-xmpp/connector'
-require 'em-xmpp/handler'
+require 'em-xmpp/evented'
 require 'em-xmpp/jid'
-require 'em-xmpp/entity'
-require 'em-xmpp/cert_store'
-require 'eventmachine'
-require 'fiber'
+require 'em-xmpp/component'
+require 'em-xmpp/resolver'
+
 
 module EM::Xmpp
   class Connection < EM::Connection
     include Namespaces
-    include Connector
+    include Evented
 
     attr_reader :jid, :pass, :user_data
 
+    def self.start(jid, pass=nil, mod=nil, cfg={}, server=nil, port=5222, &blk)
+      jid = JID.parse jid
+      if server.nil?
+        record = Resolver.resolve jid.domain
+        if record
+          server = record.target.to_s
+          port   = record.port
+        else
+          server = jid.domain
+        end
+      end
+
+      EM.connect(server, port, self, jid, pass, mod, cfg, &blk)
+    end
+
     def initialize(jid, pass, mod=nil, cfg={})
       @jid        = jid
+      @component  = jid.node.nil?
+      self.extend Component if component?
       @pass       = pass.dup.freeze
       self.extend mod if mod
       certdir     = cfg[:certificates]
@@ -30,112 +47,27 @@ module EM::Xmpp
 
     def post_init
       super
-      @handler = StreamNegotiation.new self
+      prepare_parser!
+      set_negotiation_handler!
     end
 
-    def stanza_start(node)
+    def send_raw(data)
+      puts ">> out\n#{data}\n" if $DEBUG
+      send_data data
     end
 
-    def stanza_end(node)
-      Fiber.new { @handler.handle(node) }.resume
+    def receive_data(dat)
+      puts "<< in\n#{dat}\n" if $DEBUG
+      receive_raw(dat)
     end
 
-    def unhandled_stanza(node)
-      raise RuntimeError, "did not handle node:\n#{node}"
+    def unbind
+      puts "**** unbound ****" if $DEBUG
     end
 
-    def jid_received(jid)
-      @jid = entity jid
-    end
-
-    def entity(jid)
-      Entity.new(self, jid)
-    end
-
-    def negotiation_finished
-      @pass    = nil
-      @handler = Routine.new self
-      send_stanza presence_stanza()
-      framework_ready if respond_to? :framework_ready
-      ready
-    end
-
-    def negotiation_failed(node)
-      raise RuntimeError, "could not negotiate a stream:\n#{node}"
-    end
-
-    OutgoingStanza = Struct.new(:xml, :params)
-
-    def default_presence_params
-      {}
-    end
-
-    def default_message_params
-      {'to' => @jid.domain, 'id' => "em-xmpp.#{rand(65535)}"}
-    end
-
-    def default_iq_params
-      {'type' => 'get', 'id' => "em-xmpp.#{rand(65535)}"}
-    end
-
-    def presence_stanza(params={}, &blk)
-      params = default_presence_params.merge(params)
-      xml = build_xml do |x|
-        x.presence(params, &blk)
-      end
-      OutgoingStanza.new xml, params
-    end
-
-    def message_stanza(params={}, &blk)
-      params = default_message_params.merge(params)
-      xml = build_xml do |x|
-        x.message(params, &blk)
-      end
-      OutgoingStanza.new xml, params
-    end
-
-    def iq_stanza(params={}, &blk)
-      params = default_iq_params.merge(params)
-      xml = build_xml do |x|
-        x.iq(params, &blk)
-      end
-      OutgoingStanza.new xml, params
-    end
-
-    def send_stanza(stanza)
-      send_raw stanza.xml
-      if block_given?
-        upon(:anything) do |ctx|
-          if ctx.bit!(:stanza).id == stanza.params['id']
-            yield ctx
-            ctx.delete_xpath_handler!
-          else
-            ctx
-          end
-        end
-      end
-    end
-
-    %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
-    end
-
-    def ready
-    end
-
-    def start_using_tls_and_reset_stream
+    def initiate_tls
       bool = !! @certstore
       start_tls(:verify_peer => bool)
-      restart_xml_stream
     end
-
-    def ssl_verify_peer(pem)
-      @certstore.trusted?(pem).tap do |trusted|
-        close_connection unless trusted
-      end    
-    end
-
   end
 end

data/lib/em-xmpp/context.rb

@@ -89,11 +89,7 @@ module EM::Xmpp
     end
 
     def bit(klassname)
-      bits[bit_klass_name(klassname)] 
-    end
-
-    def bit!(klassname)
-      ret = bit klassname
+      ret = bits[bit_klass_name(klassname)] 
       unless ret
         klass = if klassname.is_a?(Class)
                   klassname
@@ -105,6 +101,16 @@ module EM::Xmpp
       ret
     end
 
+    def bit!(klassname)
+      if $DEBUG
+        $stderr.puts "EM::Xmpp::Context#bit! is outdated, please use bit (without bang)"
+        line = caller.first
+        $stderr.puts "  caller is here> #{line}"
+      end
+      bit klassname
+    end
+
+
     def bit?(klassname)
       bits.has_key? bit_klass_name(klassname)
     end
@@ -177,9 +183,8 @@ module EM::Xmpp
           jid = connection.jid.full
           {'from' => jid, 'to' => from, 'id' => id}
         end
-        def reply(args={},&blk)
-          args = reply_default_params.merge args
-          connection.presence_stanza(args,&blk)
+        def reply(*args)
+          connection.presence_stanza(reply_default_params,*args)
         end
         def priority_node
           xpath('//xmlns:priority',{'xmlns' => Client}).first
@@ -236,9 +241,8 @@ module EM::Xmpp
           h
         end
 
-        def reply(args={},&blk)
-          args = reply_default_params.merge args
-          connection.message_stanza(args,&blk)
+        def reply(*args)
+          connection.message_stanza(reply_default_params,*args)
         end
 
         def groupchat?
@@ -261,9 +265,8 @@ module EM::Xmpp
           {'from' => jid, 'to' => from, 'type' => 'result', 'id' => id}
         end
 
-        def reply(args={},&blk)
-          args = reply_default_params.merge args
-          connection.iq_stanza(args,&blk)
+        def reply(*args)
+          connection.iq_stanza(reply_default_params,*args)
         end
       end
 
@@ -748,15 +751,15 @@ module EM::Xmpp
             Base64.strict_encode64 data
           end
         end
-
+        
         def reply(item,*args)
           ref = "cid:#{item.cid}"
           params = {}
           params['max-age'] = item.max_age if item.max_age
-          super(*args) do |xml|
-            xml.data({:xmlns => EM::Xmpp::Namespaces::BoB, :cid => ref, :type => item.mime}.merge(params), item.b64)
-            yield xml if block_given?
-          end
+          super(
+            x('data',{:xmlns => EM::Xmpp::Namespaces::BoB, :cid => ref, :type => item.mime}.merge(params), item.b64),
+            *args
+          )
         end
 
         def data_node
@@ -1096,6 +1099,18 @@ module EM::Xmpp
           read_attr(n, 'role') if n
         end
       end
+
+      module Ping
+        include Iq
+
+        def ping?
+          stanza.child && stanza.child.name == 'ping'
+        end
+
+        def pong
+          reply
+        end
+      end
     end
 
     class Bit
@@ -1206,6 +1221,9 @@ module EM::Xmpp
       class Mucuser < Bit
         include Contexts::Mucuser
       end
+      class Ping < Bit
+        include Contexts::Ping
+      end
     end
 
   end