xmpp4r 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,15 +1,23 @@
-mad-p-xmpp4r 0.6.3 (02/03/2013)
+
+xmpp4r 0.5.6 (February 14th, 2013)
+====================================
+
+* [DOC] Wrong inline documentation in `client.rb`; details of port number parameter and removal of un-used 'use_ssl parameter'
+* Prevent REXML exceptions on UTF-8 messages
+* Fixed broken parse method
+* Make sure to open files in binary mode, in order to correctly transfer files on Windows
+* Prevent REXML exceptions on UTF-8 messages
+* Better control of history on muc.join
+
+
+xmpp4r 0.5.5 (October 6th, 2013)
 ===============================
 * Removed unnecessary dependency on pry.
 
-mad-p-xmpp4r 0.6.2 (26/02/2013)
-===============================
 * Merge pull request #1 from Strech/patch-1
   * Non-bosh connection flushes correctly
 * Elaborated debug messages in HTTPBinding::Client
 
-mad-p-xmpp4r 0.6.1 (21/02/2013)
-===============================
 * Modified to work with BOSH with HTTPBinding::Client
   - Support stream restart with urn:xmpp:xbosh way.
   - Removed unnecessary wait until authenticated.

data/README.rdoc

@@ -24,24 +24,15 @@ which can be enabled in your code with:
 
 == Contributors
 
-=== Present Maintainers
+=== Present Maintainer
 
   Harisankar P S (hsps@rubykitchen.org)
-  Manu S Ajith (manu@rubykitchen.org)
 
 === List of Contributors
   
 http://github.com/xmpp4r/xmpp4r/contributors
 
 
-== Source Code
-
-The source for xmpp4r is managed using the Git SCM and can be
-found in our GitHub.com project page:
-
-http://github.com/xmpp4r/xmpp4r/tree/master
-
-
 == Installation
 
 There are a number of ways that you can install xmpp4r depending
@@ -53,6 +44,7 @@ You can install the current release of the xmpp4r library via rubygems:
 
   sudo gem install xmpp4r
 
+The latest stable version is 0.5.6
 
 === Install from local source code (Developers Only)
 

data/Rakefile

@@ -14,7 +14,7 @@ PKG_NAME      = 'xmpp4r'
 PKG_VERSION   = Jabber::XMPP4R_VERSION
 AUTHORS       = ['Lucas Nussbaum', 'Stephan Maka', 'Glenn Rempe', 'Kaoru Maeda', 'Harisankar P S']
 EMAIL         = "mailme@hsps.in"
-HOMEPAGE      = "https://xmpp4r.github.io"
+HOMEPAGE      = "http://xmpp4r.github.io"
 SUMMARY       = "XMPP/Jabber library for ruby"
 
 # These are the common rdoc options that are shared between generation of

data/data/doc/xmpp4r/examples/advanced/recvfile.rb

