em-xmpp 0.0.3 → 0.0.4

data/lib/em-xmpp/connection.rb

@@ -3,8 +3,10 @@ require 'em-xmpp/namespaces'
 require 'em-xmpp/connector'
 require 'em-xmpp/handler'
 require 'em-xmpp/jid'
+require 'em-xmpp/entity'
 require 'em-xmpp/cert_store'
 require 'eventmachine'
+require 'fiber'
 
 module EM::Xmpp
   class Connection < EM::Connection
@@ -34,7 +36,7 @@ module EM::Xmpp
     end
 
     def stanza_end(node)
-      @handler.handle(node)
+      Fiber.new { @handler.handle(node) }.resume
     end
 
     def unhandled_stanza(node)
@@ -42,7 +44,11 @@ module EM::Xmpp
     end
 
     def jid_received(jid)
-      @jid = JID.parse jid
+      @jid = entity jid
+    end
+
+    def entity(jid)
+      Entity.new(self, jid)
     end
 
     def negotiation_finished

data/lib/em-xmpp/connector.rb

@@ -144,7 +144,7 @@ module EM::Xmpp
         node.add_namespace_definition pfx, href
       end
 
-      puts "starting: #{name}, stack:#{@stack.size}" if $DEBUG
+      # puts "starting: #{name}, stack:#{@stack.size}" if $DEBUG
       case @stack.size
       when 0 #the streaming tag starts
         stream_support(node)
@@ -160,7 +160,7 @@ module EM::Xmpp
 
     def xml_end_element(name)
       node = @stack.pop
-      puts "ending: #{name}, stack:#{@stack.size}" if $DEBUG
+      #puts "ending: #{name}, stack:#{@stack.size}" if $DEBUG
 
       case @stack.size
       when 0 #i.e., the stream support ends

data/lib/em-xmpp/context.rb

@@ -1,5 +1,6 @@
 
 require 'em-xmpp/jid'
+require 'em-xmpp/entity'
 require 'em-xmpp/namespaces'
 require 'time'
 require 'ostruct'
@@ -83,10 +84,10 @@ module EM::Xmpp
         end
       end
       def to
-        read_attr(stanza, 'to'){|j| JID.parse(j)}
+        read_attr(stanza, 'to'){|j| @connection.entity(j)}
       end
       def from
-        read_attr(stanza, 'from'){|j| JID.parse(j)}
+        read_attr(stanza, 'from'){|j| @connection.entity(j)}
       end
       def error?
         type == 'error'
@@ -236,16 +237,50 @@ module EM::Xmpp
 
     module Discoinfos
       include Discoveries
+      Identity = Struct.new(:name, :category, :type)
+      Feature  = Struct.new(:var)
       def query_node
         xpath('//xmlns:query',{'xmlns' => DiscoverInfos}).first
       end
+      def identities
+        n = query_node
+        if n
+          n.xpath('xmlns:identity',{'xmlns' => DiscoverInfos}).map do |x|
+            cat   = read_attr(x, 'category')
+            type  = read_attr(x, 'type')
+            name  = read_attr(x, 'name')
+            Identity.new name, cat, type
+          end
+        end
+      end
+      def features
+        n = query_node
+        if n
+          n.xpath('xmlns:feature',{'xmlns' => DiscoverInfos}).map do |x|
+            var = read_attr(x, 'var')
+            Feature.new var
+          end
+        end
+      end
     end
 
     module Discoitems
       include Discoveries
+      Item = Struct.new(:entity, :node, :name)
       def query_node
         xpath('//xmlns:query',{'xmlns' => DiscoverItems}).first
       end
+      def item_nodes
+        xpath('//xmlns:item',{'xmlns' => DiscoverItems})
+      end
+      def items
+        item_nodes.map do |n| 
+          entity = read_attr(n, 'jid'){|x| @connection.entity(x)}
+          node   = read_attr(n, 'node')
+          name   = read_attr(n, 'name')
+          Item.new(entity, node, name)
+        end
+      end
     end
 
     module Command
@@ -266,13 +301,31 @@ module EM::Xmpp
     end
 
     module Dataforms
-      def x_node
-        xpath('//xmlns:x',{'xmlns' => DataForms}).first
+      Form  = Struct.new(:type, :fields)
+      Field = Struct.new(:var, :type, :values) do
+        def value
+          values.first
+        end
       end
 
