em-xmpp 0.0.10 → 0.0.11

data/lib/em-xmpp/connection.rb

@@ -56,6 +56,7 @@ module EM::Xmpp
       @pass    = nil
       @handler = Routine.new self
       send_stanza presence_stanza()
+      framework_ready if respond_to? :framework_ready
       ready
     end
 

data/lib/em-xmpp/context.rb

@@ -2,7 +2,10 @@
 require 'em-xmpp/jid'
 require 'em-xmpp/entity'
 require 'em-xmpp/namespaces'
+require 'base64'
+require 'digest/sha1'
 require 'time'
+require 'date'
 require 'ostruct'
 
 module EM::Xmpp
@@ -243,6 +246,14 @@ module EM::Xmpp
         end
       end
 
+      module Attention
+        include Message
+        def attention_node
+          xpath('//xmlns:attention',{'xmlns' => EM::Xmpp::Namespaces::Attention}).first
+        end
+      end
+
+
       module Iq
         include IncomingStanza
         def reply_default_params
@@ -296,6 +307,8 @@ module EM::Xmpp
               name  = read_attr(x, 'name')
               Identity.new name, cat, type
             end
+          else 
+            []
           end
         end
         def features
@@ -315,6 +328,10 @@ module EM::Xmpp
         def query_node
           xpath('//xmlns:query',{'xmlns' => DiscoverItems}).first
         end
+        def node
+          n = query_node
+          read_attr(n, 'node') if n
+        end
         def item_nodes
           xpath('//xmlns:item',{'xmlns' => DiscoverItems})
         end
@@ -329,29 +346,36 @@ module EM::Xmpp
       end
 
       module Command
+        include Iq
         def command_node
           xpath('//xmlns:command',{'xmlns' => Commands}).first
         end
 
-        %w{node sessionid action}.each do |word|
+        %w{node sessionid}.each do |word|
           define_method word do
             n = command_node
             read_attr(n, word) if n
           end
         end
 
+        def action
+          n = command_node
+          read_attr(n, 'action') || 'execute'
+        end
+
         def previous?
           action == 'prev'
         end
       end
 
       module Dataforms
-        Form  = Struct.new(:type, :fields)
-        Field = Struct.new(:var, :type, :values) do
+        Form  = Struct.new(:type, :fields, :title, :instructions)
+        Field = Struct.new(:var, :type, :label, :values, :options) do
           def value
             values.first
           end
         end
+        Option = Struct.new(:label, :value)
 
         def x_form_nodes
           xpath('//xmlns:x',{'xmlns' => Namespaces::DataForms})
@@ -359,19 +383,38 @@ module EM::Xmpp
 
         def x_forms
           x_form_nodes.map do |form|
+            instruction_node = form.xpath('xmlns:instructions',{'xmlns' => Namespaces::DataForms}).first
+            title_node = form.xpath('xmlns:title',{'xmlns' => Namespaces::DataForms}).first
+
+            instr = instruction_node.content if instruction_node
+            title = title_node.content if instruction_node
+
             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})
+              label = read_attr(field, 'label')
+              option_nodes = field.xpath('.//xmlns:option',{'xmlns' => Namespaces::DataForms})
+              options = option_nodes.map do |opt|
+                opt_label = read_attr(opt, 'label')
+                opt_value_nodes = opt.xpath('.//xmlns:value',{'xmlns' => Namespaces::DataForms})
+                opt_value = opt_value_nodes.map(&:content).first
+
+                Option.new(opt_label, opt_value)
+              end
+              value_nodes = field.xpath('./xmlns:value',{'xmlns' => Namespaces::DataForms})
               values = value_nodes.map(&:content)
 
-              Field.new(var,type,values)
+              Field.new(var,type,label,values,options)
             end
-            Form.new form_type, fields
+            Form.new form_type, fields, title, instr
           end
         end
+
+        def form
+          x_forms.first
+        end
       end
 
       module Capabilities
@@ -388,6 +431,7 @@ module EM::Xmpp
       end
 
       module Roster
+        include Contexts::Iq
         def query_node
           xpath('//xmlns:query',{'xmlns' => EM::Xmpp::Namespaces::Roster}).first
         end
