xmpp4r 0.5 → 0.5.5

data/CHANGELOG

@@ -1,3 +1,24 @@
+mad-p-xmpp4r 0.6.3 (02/03/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.
+  - Added Semaphore to wait for auth and bind response.
+  - Hook to setup SSL flags (certificate, etc.)
+  - Adjusted HTTP::Net read_timeout according to http_wait.
+  - Proxy handling.
+  - Respect poll/request BOSH parameters to avoid overactivity.
+
 XMPP4R 0.5 (15/06/2009)
 =======================
 * Many bugs fixed and tests cleanups (better Ruby 1.9 support, in

data/README.rdoc

@@ -1,20 +1,22 @@
 = XMPP4R
 
+A XMPP/Jabber library for ruby
+
+
 == Project Home
 
 You can find info about the xmpp4r project and how to contribute
 at the project home page:
 
-http://home.gna.org/xmpp4r/
+http://xmpp4r.github.io
 
 If you need to ask questions, or want feedback on proposed changes
-please feel free to ask them on the 'xmpp4r-devel@gna.org' mailing
-list.  You can join or view archives of the mailing list at:
+please feel free to ask them on the github issues tracker. 
 
-https://gna.org/mail/?group=xmpp4r
+https://github.com/xmpp4r/xmpp4r/issues
 
 If you are having a problem and would like to report it
-to the mailing list please include a protocol dump
+please include a protocol dump
 which can be enabled in your code with:
 
   Jabber::debug = true
@@ -22,24 +24,14 @@ which can be enabled in your code with:
 
 == Contributors
 
-  Lucas Nussbaum <lucas@lucas-nussbaum.net>
-  Stephan Maka <stephan@spaceboyz.net>
-  Kirill A. Shutemov <k.shutemov@gmail.com>
-  Glenn Rempe <glenn@rempe.us>
-  Jacob Burkhart <jacob@brontes3d.com>
-  Yuki Mitsui
-  Peter Schrammel
-  Olli
-  Vojtech Vobr
-  Andreas Wiese
-  Chris Zelenak
-  Matthew Wood
-  Sam Ruby
-  Tim Carey-Smith
-  Scott Lillibridge
-  Joshua Sierles
-  Ripta Pasay <github@r8y.org>
-  Seth Fitzsimmons
+=== Present Maintainers
+
+  Harisankar P S (hsps@rubykitchen.org)
+  Manu S Ajith (manu@rubykitchen.org)
+
+=== List of Contributors
+  
+http://github.com/xmpp4r/xmpp4r/contributors
 
 
 == Source Code
@@ -47,7 +39,7 @@ which can be enabled in your code with:
 The source for xmpp4r is managed using the Git SCM and can be
 found in our GitHub.com project page:
 
-http://github.com/ln/xmpp4r/tree/master
+http://github.com/xmpp4r/xmpp4r/tree/master
 
 
 == Installation
@@ -57,17 +49,10 @@ on your needs and the methods you prefer.
 
 === Install over the network using RubyGems
 
-You can install the current release of the xmpp4r library from a stable
-release gem on RubyForge using RubyGems:
+You can install the current release of the xmpp4r library via rubygems:
 
   sudo gem install xmpp4r
 
-=== Install over the network using a Debian package
-
-You can install the current release of the xmpp4r library from a stable release copy
-on your .deb friendly linux system (e.g. Debian or Ubuntu) using apt:
-
-  sudo apt-get install libxmpp4r-ruby
 
 === Install from local source code (Developers Only)
 
@@ -77,15 +62,11 @@ need to get a local copy.
 
 Clone the Git repository (recommended):
 
-  git clone git://github.com/ln/xmpp4r.git
-
-OR download a stable release tarball from:
-
-  http://download.gna.org/xmpp4r/xmpp4r-0.3.2.tgz
+  git clone git://github.com/xmpp4r/xmpp4r.git
 
 OR download a snapshot of the latest source in .tar.gz format from:
 
-  http://github.com/ln/xmpp4r/tarball/master
+  http://github.com/xmpp4r/xmpp4r/tarball/master
 
 ==== Install : Using Rake
 
@@ -105,9 +86,19 @@ require RubyGems to be installed.
   ./setup.rb
 
 
+== Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
 == License
 
 XMPP4R is released under the Ruby license (see the LICENSE file), which is
 compatible with the GNU GPL (see the COPYING file) via an explicit
 dual-licensing clause.
 
+
+

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require "rake/clean"
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 $:.unshift 'lib'
 require "xmpp4r"
@@ -12,16 +12,16 @@ require "xmpp4r"
 
 PKG_NAME      = 'xmpp4r'
 PKG_VERSION   = Jabber::XMPP4R_VERSION
-AUTHORS       = ['Lucas Nussbaum', 'Stephan Maka', 'Glenn Rempe']
-EMAIL         = "xmpp4r-devel@gna.org"
-HOMEPAGE      = "http://home.gna.org/xmpp4r/"
-SUMMARY       = "XMPP4R is an XMPP/Jabber library for Ruby."
+AUTHORS       = ['Lucas Nussbaum', 'Stephan Maka', 'Glenn Rempe', 'Kaoru Maeda', 'Harisankar P S']
+EMAIL         = "mailme@hsps.in"
+HOMEPAGE      = "https://xmpp4r.github.io"
+SUMMARY       = "XMPP/Jabber library for ruby"
 
 # These are the common rdoc options that are shared between generation of
 # rdoc files using BOTH 'rake rdoc' and the installation by users of a
 # RubyGem version which builds rdoc's along with its installation.  Any
 # rdoc options that are ONLY for developers running 'rake rdoc' should be
-# added in the 'Rake::RDocTask' block below.
+# added in the 'RDoc::Task' block below.
 RDOC_OPTIONS  = [
                 "--quiet",
                 "--title", SUMMARY,
@@ -61,7 +61,7 @@ end
 
 # RDOC
 #######
-Rake::RDocTask.new do |rd|
+RDoc::Task.new do |rd|
 
   # which dir should rdoc files be installed in?
   rd.rdoc_dir = 'rdoc'
@@ -108,13 +108,6 @@ task :gen_requires_graph do
   sh %{cd tools; ./gen_requires.bash}
 end
 
-# UPDATE WEBSITE (for Lucas only)
-#################################
-desc "Update website (for Lucas only)"
-task :update_website do
-  sh %{cp website/* ~/dev/xmpp4r/website/ && cd ~/dev/xmpp4r/website/ && svn commit -m "website update"}
-end
-
 
 ##############################################################################
 # SYNTAX CHECKING
@@ -134,7 +127,7 @@ end
 CLEAN.include ["*.gem", "pkg", "rdoc", "coverage", "tools/*.png"]
 
 begin
-  require 'rake/gempackagetask'
+  require 'rubygems/package_task'
 
   spec = Gem::Specification.new do |s|
     s.name = PKG_NAME
@@ -156,7 +149,7 @@ begin
     s.required_ruby_version = ">= 1.8.4"
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.gem_spec = spec
     pkg.need_tar = true
     pkg.need_zip = true
@@ -182,14 +175,14 @@ begin
     # Thanks to the Merb project for this code.
     desc "Update Github Gemspec"
     task :update_gemspec do
-      skip_fields = %w(new_platform original_platform date)
+      skip_fields = %w(new_platform original_platform date cache_dir cache_file loaded)
 
       result = "# WARNING : RAKE AUTO-GENERATED FILE.  DO NOT MANUALLY EDIT!\n"
       result << "# RUN : 'rake gem:update_gemspec'\n\n"
       result << "Gem::Specification.new do |s|\n"
       spec.instance_variables.sort.each do |ivar|
         value = spec.instance_variable_get(ivar)
-        name  = ivar.split("@").last
+        name  = ivar.to_s.split("@").last
         next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?)
         if name == "dependencies"
           value.each do |d|

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

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'xmpp4r'
-require 'xmpp4r/helpers/filetransfer'
+require 'xmpp4r/bytestreams/helper/filetransfer'
 
+Jabber::debug = true
 
 if ARGV.size != 3
   puts "Usage: #{$0} <jid> <password> <incoming-directory>"
@@ -18,7 +19,7 @@ cl.connect
 puts "Authenticating..."
 cl.auth ARGV[1]
 
-ft = Jabber::Helpers::FileTransfer.new(cl)
+ft = Jabber::FileTransfer::Helper.new(cl)
 ft.add_incoming_callback { |iq,file|
   puts "Incoming file transfer from #{iq.from}: #{file.fname} (#{file.size / 1024} KB)"
 
@@ -40,7 +41,7 @@ ft.add_incoming_callback { |iq,file|
     begin
       puts "Accepting #{file.fname}"
       stream = ft.accept(iq, offset)
-      if stream.kind_of?(Jabber::Helpers::SOCKS5Bytestreams)
+      if stream.kind_of?(Jabber::Bytestreams::SOCKS5Bytestreams)
         stream.connect_timeout = 5
         stream.add_streamhost_callback { |streamhost,state,e|
           case state
@@ -58,7 +59,7 @@ ft.add_incoming_callback { |iq,file|
       if stream.accept
         puts "Stream established"
         outfile = File.new(filename, (offset ? 'a' : 'w'))
-        while buf = stream.read
+        while buf = stream.read(65536)
           outfile.write(buf)
           print '.'
           $stdout.flush

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

@@ -4,9 +4,11 @@
 
 require 'xmpp4r/callbacks'
 require 'xmpp4r/bytestreams/iq/si'
+require 'xmpp4r/bytestreams/iq/bytestreams'
 require 'xmpp4r/dataforms/x/data'
 require 'xmpp4r/bytestreams/helper/ibb/base'
 require 'xmpp4r/bytestreams/helper/socks5bytestreams/base'
+require 'xmpp4r/bytestreams/helper/socks5bytestreams/target'
 
 module Jabber
   module FileTransfer

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

@@ -8,6 +8,7 @@ require 'timeout'
 require 'digest/sha1'
 
 require 'xmpp4r/callbacks'
+require 'xmpp4r/bytestreams/helper/socks5bytestreams/socks5'
 
 module Jabber
   module Bytestreams

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

@@ -31,7 +31,7 @@ module Jabber
         elsif streamhost.kind_of?(String) or streamhost.kind_of?(JID)
           @streamhosts << SOCKS5Bytestreams::query_streamhost(@stream, streamhost, @initiator_jid)
         else
-          raise "Unknwon streamhost type: #{streamhost.class}"
+          raise "Unknown streamhost type: #{streamhost.class}"
         end
       end
 

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

@@ -26,10 +26,12 @@ module Jabber
       def accept
         error = nil
         connect_sem = Semaphore.new
+        iq_received_sem = Semaphore.new
 
         @stream.add_iq_callback(200, self) { |iq|
           if iq.type == :set and iq.from == @initiator_jid and iq.to == @target_jid and iq.query.kind_of?(IqQueryBytestreams)
             begin
+              iq_received_sem.run
               @stream.delete_iq_callback(self)
 
               iq.query.each_element('streamhost') { |streamhost|
@@ -66,7 +68,8 @@ module Jabber
         }
         @accept_ready.run
         begin
-          Timeout::timeout(@connect_timeout) { connect_sem.wait }
+          Timeout::timeout(@connect_timeout) { iq_received_sem.wait }
+          connect_sem.wait
         rescue Timeout::Error
           @stream.delete_iq_callback(self)
         end

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

@@ -43,7 +43,7 @@ module Jabber
           identity.send(field).to_s
         end.join('/') + '<'
       end.join
-
+      
       # 4. Sort the supported service discovery features. [15]
       features.sort! do |feature1,feature2|
         feature1.var <=> feature2.var
@@ -71,7 +71,7 @@ module Jabber
         # 7.1. Append the XML character data of the FORM_TYPE field's
         # <value/> element, followed by the '<' character.
         fform_type = form.field('FORM_TYPE')
-        form_type = fform_type ? fform_type.values.to_s : nil
+        form_type = fform_type ? fform_type.first_element_text('value') : nil
         s += "#{form_type}<"
 
         # 7.2. Sort the fields by the value of the "var" attribute.

data/lib/xmpp4r/client.rb

@@ -27,6 +27,7 @@ module Jabber
     def initialize(jid)
       super()
       @jid = (jid.kind_of?(JID) ? jid : JID.new(jid.to_s))
+      @authenticated = false
     end
 
     ##
@@ -113,6 +114,7 @@ module Jabber
         else
           auth_nonsasl(password)
         end
+        @authenticated = true
       rescue
         Jabber::debuglog("#{$!.class}: #{$!}\n#{$!.backtrace.join("\n")}")
         raise ClientAuthenticationFailure.new, $!.to_s
@@ -133,6 +135,7 @@ module Jabber
       end
 
       jid = nil
+      semaphore = Semaphore.new
       send_with_id(iq) do |reply|
         reply_bind = reply.first_element('bind')
         if reply_bind
@@ -141,7 +144,9 @@ module Jabber
             jid = JID.new(reported_jid.text)
           end
         end
+        semaphore.run
       end
+      semaphore.wait
       jid
     end
 
@@ -171,13 +176,13 @@ module Jabber
       sasl.auth(password)
 
       # Restart stream after SASL auth
-      stop
-      start
+      restart
       # And wait for features - again
       @features_sem.wait
 
       # Resource binding (RFC3920 - 7)
       if @stream_features.has_key? 'bind'
+        Jabber::debuglog("**********Handling bind")
         @jid = bind(@jid.resource)
       end
 
@@ -187,10 +192,19 @@ module Jabber
         session = iq.add REXML::Element.new('session')
         session.add_namespace @stream_features['session']
 
-        send_with_id(iq)
+        semaphore = Semaphore.new
+        send_with_id(iq) {
+          semaphore.run
+        }
+        semaphore.wait
       end
     end
 
+    def restart
+      stop
+      start
+    end
+
     ##
     # See Client#auth_anonymous_sasl
     def auth_anonymous
@@ -239,7 +253,7 @@ module Jabber
         authset = Iq.new_authset(@jid, password)
       end
       send_with_id(authset)
-      $defout.flush
+      $>.flush
 
       true
     end

data/lib/xmpp4r/connection.rb

@@ -19,8 +19,9 @@ module Jabber
     # before proceeding
     attr_accessor :features_timeout
 
-    # Keep-alive interval in seconds, defaults to 60
-    # (see private method keepalive_loop for implementation details)
+    # Keep-alive interval in seconds, or nil to disable keepalive,
+    # defaults to 60 (see private method keepalive_loop for
+    # implementation details)
     attr_accessor :keepalive_interval
 
     # Allow TLS negotiation? Defaults to true
@@ -78,9 +79,11 @@ module Jabber
 
       accept_features
 
-      @keepaliveThread = Thread.new do
-        Thread.current.abort_on_exception = true
-        keepalive_loop
+      unless @keepalive_interval.nil?
+        @keepaliveThread = Thread.new do
+          Thread.current.abort_on_exception = true
+          keepalive_loop
+        end
       end
     end