blather 0.4.14 → 0.4.15

data/lib/blather/stanza/iq/vcard.rb

@@ -0,0 +1,147 @@
+module Blather
+class Stanza
+class Iq
+
+  # # Vcard Stanza
+  #
+  # [XEP-0054 vcard-temp](http://xmpp.org/extensions/xep-0054.html)
+  #
+  # This is a base class for any vcard based Iq stanzas. It provides a base set
+  # of methods for working with vcard stanzas
+  #
+  # @example Retrieving One's vCard
+  #     iq = Blather::Stanza::Iq::Vcard.new :get
+  #     client.write_with_handler iq do |response|
+  #       puts response.vcard
+  #     end
+  #
+  # @example Updating One's vCard
+  #     iq = Blather::Stanza::Iq::Vcard.new :set
+  #     iq.vcard['NICKNAME'] = 'Romeo'
+  #     client.write_with_handler iq do |response|
+  #       puts response
+  #     end
+  #
+  # @example Viewing Another User's vCard
+  #     iq = Blather::Stanza::Iq::Vcard.new :get, 'mercutio@example.org'
+  #     client.write_with_handler iq do |response|
+  #       puts response.vcard
+  #     end
+  #
+  # @handler :vcard
+  class Vcard < Iq
+
+    register :vcard, :vCard, 'vcard-temp'
+
+    # Overrides the parent method to ensure a vcard node is created
+    #
+    # @see Blather::Stanza::Iq.new
+    def self.new(type = nil, to = nil, id = nil)
+      node = super
+      node.vcard
+      node
+    end
+
+    # Overrides the parent method to ensure the current vcard node is destroyed
+    #
+    # @see Blather::Stanza::Iq#inherit
+    def inherit(node)
+      vcard.remove
+      super
+      self
+    end
+
+    # Find or create vcard node
+    #
+    # @return [Vcard::Vcard]
+    def vcard
+      Vcard.find_or_create self
+    end
+
+    # Replaces vcard node
+    #
+    # @param [Vcard::Vcard, XML::Node] info the stanza's new vcard node
+    #
+    # @return [Vcard::Vcard]
+    def vcard=(info)
+      vcard.remove
+      self << info
+      Vcard.find_or_create self
+    end
+
+    class Vcard < XMPPNode
+
+      VCARD_NS = 'vcard-temp'
+
+      # Create a new Vcard::Vcard object
+      #
+      # @param [XML::Node, nil] node a node to inherit from
+      #
+      # @return [Vcard::Vcard]
+      def self.new(node = nil)
+        new_node = super :vCard
+        new_node.namespace = VCARD_NS
+        new_node.inherit node if node
+        new_node
+      end
+
+      # Find or create vCard node in Vcard Iq and converts it to Vcard::Vcard
+      #
+      # @param [Vcard] parent a Vcard Iq where to find or create vCard
+      #
+      # @return [Vcard::Vcard]
+      def self.find_or_create(parent)
+        if found_vcard = parent.find_first('//ns:vCard', :ns => VCARD_NS)
+          vcard = self.new found_vcard
+          found_vcard.remove
+        else
+          vcard = self.new
+        end
+        parent << vcard
+
+        vcard
+      end
+
+      # Find the element's value by name
+      #
+      # @param [String] name the name of the element
+      #
+      # @return [String, nil]
+      def [](name)
+        name = name.split("/").map{|child| "ns:#{child}"}.join("/")
+
+        if elem = find_first(name, :ns => VCARD_NS)
+          elem.content
+        else
+          nil
+        end
+      end
+
+      # Set the element's value
+      #
+      # @param [String] name the name of the element
+      # @param [String, nil] value the new value of element
+      #
+      # @return [String, nil]
+      def []=(name, value)
+        elem = nil
+        parent = self
+
+        name.split("/").each do |child|
+          elem = parent.find_first("ns:#{child}", :ns => VCARD_NS)
+          unless elem
+            elem = XMPPNode.new(child, parent.document)
+            parent << elem
+            parent = elem
+          else
+            parent = elem
+          end
+        end
+
+        elem.content = value
+      end
+    end
+  end
+end
+end
+end