@@ -544,35 +588,35 @@ module EM::Xmpp
 
       module Mood
         DefinedMoods = %w{afraid amazed angry amorous annoyed anxious aroused
-ashamed bored brave calm cautious cold confident confused contemplative
-contented cranky crazy creative curious dejected depressed disappointed
-disgusted dismayed distracted embarrassed envious excited flirtatious
-frustrated grumpy guilty happy hopeful hot humbled humiliated hungry hurt
-impressed in_awe in_love indignant interested intoxicated invincible jealous
-lonely lucky mean moody nervous neutral offended outraged playful proud relaxed
-relieved remorseful restless sad sarcastic serious shocked shy sick sleepy
-spontaneous stressed strong surprised thankful thirsty tired undefined weak
-worried}.freeze
-
-def mood_node
-  xpath('//xmlns:mood',{'xmlns' => Namespaces::Mood}).first
-end
-def mood_name_node
-  n = mood_node
-  n.children.find{|c| DefinedMoods.include?(c.name)} if n
-end
-def mood_text_node
-  n = mood_node
-  n.children.find{|c| c.name == 'text'}
-end
-def mood
-  n = mood_name_node
-  n.name if n
-end
-def mood
-  n = mood_text_node
-  n.content if n
-end
+        ashamed bored brave calm cautious cold confident confused contemplative
+        contented cranky crazy creative curious dejected depressed disappointed
+        disgusted dismayed distracted embarrassed envious excited flirtatious
+        frustrated grumpy guilty happy hopeful hot humbled humiliated hungry hurt
+        impressed in_awe in_love indignant interested intoxicated invincible jealous
+        lonely lucky mean moody nervous neutral offended outraged playful proud relaxed
+        relieved remorseful restless sad sarcastic serious shocked shy sick sleepy
+        spontaneous stressed strong surprised thankful thirsty tired undefined weak
+        worried}.freeze
+
+        def mood_node
+          xpath('//xmlns:mood',{'xmlns' => Namespaces::Mood}).first
+        end
+        def mood_name_node
+          n = mood_node
+          n.children.find{|c| DefinedMoods.include?(c.name)} if n
+        end
+        def mood_text_node
+          n = mood_node
+          n.children.find{|c| c.name == 'text'}
+        end
+        def mood
+          n = mood_name_node
+          n.name if n
+        end
+        def mood
+          n = mood_text_node
+          n.content if n
+        end
       end
 
       module Bytestreams
@@ -620,15 +664,33 @@ end
         end
       end
 
+      module Featurenegotiation
+        include Dataforms
+        def feature_node
+          xpath('//xmlns:feature',{'xmnls' => Namespaces::FeatureNeg})
+        end
+      end
+
       module Streaminitiation
         include Iq
-        include Dataforms
+        include Featurenegotiation
         def si_node
           xpath('//xmlns:si',{'xmlns' => Namespaces::StreamInitiation}).first
         end
         def file_node
           xpath('//xmlns:file',{'xmlns' => Namespaces::FileTransfer}).first
         end
+        def range_node
+          xpath('//xmlns:range',{'xmlns' => Namespaces::FileTransfer}).first
+        end
+        def range_length
+          n = range_node
+          read_attr(n, 'length') {|x| Integer(x)} if n
+        end
+        def range_offset
+          n = range_node
+          read_attr(n, 'offset') {|x| Integer(x)} if n
+        end
         def mime_type
           n = si_node
           read_attr(n, 'mime-type') if n
@@ -657,7 +719,6 @@ end
           n = file_node
           n.children.find{|n| n.name == 'range'} if n
         end
-        # TODO: range on requests
         def description
           n = file_node
           if n
@@ -674,8 +735,335 @@ end
         end
       end
 
