xmpp4r 0.3.2 → 0.4

data/lib/xmpp4r/rpc/helper/client.rb

@@ -33,6 +33,14 @@ module Jabber
         @create = XMLRPC::Create.new
       end
 
+      ##
+      # automatically trys to find a method
+      # thanx to eric cestari  :)
+      def method_missing(methodname, *args)
+        send("call", methodname,*args)
+      end
+
+
       def call(method, *args)
         ok, param = call2(method, *args)
         if ok
@@ -75,14 +83,11 @@ module Jabber
         rpcquery.typed_add(xmlrpc)
 
         result = nil
-        @stream.send_with_id(iq) { |iqreply|
-          if iqreply.type == :result and iqreply.query.kind_of?(IqQueryRPC)
+        @stream.send_with_id(iq) do |iqreply|
+          if iqreply.query.kind_of?(IqQueryRPC)
             result = iqreply.query.to_s
-            true
-          else
-            false
           end
-        }
+        end
 
         result
       end
@@ -91,7 +96,12 @@ module Jabber
 
       def gen_multicall(methods=[])
         ok, params = call2("system.multicall",
-          methods.collect { |m| {'methodName' => m[0], 'params' => m[1..-1]} }
+          methods.collect { |m|
+            {
+              'methodName' => m[0],
+              'params' => m[1..-1]
+            }
+          }
         )
 
         if ok
@@ -111,4 +121,3 @@ module Jabber
     end
   end  # Helpers
 end   # Jabber
-

data/lib/xmpp4r/rpc/helper/server.rb

@@ -64,7 +64,7 @@ module Jabber
       def handle_rpc_requests(rpcdata)
         resp = process(rpcdata.to_s)
         if resp == nil or resp.size <= 0
-          raise Jabber::Error.new(:forbidden)
+          raise Jabber::ErrorResponse.new(:forbidden)
         else
           return resp
         end
@@ -72,4 +72,3 @@ module Jabber
     end # RPCServer
   end  # Helpers
 end   # Jabber
-

data/lib/xmpp4r/rpc/helper/xmlrpcaddons.rb

@@ -6,6 +6,11 @@ require "xmlrpc/utils"     # ParserWriterChooseMixin
 
 module XMLRPC
   class Create
+
+    # Avoids warnings
+    remove_method(:methodCall)
+    remove_method(:methodResponse)
+
     ##
     # create a Method Call
     # name:: [String] name of the method
@@ -38,11 +43,16 @@ module XMLRPC
     def methodResponse(is_ret, *params)
 
       if is_ret
-        resp = params.collect do |param|
-          @writer.ele("param", conv2value(param))
-        end
+        begin
+          resp = params.collect do |param|
+            @writer.ele("param", conv2value(param))
+          end
 
-        resp = [@writer.ele("params", *resp)]
+          resp = [@writer.ele("params", *resp)]
+        rescue Exception => e
+          error = XMLRPC::FaultException.new(XMLRPC::BasicServer::ERR_UNCAUGHT_EXCEPTION, "Uncaught exception '#{e.message}' serialising params into response")
+          resp = @writer.ele("fault", conv2value(error.to_h))
+        end
       else
         if params.size != 1 or params[0] === XMLRPC::FaultException
           raise ArgumentError, "no valid fault-structure given"

data/lib/xmpp4r/rpc/iq/rpc.rb

@@ -21,4 +21,3 @@ module Jabber
     end
   end
 end
-

data/lib/xmpp4r/sasl.rb

@@ -2,8 +2,8 @@
 # License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
 # Website::http://home.gna.org/xmpp4r/
 
-require 'base64'
 require 'digest/md5'
+require 'xmpp4r/base64'
 
 module Jabber
   ##
@@ -16,12 +16,14 @@ module Jabber
 
     ##
     # Factory function to obtain a SASL helper for the specified mechanism