data/lib/blather/stanza/message.rb

@@ -175,7 +175,7 @@ class Stanza
         klass = class_from_registration(e.element_name, ns)
       end
 
-      if klass && klass != self && klass != Blather::Stanza::X
+      if klass && klass != self && ![Blather::Stanza::X, Blather::Stanza::Iq].include?(klass)
         klass.import(node)
       else
         new(node[:type]).inherit(node)
@@ -196,6 +196,14 @@ class Stanza
       node
     end
 
+    # Overrides the parent method to ensure the current chat state is removed
+    #
+    # @see Blather::Stanza::Iq#inherit
+    def inherit(node)
+      xpath('ns:*', :ns => CHAT_STATE_NS).remove
+      super
+    end
+
     # Check if the Message is of type :chat
     #
     # @return [true, false]
@@ -260,7 +268,7 @@ class Stanza
     #
     # @return [XML::Node]
     def xhtml_node
-      unless h = find_first('ns:html', :ns => HTML_NS)
+      unless h = find_first('ns:html', :ns => HTML_NS) || find_first('ns:html', :ns => HTML_BODY_NS)
         self << (h = XMPPNode.new('html', self.document))
         h.namespace = HTML_NS
       end

data/lib/blather/stanza/presence/status.rb

@@ -193,8 +193,9 @@ class Presence
       set_content_for :status, message
     end
 
-    # Compare status based on priority
-    # raises an error if the JIDs aren't the same
+    # Compare status based on priority and state:
+    # unavailable status is always less valuable than others
+    # Raises an error if the JIDs aren't the same
     #
     # @param [Blather::Stanza::Presence::Status] o
     # @return [true,false]
@@ -202,7 +203,14 @@ class Presence
       unless self.from && o.from && self.from.stripped == o.from.stripped
         raise ArgumentError, "Cannot compare status from different JIDs: #{[self.from, o.from].inspect}"
       end
-      self.priority <=> o.priority
+
+      if (self.type.nil? && o.type.nil?) || (!self.type.nil? && !o.type.nil?)
+        self.priority <=> o.priority
+      elsif self.type.nil? && !o.type.nil?
+        1
+      elsif !self.type.nil? && o.type.nil?
+        -1
+      end
     end
 
   end #Status

data/lib/blather/stanza/pubsub.rb

@@ -92,9 +92,11 @@ class Stanza
       write_attr :id, id
     end
 
+    alias_method :payload_node, :child
+
     # Get the item's payload
     #
-    # @return [String, XMPPNode, nil]
+    # @return [String, nil]
     def payload
       children.empty? ? nil : children.to_s
     end

data/lib/blather/stanza/pubsub/event.rb

@@ -116,6 +116,24 @@ class PubSub
         n.content
       end
     end
+
+    # Check if this is a subscription stanza
+    #
+    # @return [XML::Node, nil]
+    def subscription?
+      subscription_node
+    end
+
+    # Get the actual subscription node
+    #
+    # @return [Blather::XMPPNode]
+    def subscription_node
+      event_node.find_first('//ns:subscription', :ns => self.class.registered_ns)
+    end
+
+    def subscription
+      subscription_node
+    end
   end  # Event
 
 end  # PubSub

data/lib/blather/stanza/pubsub/subscriptions.rb

@@ -58,7 +58,7 @@ class PubSub
     # Get a hash of subscriptions
     #
     # @example
-    #   { :subscribed => [{:node => 'node1', :jid => 'francisco@denmark.lit'}, {:node => 'node2', :jid => 'francisco@denmark.lit'}],
+    #   { :subscribed => [{:node => 'node1', :jid => 'francisco@denmark.lit', :subid => 'fd8237yr872h3f289j2'}, {:node => 'node2', :jid => 'francisco@denmark.lit', :subid => 'h8394hf8923ju'}],
     #     :unconfigured => [{:node => 'node3', :jid => 'francisco@denmark.lit'}],
     #     :pending => [{:node => 'node4', :jid => 'francisco@denmark.lit'}],
     #     :none => [{:node => 'node5', :jid => 'francisco@denmark.lit'}] }