+      module Bob
+        include Iq
+        Item = Struct.new(:jid, :data, :mime, :max_age) do
+          def sha1
+            Digest::SHA1.hexdigest data
+          end
+          def cid
+            "sha1+#{sha1}@#{jid}"
+          end
+          def b64
+            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
+        end
+
+        def data_node
+          xpath('//xmlns:data',{'xmlns' => Namespaces::BoB}).first
+        end
+        def cid
+          n = data_node
+          read_attr(n, 'cid') if n
+        end
+        def max_age
+          n = data_node
+          read_attr(n, 'max-age'){|x| Integer(x)} if n
+        end
+        def mime_type
+          n = data_node
+          read_attr(n, 'type') if n
+        end
+        def raw_data
+          n = data_node
+          n.content if n
+        end
+        def data
+          Base64.strict_decode raw_data if raw_data
+        end
+      end
+
+      module Ibb
+        include IncomingStanza
+        def open_node
+          xpath('//xmlns:open',{'xmlns' => Namespaces::IBB}).first
+        end
+        def data_node
+          xpath('//xmlns:data',{'xmlns' => Namespaces::IBB}).first
+        end
+        def close_node
+          xpath('//xmlns:close',{'xmlns' => Namespaces::IBB}).first
+        end
+        def block_size
+          n = open_node
+          read_attr(n,'block-size'){|x| Integer(x)} if n
+        end
+        def sid
+          n = open_node || data_node || close_node
+          read_attr(n,'sid') if n
+        end
+        def seq
+          n = data_node
+          read_attr(n,'seq') if n
+        end
+        def stanza_type
+          n = open_node
+          read_attr(n,'stanza') if n
+        end
+        def data
+          n = data_node
+          n.content if n
+        end
+      end
+
+      module PubsubMain
+        include IncomingStanza
+        Subscription = Struct.new(:jid, :node, :subscription, :sub_id, :expiry)
+        Affiliation  = Struct.new(:jid, :node, :affiliation)
+        Item         = Struct.new(:node, :item_id, :payload, :publisher)
+        Retraction   = Struct.new(:node, :item_id)
+        Deletion     = Struct.new(:node, :redirect)
+        Configuration= Struct.new(:node, :config)
+        Purge        = Struct.new(:node)
+
+        def service
+          from.jid
+        end
+      end
+
+      module Pubsubevent
+        include PubsubMain
+
+        def node_id
+          ret = nil
+          n = event_node
+          ret = read_attr(n, 'node') if n
+          unless ret
+            n = items_node
+            ret = read_attr(n, 'node') if n
+          end
+          ret
+        end
+
+        def event_node
+          xpath('//xmlns:event',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+        end
+        def items_node
+          n = event_node
+          if n
+            n.xpath('.//xmlns:items',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+          end
+        end
+        def items
+          node = items_node
+          if node
+            node_id = read_attr(node, 'node')
+            node.xpath(".//xmlns:item",{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).map do |n|
+              item_id = read_attr n, 'id'
+              publisher = read_attr n, 'publisher'
+              Item.new(node_id, item_id, n.children, publisher)
+            end
+          else
+            []
+          end
+        end
+        def retractions
+          node = items_node
+          if node
+            node_id = read_attr(node, 'node')
+            node.xpath(".//xmlns:retract",{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).map do |n|
+              item_id = read_attr n, 'id'
+              Retraction.new(node_id, item_id)
+            end
+          else
+            []
+          end
+        end
+
+        def purge_node
+          n = event_node
+          if n
+            n.xpath('//xmlns:purge',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+          end
+        end
+
+        def purge
+          node = purge_node
+          if node
+            node_id = read_attr(node, 'node')
+            Purge.new(node_id) if node
+          end
+        end
+
+        def configuration_node
+          n = event_node
+          if n
+            n.xpath('//xmlns:configuration',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+          end
+        end
+
+        def configuration
+          node = configuration_node
+          if node
+            node_id = read_attr(node, 'node')
+            Configuration.new(node_id, node.children)
+          end
+        end
+
+        def deletion_node
+          n = event_node
+          if n
+            n.xpath('//xmlns:delete',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+          end
+        end
+
+        def deletion
+          node = deletion_node
+          if node
+            node_id = read_attr(node, 'node')
+            r = node.xpath('//xmlns:redirect',{'xmlns' => EM::Xmpp::Namespaces::PubSubEvent}).first
+            uri = read_attr(r, 'uri') if r
+            Deletion.new(node_id, uri)
+          end
+        end
+      end
+
+      module Pubsub
+        include PubsubMain
+        def pubsub_node
+          xpath('//xmlns:pubsub',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+        end
+        def publish_node
+          xpath('//xmlns:publish',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+        end
+        def subscriptions_container_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:subscriptions',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+          end
+        end
+        def subscriptions
+          node = subscriptions_container_node || pubsub_node
+          if node
+            node.xpath('//xmlns:subscription',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).map do |n|
+              node_id = read_attr n, 'node'
+              jid     = read_attr(n,'jid') {|x| connection.entity x}
+              sub     = read_attr(n,'subscription')
+              sub_id  = read_attr(n,'subid')
+              expiry  = read_attr(n,'expiry'){|x| Date.parse x}
+              Subscription.new(jid,node_id,sub,sub_id,expiry)
+            end
+          else
+            []
+          end
+        end
+
+        def affiliations_container_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:affiliations',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+          end
+        end
+        def affiliations
+          node = affiliations_container_node
+          if node
+            node.xpath('//xmlns:affiliation',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).map do |n|
+              node_id = read_attr n, 'node'
+              aff     = read_attr(n,'affiliation')
+              Affiliation.new(to,node_id,aff)
+            end
+          else
+            []
+          end
+        end
+
+        def items_container_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:items',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+          end
+        end
+
+        def items
+          node = items_container_node || publish_node
+          if node
+            item_node = read_attr node, 'node'
+            node.xpath('//xmlns:item',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).map do |n|
+              item_id = read_attr n, 'id'
+              Item.new(item_node,item_id,n.children.first,nil)
+            end
+          else
+            []
+          end
+        end
+
+        def creation_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:create',{'xmlns' => EM::Xmpp::Namespaces::PubSub}).first
+          end
+        end
+
+        def created_node
+          n = creation_node
+          read_attr(n, 'node') if n
+        end
+      end
+
+
+      module Pubsubowner
+        include PubsubMain
+        def pubsub_node
+          xpath('//xmlns:pubsub',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).first
+        end
+        def publish_node
+          xpath('//xmlns:publish',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).first
+        end
+        def subscriptions_container_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:subscriptions',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).first
+          end
+        end
+        def subscriptions
+          node = subscriptions_container_node
+          node_id = read_attr node, 'node'
+          if node
+            node.xpath('//xmlns:subscription',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).map do |n|
+              jid     = read_attr(n,'jid') {|x| connection.entity x}
+              sub     = read_attr(n,'subscription')
+              sub_id  = read_attr(n,'subid')
+              expiry  = read_attr(n,'expiry'){|x| Date.parse x}
+              Subscription.new(jid,node_id,sub,sub_id,expiry)
+            end
+          else
+            []
+          end
+        end
+
+        def affiliations_container_node
+          n = pubsub_node
+          if n
+            n.xpath('//xmlns:affiliations',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).first
+          end
+        end
+        def affiliations
+          node = affiliations_container_node
+          if node
+            node_id = read_attr(node, 'node')
+            node.xpath('//xmlns:affiliation',{'xmlns' => EM::Xmpp::Namespaces::PubSubOwner}).map do |n|
+              jid = read_attr(n, 'jid') {|x| connection.entity x}
+              aff = read_attr(n,'affiliation')
+              Affiliation.new(jid,node_id,aff)
+            end
+          else
+            []
+          end
+        end
+      end
+
       module Mucuser
-        def x_nodstreaminitiation
+        def x_node
           xpath('//xmlns:x',{'xmlns' => EM::Xmpp::Namespaces::MucUser}).first
         end
 
@@ -752,6 +1140,9 @@ end
       class Message < Bit
         include Contexts::Message
       end
+      class Attention < Bit
+        include Contexts::Attention
+      end
       class Iq < Bit
         include Contexts::Iq
       end
@@ -797,6 +1188,21 @@ end
       class Streaminitiation < Bit
         include Contexts::Streaminitiation
       end
+      class Bob < Bit
+        include Contexts::Bob
+      end
+      class Ibb < Bit
+        include Contexts::Ibb
+      end
+      class Pubsub < Bit
+        include Contexts::Pubsub
+      end
+      class Pubsubowner < Bit
+        include Contexts::Pubsubowner
+      end
+      class Pubsubevent < Bit
+        include Contexts::Pubsubevent
+      end
       class Mucuser < Bit
         include Contexts::Mucuser
       end