-    def SASL::new(stream, mechanism)
+    def SASL.new(stream, mechanism)
       case mechanism
         when 'DIGEST-MD5'
           DigestMD5.new(stream)
         when 'PLAIN'
           Plain.new(stream)
+        when 'ANONYMOUS'
+          Anonymous.new(stream)
         else
           raise "Unknown SASL mechanism: #{mechanism}"
       end
@@ -63,7 +65,26 @@ module Jabber
           end
           true
         }
-        
+
+        raise error if error
+      end
+    end
+
+    ##
+    # SASL Anonymous authentication helper
+    class Anonymous < Base
+      ##
+      # Authenticate by sending nothing with the ANONYMOUS token
+      def auth(password)
+        auth_text = "#{@stream.jid.node}"
+        error = nil
+        @stream.send(generate_auth('ANONYMOUS', Base64::encode64(auth_text).gsub(/\s/, ''))) { |reply|
+          if reply.name != 'success'
+            error = reply.first_element(nil).name
+          end
+          true
+        }
+
         raise error if error
       end
     end
@@ -175,7 +196,7 @@ module Jabber
           end
           true
         }
-        
+
         return if success_already
         raise error if error
 
@@ -188,7 +209,7 @@ module Jabber
           end
           true
         }
-        
+
         raise error if error
       end
 
@@ -200,7 +221,7 @@ module Jabber
       ##
       # Function from RFC2831
       def hh(s); Digest::MD5.hexdigest(s); end
-      
+
       ##
       # Calculate the value for the response field
       def response_value(username, realm, digest_uri, passwd, nonce, cnonce, qop)

data/lib/xmpp4r/stream.rb

@@ -10,7 +10,6 @@ require 'xmpp4r/streamparser'
 require 'xmpp4r/presence'
 require 'xmpp4r/message'
 require 'xmpp4r/iq'
-require 'xmpp4r/errorexception'
 require 'xmpp4r/debuglog'
 require 'xmpp4r/idgenerator'
 
@@ -37,19 +36,15 @@ module Jabber
     attr_reader :status
 
     ##
-    # Create a new stream
-    # (just initializes)
-    def initialize(threaded = true)
-      unless threaded
-        raise "Non-threaded mode was removed from XMPP4R."
-      end
+    # Initialize a new stream
+    def initialize
       @fd = nil
       @status = DISCONNECTED
-      @xmlcbs = CallbackList::new
-      @stanzacbs = CallbackList::new
-      @messagecbs = CallbackList::new
-      @iqcbs = CallbackList::new
-      @presencecbs = CallbackList::new
+      @xmlcbs = CallbackList.new
+      @stanzacbs = CallbackList.new
+      @messagecbs = CallbackList.new
+      @iqcbs = CallbackList.new
+      @presencecbs = CallbackList.new
       @send_lock = Mutex.new
       @last_send = Time.now
       @exception_block = nil
@@ -90,10 +85,7 @@ module Jabber
               @exception_block.call(e, self, :start)
             end
           else
-            if Jabber::debug
-              puts "Exception caught in Parser thread! (#{e.class})"
-              puts e.backtrace
-            end
+            Jabber::debuglog "Exception caught in Parser thread! (#{e.class})\n#{e.backtrace.join("\n")}"
             close!
             raise
           end
@@ -109,7 +101,7 @@ module Jabber
     end
 
     ##
-    # Mounts a block to handle exceptions if they occur during the 
+    # Mounts a block to handle exceptions if they occur during the
     # poll send.  This will likely be the first indication that
     # the socket dropped in a Jabber Session.
     #
@@ -136,9 +128,8 @@ module Jabber
           @exception_block.call(e, self, :parser)
         end
       else
-        puts "Stream#parse_failure was called by XML parser. Dumping " +
-        "backtrace...\n" + e.exception + "\n"
-        puts e.backtrace
+        Jabber::debuglog "Stream#parse_failure was called by XML parser. Dumping " +
+          "backtrace...\n" + e.exception + "\n#{e.backtrace.join("\n")}"
         close
         raise
       end