@@ -67,10 +67,12 @@ class PubSub
     def list
       subscriptions.find('//ns:subscription', :ns => self.class.registered_ns).inject({}) do |hash, item|
         hash[item[:subscription].to_sym] ||= []
-        hash[item[:subscription].to_sym] << {
+        sub = {
           :node => item[:node],
           :jid => item[:jid]
         }
+        sub[:subid] = item[:subid] if item[:subid]
+        hash[item[:subscription].to_sym] << sub
         hash
       end
     end

data/lib/blather/stanza/pubsub/unsubscribe.rb

@@ -16,10 +16,12 @@ class PubSub
     # @param [String] host the host to send the request to
     # @param [String] node the node to unsubscribe from
     # @param [Blather::JID, #to_s] jid the JID of the unsubscription
-    def self.new(type = :set, host = nil, node = nil, jid = nil)
+    # @param [String] subid the subscription ID of the unsubscription
+    def self.new(type = :set, host = nil, node = nil, jid = nil, subid = nil)
       new_node = super(type, host)
       new_node.node = node
       new_node.jid = jid
+      new_node.subid = subid
       new_node
     end
 
@@ -51,6 +53,20 @@ class PubSub
       unsubscribe[:node] = node
     end
 
+    # Get the subscription ID to unsubscribe from
+    #
+    # @return [String]
+    def subid
+      unsubscribe[:subid]
+    end
+
+    # Set the subscription ID to unsubscribe from
+    #
+    # @param [String] node
+    def subid=(subid)
+      unsubscribe[:subid] = subid
+    end
+
     # Get or create the actual unsubscribe node
     #
     # @return [Blather::XMPPNode]

data/lib/blather/stanza/x.rb

@@ -150,6 +150,7 @@ class Stanza
     end
 
     class Field < XMPPNode
+      register :field, 'jabber:x:data'
       VALID_TYPES = [:boolean, :fixed, :hidden, :"jid-multi", :"jid-single", :"list-multi", :"list-single", :"text-multi", :"text-private", :"text-single"].freeze
 
       # Create a new X Field
@@ -292,7 +293,11 @@ class Stanza
       #
       # @param [true, false]
       def required?
-        !self.find_first('required').nil?
+        if self.namespace
+          !self.find_first('ns:required', :ns => self.namespace.href).nil?
+        else
+          !self.find_first('required').nil?
+        end
       end
 
       # Set the field's required flag
@@ -307,7 +312,11 @@ class Stanza
       #
       # @return [Blather::Stanza::X::Field::Option]
       def options
-        self.find(:option).map { |f| Option.new(f) }
+        if self.namespace
+          self.find('ns:option', :ns => self.namespace.href)
+        else
+          self.find('option')
+        end.map { |f| Option.new(f) }
       end
 
       # Add an array of options to field
@@ -329,6 +338,7 @@ class Stanza
       alias_method :==, :eql?
 
       class Option < XMPPNode
+        register :option, 'jabber:x:data'
         # Create a new X Field Option
         # @overload new(node)
         #   Imports the XML::Node to create a Field option object

data/lib/blather/stream/parser.rb

@@ -16,6 +16,7 @@ class Stream # :nodoc:
       @namespaces = {}
       @namespace_definitions = []
       @parser = Nokogiri::XML::SAX::PushParser.new self
+      @parser.options = Nokogiri::XML::ParseOptions::DEFAULT_XML | Nokogiri::XML::ParseOptions::NOENT
     end
 
     def receive_data(string)

data/lib/test.rb

@@ -0,0 +1,55 @@
+require "blather/client/client"
+require "openssl"
+require "em-http"
+require "cgi"
+
+module S3FileReceiver
+  def initialize(iq)
+    p "initialize"
+    @filename = iq.si.file["name"]
+    @size = iq.si.file["size"].to_i
+  end
+  
+  def post_init
+    p "post_init"
+    time = Time.now.httpdate
+    sign = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), "qHG5ywFiZR2EK7oUvLVLhGHr2Rp05ggriTdExw0I", "PUT\n\n\n#{time}\n/jaconda-dev/#{CGI::escape(@filename)}")).strip
+    @s3 = EM::HttpRequest.new("https://jaconda-dev.s3.amazonaws.com:443/#{CGI::escape(@filename)}").put({:timeout => 10, :head => {'date' => time, 'url' => "/jaconda-dev/#{CGI::escape(@filename)}", 'Content-Length' => @size, "Authorization" => "AWS AKIAIVULGEHUOR7PIR4Q:#{sign}"}})
+    @s3.errback do |e|
+      p "error: #{e.response_header.inspect}"
+    end
+    @s3.callback do |s|
+      p "success: #{s.response.inspect}"
+    end
+    EM::enable_proxy(self, @s3)
+  end
+  
+  def proxy_target_unbound
+    close_connection_after_writing
+  end
+end
+
+EM.run do
+  Blather.logger = Logger.new("/Users/antonmironov/Desktop/blather.log")
+  Blather.logger.level = Logger::DEBUG
+
+  im = Blather::Client.setup "ant.mironov@jabber.ru/test", "zzzxxx"
+
+  im.register_handler :disco_info, :type => :get do |iq|
+    answer = iq.reply
+    answer.identities = [{:type => 'pc', :category => 'client'}]
+    answer.features = ["http://jabber.org/protocol/si/profile/file-transfer", "http://jabber.org/protocol/si", "http://jabber.org/protocol/bytestreams", "http://jabber.org/protocol/ibb"]
+
+    im.write answer
+  end
+
+  im.register_handler :file_transfer do |iq|
+    transfer = Blather::FileTransfer.new(im, iq)
+#    transfer.allow_bytestreams = false
+
+    transfer.accept(S3FileReceiver, iq)
+
+    true
+  end
+  im.connect
+end