-      def x_type
-        n = x_node
-        read_attr(n, 'type') if n
+      def x_form_nodes
+        xpath('//xmlns:x',{'xmlns' => Namespaces::DataForms})
+      end
+
+      def x_forms
+        x_form_nodes.map do |form|
+          form_type = read_attr(form, 'type')
+          field_nodes = form.xpath('xmlns:field',{'xmlns' => Namespaces::DataForms})
+          fields = field_nodes.map do |field|
+            var  = read_attr(field, 'var')
+            type = read_attr(field, 'type')
+            value_nodes = field.xpath('xmlns:value',{'xmlns' => Namespaces::DataForms})
+            values = value_nodes.map(&:content)
+
+            Field.new(var,type,values)
+          end
+          Form.new form_type, fields
+        end
       end
     end
 
@@ -309,7 +362,7 @@ module EM::Xmpp
 
       def new_subscription(n)
         type = read_attr(n,'subscription')
-        jid  = read_attr(n,'jid') {|x| JID.parse x}
+        jid  = read_attr(n,'jid') {|x| @connection.entity x}
         name = read_attr(n,'name')
         groups = n.xpath('xmlns:group', 'xmlns' => EM::Xmpp::Namespaces::Roster).map{|n| n.content}
         Subscription.new(type, jid, name, groups)
@@ -498,7 +551,7 @@ worried}.freeze
       def jid
         n = item_node
         jid_str = read_attr(n, 'jid') if n
-        JID.parse jid_str if jid_str
+        @connection.entity jid_str if jid_str
       end
 
       def affiliation

data/lib/em-xmpp/entity.rb

@@ -0,0 +1,54 @@
+
+require 'em-xmpp/jid'
+require 'em-xmpp/namespaces'
+require 'fiber'
+
+module EM::Xmpp
+  class Entity
+    attr_reader :jid, :connection
+
+    def initialize(connection, jid)
+      @connection = connection
+      @jid        = JID.parse jid.to_s
+      yield self if block_given?
+    end
+
+    def domain
+      Entity.new(connection, jid.domain)
+    end
+
+    def bare
+      Entity.new(connection, jid.bare)
+    end
+
+    def to_s
+      jid.to_s
+    end
+
+    #TODO: subscribe, unsubscribe, say, pub, sub, etc.
+
+    def discover_infos(node=nil)
+      f = Fiber.current
+      hash = {'xmlns' => Namespaces::DiscoverInfos}
+      hash['node'] = node if node
+      iq = connection.iq_stanza('to'=>jid) do |xml|
+        xml.query(hash)
+      end
+      connection.send_stanza(iq) do |ctx|
+        f.resume ctx
+      end
+      Fiber.yield
+    end
+
+    def discover_items(node=nil)
+      f = Fiber.current
+      iq = connection.iq_stanza('to'=>jid.to_s) do |xml|
+        xml.query('xmlns' => Namespaces::DiscoverItems)
+      end
+      connection.send_stanza(iq) do |ctx|
+        f.resume ctx
+      end
+      Fiber.yield
+    end
+  end
+end

data/lib/em-xmpp/jid.rb

@@ -13,11 +13,19 @@ module EM::Xmpp
     end
 
     def bare
-      [node,domain].map(&:to_s).join('@')
+      if node
+        [node,domain].map(&:to_s).join('@')
+      else
+        domain
+      end
     end
 
     def full
-      [bare,resource].map(&:to_s).join('/')
+      if resource
+        [bare,resource].map(&:to_s).join('/')
+      else
+        bare
+      end
     end
 
     def to_s

data/lib/em-xmpp/namespaces.rb

@@ -20,7 +20,7 @@ module EM::Xmpp
     #XMPP item discovery
     DiscoverItems = "http://jabber.org/protocol/disco#items"
     #XMPP info discovery
-    DiscoverInfos = "http://jabber.org/protocol/disco#infos"
+    DiscoverInfos = "http://jabber.org/protocol/disco#info"
     #Jabber Roster
     Roster = 'jabber:iq:roster'
     #XMPP commands

data/lib/em-xmpp/version.rb

@@ -1,5 +1,5 @@
 module Em
   module Xmpp
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-xmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000Z
+date: 2012-05-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2154840920 !ruby/object:Gem::Requirement
+  requirement: &2160859240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154840920
+  version_requirements: *2160859240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154840500 !ruby/object:Gem::Requirement
+  requirement: &2160889280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154840500
+  version_requirements: *2160889280
 - !ruby/object:Gem::Dependency
   name: ruby-sasl
-  requirement: &2154840080 !ruby/object:Gem::Requirement
+  requirement: &2160888860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154840080
+  version_requirements: *2160888860
 description: XMPP client for event machine
 email:
 - crapooze@gmail.com
@@ -62,6 +62,7 @@ files:
 - lib/em-xmpp/connection.rb
 - lib/em-xmpp/connector.rb
 - lib/em-xmpp/context.rb
+- lib/em-xmpp/entity.rb
 - lib/em-xmpp/handler.rb
 - lib/em-xmpp/jid.rb
 - lib/em-xmpp/namespaces.rb