@@ -174,7 +165,7 @@ module Jabber
     end
 
     ##
-    # Processes a received REXML::Element and executes 
+    # Processes a received REXML::Element and executes
     # registered thread blocks and filters against it.
     #
     # element:: [REXML::Element] The received element
@@ -201,7 +192,7 @@ module Jabber
 
             unless element.attributes['version']  # isn't XMPP compliant, so
               Jabber::debuglog("FEATURES: server not XMPP compliant, will not wait for features")
-              @features_sem.run                   # don't wait for <stream:features/> 
+              @features_sem.run                   # don't wait for <stream:features/>
             end
           when 'features'
             stanza = element
@@ -335,10 +326,7 @@ module Jabber
             @exception_block.call(e, self, :sending)
           end
         else
-          if Jabber::debug
-            puts "Exception caught while sending! (#{e.class})"
-            puts e.backtrace
-          end
+          Jabber::debuglog "Exception caught while sending! (#{e.class})\n#{e.backtrace.join("\n")}"
           close!
           raise
         end
@@ -359,10 +347,14 @@ module Jabber
     # The block will be called once: when receiving a stanza with the
     # same Jabber::XMPPStanza#id. There is no need to return true to
     # complete this! Instead the return value of the block will be
-    # returned.
+    # returned. This is a direct result of unique request/response
+    # stanza identification via the id attribute.
+    #
+    # The block may be omitted. Then, the result will be the response
+    # stanza.
     #
     # Be aware that if a stanza with <tt>type='error'</tt> is received
-    # the function does not yield but raises an ErrorException with
+    # the function does not yield but raises an ServerError with
     # the corresponding error element.
     #
     # Please see Stream#send for some implementational details.
@@ -379,11 +371,14 @@ module Jabber
       send(xml) do |received|
         if received.kind_of? XMPPStanza and received.id == xml.id
           if received.type == :error
-            error = (received.error ? received.error : Error.new)
+            error = (received.error ? received.error : ErrorResponse.new)
             true
-          else
+          elsif block_given?
             res = yield(received)
             true
+          else
+            res = received
+            true
           end
         else
           false
@@ -391,7 +386,7 @@ module Jabber
       end
 
       unless error.nil?
-        raise ErrorException.new(error)
+        raise ServerError.new(error)
       end
 
       res
@@ -399,9 +394,9 @@ module Jabber
 
     ##
     # Adds a callback block to process received XML messages
-    # 
+    #
     # priority:: [Integer] The callback's priority, the higher, the sooner
-    # ref:: [String] The callback's reference 
+    # ref:: [String] The callback's reference
     # &block:: [Block] The optional block
     def add_xml_callback(priority = 0, ref = nil, &block)
       @xmlcbs.add(priority, ref, block)
@@ -417,9 +412,9 @@ module Jabber
 
     ##
     # Adds a callback block to process received Messages
-    # 
+    #
     # priority:: [Integer] The callback's priority, the higher, the sooner
-    # ref:: [String] The callback's reference 
+    # ref:: [String] The callback's reference
     # &block:: [Block] The optional block
     def add_message_callback(priority = 0, ref = nil, &block)
       @messagecbs.add(priority, ref, block)
@@ -435,9 +430,9 @@ module Jabber
 
     ##
     # Adds a callback block to process received Stanzas
-    # 
+    #
     # priority:: [Integer] The callback's priority, the higher, the sooner
-    # ref:: [String] The callback's reference 
+    # ref:: [String] The callback's reference
     # &block:: [Block] The optional block
     def add_stanza_callback(priority = 0, ref = nil, &block)
       @stanzacbs.add(priority, ref, block)
@@ -450,12 +445,12 @@ module Jabber
     def delete_stanza_callback(ref)
       @stanzacbs.delete(ref)
     end
-    
+
     ##