data/spec/blather/client/client_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.expand_path "../../../spec_helper", __FILE__
 require 'blather/client/client'
 
 describe Blather::Client do
@@ -81,7 +81,7 @@ describe Blather::Client do
     disconnected = mock()
     disconnected.expects(:call)
     @client.register_handler(:disconnected) { disconnected.call }
-    @client.unbind    
+    @client.unbind
   end
 
   it 'does not call EM.stop on #unbind if a handler returns positive' do
@@ -175,6 +175,20 @@ describe Blather::Client do
     @client.register_handler(:iq) { |_| response.iq }
     @client.receive_data stanza
   end
+
+  it 'can clear handlers' do
+    stanza = Blather::Stanza::Message.new
+    stanza.expects(:chat?).returns true
+
+    response = mock
+    response.expects(:call).once
+
+    @client.register_handler(:message, :chat?) { |_| response.call }
+    @client.receive_data stanza
+
+    @client.clear_handlers(:message, :chat?)
+    @client.receive_data stanza
+  end
 end
 
 describe 'Blather::Client#write' do
@@ -309,7 +323,7 @@ describe 'Blather::Client with a Component stream' do
     class MockComponent < Blather::Stream::Component; def initialize(); end; end
     @stream = MockComponent.new('')
     @stream.stubs(:send_data)
-    @client = Blather::Client.new 
+    @client = Blather::Client.new
     @client.setup('me.com', 'secret')
   end
 
@@ -325,7 +339,7 @@ describe 'Blather::Client with a Client stream' do
   before do
     class MockClientStream < Blather::Stream::Client; def initialize(); end; end
     @stream = MockClientStream.new('')
-    @client = Blather::Client.new 
+    @client = Blather::Client.new
     Blather::Stream::Client.stubs(:start).returns @stream
     @client.setup('me@me.com', 'secret').run
   end