@@ -58,7 +58,7 @@ ft.add_incoming_callback { |iq,file|
       puts "Waiting for stream configuration"
       if stream.accept
         puts "Stream established"
-        outfile = File.new(filename, (offset ? 'a' : 'w'))
+        outfile = File.new(filename, (offset ? 'ab' : 'wb'))
         while buf = stream.read(65536)
           outfile.write(buf)
           print '.'

data/data/doc/xmpp4r/examples/advanced/xmpping.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # =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/
+# Website::http://xmpp4r.github.io
 
 
 # This is PING for Jabber

data/data/doc/xmpp4r/examples/basic/client.rb

@@ -19,7 +19,7 @@ class BasicClient
     # main loop
     while not quit do
       print "> "
-      $defout.flush
+      $>.flush
       line = gets
       quit = true if line.nil?
       if not quit

data/lib/xmpp4r.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 #
 # ==Introduction
 #

data/lib/xmpp4r/base64.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 begin
   require 'base64'

data/lib/xmpp4r/bytestreams.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/bytestreams/iq/si.rb'
 require 'xmpp4r/bytestreams/iq/bytestreams.rb'

data/lib/xmpp4r/bytestreams/helper/filetransfer.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/callbacks'
 require 'xmpp4r/bytestreams/iq/si'
@@ -70,7 +70,7 @@ module Jabber
       include TransferSource
 
       def initialize(filename)
-        @file = File.new(filename)
+        @file = File.new(filename, "rb")
         @filename = filename
         @bytes_read = 0
         @length = nil

data/lib/xmpp4r/bytestreams/helper/ibb/base.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/base64'
 

data/lib/xmpp4r/bytestreams/helper/ibb/initiator.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/helper/ibb/target.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/base.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'socket'
 require 'thread'

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/initiator.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/server.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/socks5.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'socket'
 

data/lib/xmpp4r/bytestreams/helper/socks5bytestreams/target.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/iq/bytestreams.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   module Bytestreams

data/lib/xmpp4r/bytestreams/iq/si.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'time'  # For Time#xmlschema
 

data/lib/xmpp4r/callbacks.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 module Jabber
   ##

data/lib/xmpp4r/caps/c.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/xmppelement'
 

data/lib/xmpp4r/caps/helper/generator.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r'
 require 'xmpp4r/discovery'

data/lib/xmpp4r/caps/helper/helper.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r'
 require 'xmpp4r/discovery'

data/lib/xmpp4r/client.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'resolv'
 require 'xmpp4r/connection'
@@ -38,7 +38,7 @@ module Jabber
     # be resolved. If none works, fallback is connecting to the domain part
     # of the jid.
     # host:: [String] Optional c2s host, will be extracted from jid if nil
-    # use_ssl:: [Boolean] Optional. Use (old, deprecated) SSL when connecting.
+    # port:: [Fixnum] The server port (default: 5222)
     # return:: self
     def connect(host = nil, port = 5222)
       if host.nil?

data/lib/xmpp4r/component.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/connection'
 

data/lib/xmpp4r/connection.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 begin
   require 'openssl'
@@ -37,6 +37,15 @@ module Jabber
     #Defaults to false
     attr_accessor :use_ssl
 
+    class SSLSocketUTF8 < OpenSSL::SSL::SSLSocket
+      # #readline returns incorrect encodings for UTF8 strings
+      # because SSLSocket does not support encoding conversions
+      # This forces a correct encoding, and pervents REXML exceptions
+      def sysread *args
+        super.force_encoding ::Encoding::UTF_8
+      end
+    end
+
     ##
     # Create a new connection to the given host and port
     def initialize
@@ -68,7 +77,7 @@ module Jabber
 
       # We want to use the old and deprecated SSL protocol (usually on port 5223)
       if @use_ssl
-        ssl = OpenSSL::SSL::SSLSocket.new(@socket)
+        ssl = SSLSocketUTF8.new(@socket)
         ssl.connect # start SSL session
         ssl.sync_close = true
         Jabber::debuglog("SSL connection established.")
@@ -154,7 +163,7 @@ module Jabber
         ctx.verify_callback = @ssl_verifycb
 
         # SSL connection establishing
-        sslsocket = OpenSSL::SSL::SSLSocket.new(@socket, ctx)
+        sslsocket = SSLSocketUTF8.new(@socket, ctx)
         sslsocket.sync_close = true
         Jabber::debuglog("TLSv1: OpenSSL handshake in progress")
         sslsocket.connect

data/lib/xmpp4r/dataforms.rb

@@ -1,5 +1,5 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/dataforms/x/data.rb'

data/lib/xmpp4r/dataforms/x/data.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/x'
 require 'xmpp4r/jid'

data/lib/xmpp4r/debuglog.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'logger'
 

data/lib/xmpp4r/delay.rb

@@ -1,5 +1,5 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/delay/x/delay.rb'

data/lib/xmpp4r/delay/x/delay.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/x'
 require 'xmpp4r/jid'

data/lib/xmpp4r/discovery.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/discovery/iq/discoinfo'
 require 'xmpp4r/discovery/iq/discoitems'

data/lib/xmpp4r/discovery/helper/helper.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r'
 require 'xmpp4r/discovery'

data/lib/xmpp4r/discovery/helper/responder.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/iq'
 require 'xmpp4r/discovery/iq/discoinfo'

data/lib/xmpp4r/discovery/iq/discoinfo.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/query'
 

data/lib/xmpp4r/discovery/iq/discoitems.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/query'
 

data/lib/xmpp4r/entity_time.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/entity_time/iq'
 require 'xmpp4r/entity_time/responder'

data/lib/xmpp4r/entity_time/iq.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'time'
 

data/lib/xmpp4r/entity_time/responder.rb

@@ -1,6 +1,6 @@
 # =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/
+# Website::http://xmpp4r.github.io
 
 require 'xmpp4r/entity_time/iq'