-    # Adds a callback block to process received Presences 
-    # 
+    # Adds a callback block to process received Presences
+    #
     # priority:: [Integer] The callback's priority, the higher, the sooner
-    # ref:: [String] The callback's reference 
+    # ref:: [String] The callback's reference
     # &block:: [Block] The optional block
     def add_presence_callback(priority = 0, ref = nil, &block)
       @presencecbs.add(priority, ref, block)
@@ -468,12 +463,12 @@ module Jabber
     def delete_presence_callback(ref)
       @presencecbs.delete(ref)
     end
-    
+
     ##
     # Adds a callback block to process received Iqs
-    # 
+    #
     # priority:: [Integer] The callback's priority, the higher, the sooner
-    # ref:: [String] The callback's reference 
+    # ref:: [String] The callback's reference
     # &block:: [Block] The optional block
     def add_iq_callback(priority = 0, ref = nil, &block)
       @iqcbs.add(priority, ref, block)

data/lib/xmpp4r/streamparser.rb

@@ -36,10 +36,10 @@ module Jabber
     def parse
       @started = false
       begin
-        parser = REXML::Parsers::SAX2Parser.new @stream 
+        parser = REXML::Parsers::SAX2Parser.new @stream
 
         parser.listen( :start_element ) do |uri, localname, qname, attributes|
-          e = REXML::Element::new(qname)
+          e = REXML::Element.new(qname)
           e.add_attributes attributes
           @current = @current.nil? ? e : @current.add_element(e)
 
@@ -61,11 +61,11 @@ module Jabber
         end
 
         parser.listen( :characters ) do | text |
-          @current.text = @current.text.to_s + text if @current
+          @current.add(REXML::Text.new(text.to_s, @current.whitespace, nil, true)) if @current
         end
 
         parser.listen( :cdata ) do | text |
-          raise "Not implemented !"
+          @current.add(REXML::CData.new(text)) if @current
         end
 
         parser.parse

data/lib/xmpp4r/tune.rb

@@ -0,0 +1,2 @@
+require 'xmpp4r/tune/tune'
+require 'xmpp4r/tune/helper/helper'

data/lib/xmpp4r/tune/helper/helper.rb

@@ -0,0 +1,58 @@
+# =XMPP4R - XMPP Library for Ruby
+# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
+# Website::http://home.gna.org/xmpp4r/
+
+require 'xmpp4r'
+require 'xmpp4r/pubsub'
+require 'xmpp4r/tune/tune'
+
+module Jabber
+  module UserTune
+    ##
+    # A Helper for XEP-0118 User Tune
+    #
+    # Use this helper to send user tunes, or receive them from a
+    # specified jid. Described at http://www.xmpp.org/extensions/xep-0118.html
+    #
+    # For example:
+    # <pre>
+    # h = UserTune::Helper( @client, 'radio1@hug.hellomatty.com' )
+    # h.add_usertune_callback do |tune|
+    #   puts "Now playing: #{tune.title} by #{tune.artist}"
+    # end
+    # </pre>
+    #
+    # Also see the examples provided.
+    class Helper < PubSub::ServiceHelper
+      ##
+      # Send out the tune currently playing.
+      #
+      # track:: [Jabber::UserTune::Tune] the tune currently playing
+      def now_playing(track)
+        item = Jabber::PubSub::Item.new()
+        item.add(track)
+
+        publish_item_to(NS_USERTUNE, item)
+      end
+
+      ##
+      # Use this method to indicate that you have stopped playing
+      # a tune.
+      def stop_playing
+        now_playing(Jabber::UserTune::Tune.new())
+      end
+
+      ##
+      # Add a callback that will be invoked when a tune is received
+      # from the jid specified when you constructed the Helper.
+      def add_usertune_callback(prio = 200, ref = nil, &block)
+        add_event_callback(prio, ref) do |event|
+          tune = event.first_element('items/item/tune')
+          if tune
+            block.call(tune)
+          end
+        end
+      end
+    end
+  end
+end