mad-p-xmpp4r 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+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

data/lib/xmpp4r/client.rb

@@ -253,7 +253,7 @@ module Jabber
         authset = Iq.new_authset(@jid, password)
       end
       send_with_id(authset)
-      $defout.flush
+      $>.flush
 
       true
     end

data/lib/xmpp4r/httpbinding/client.rb

@@ -139,7 +139,7 @@ module Jabber
         end
         req_body.attributes['secure'] = 'true'
         req_body.attributes['xmlns'] = 'http://jabber.org/protocol/httpbind'
-        res_body = post(req_body)
+        res_body = post(req_body, "sid=new rid=#{@http_rid}")
         unless res_body.name == 'body'
           raise 'Response body is no <body/> element'
         end
@@ -192,7 +192,7 @@ module Jabber
           @pending_requests += 1
           @last_send = Time.now
         }
-        res_body = post(req_body)
+        res_body = post(req_body, "terminate sid=#{@http_sid} rid=#{@http_rid}")
         sleep(3)
         Jabber::debuglog("Connection closed")
       end
@@ -231,13 +231,13 @@ module Jabber
 
       ##
       # Do a POST request
-      def post(body)
+      def post(body, debug_info)
         body = body.to_s
         request = Net::HTTP::Post.new(@uri.path)
         request.content_length = body.size
         request.body = body
         request['Content-Type'] = @http_content_type
-        Jabber::debuglog("HTTP REQUEST (#{@pending_requests}/#{@http_requests}):\n#{request.body}")
+        Jabber::debuglog("HTTP REQUEST (#{@pending_requests}/#{@http_requests}) #{debug_info}:\n#{request.body}")
 
         net_http_args = [@uri.host, @uri.port]
         unless @proxy_args.empty?
@@ -256,7 +256,7 @@ module Jabber
         response = http.start { |http|
           http.request(request)
         }
-        Jabber::debuglog("HTTP RESPONSE (#{@pending_requests}/#{@http_requests}): #{response.class}\n#{response.body}")
+        Jabber::debuglog("HTTP RESPONSE (#{@pending_requests}/#{@http_requests}) #{debug_info}: #{response.class}\n#{response.body}")
 
         unless response.kind_of? Net::HTTPSuccess
           # Unfortunately, HTTPResponses aren't exceptions
@@ -286,6 +286,7 @@ module Jabber
       def post_data(data, restart = false)
         req_body = nil
         current_rid = nil
+        debug_info = ''
 
         begin
           begin
@@ -306,12 +307,13 @@ module Jabber
               req_body += data unless restart
               req_body += "</body>"
               current_rid = @http_rid
+              debug_info = "sid=#{@http_sid} rid=#{current_rid}"
 
               @pending_requests += 1
               @last_send = Time.now
             }
 
-            res_body = post(req_body)
+            res_body = post(req_body, debug_info)
 
           ensure
             @lock.synchronize {
@@ -329,18 +331,19 @@ module Jabber
               close; @exception_block.call(e, self, :parser)
             end
           else
-            Jabber::debuglog "Exception caught when parsing HTTP response!"
+            Jabber::debuglog "Exception caught when parsing HTTP response! (#{debug_info})"
             close
             raise
           end
 
         rescue StandardError => e
-          Jabber::debuglog("POST error (will retry): #{e.class}: #{e}")
+          Jabber::debuglog("POST error (will retry) #{debug_info}: #{e.class}: #{e}, #{e.backtrace}")
           receive_elements_with_rid(current_rid, [])
           # It's not good to resend on *any* exception,
           # but there are too many cases (Timeout, 404, 502)
           # where resending is appropriate
           # TODO: recognize these conditions and act appropriate
+          # FIXME: resending the same data with a new rid is wrong.  should resend with the same rid
           send_data(data)
         end
       end

data/lib/xmpp4r/xmpp4r.rb

@@ -8,7 +8,7 @@ module Jabber
   # XMPP4R Version number.  This is the ONLY place where the version number
   # should be specified.  This constant is used to determine the version of
   # package tarballs and generated gems.
-  XMPP4R_VERSION = '0.6.1'
+  XMPP4R_VERSION = '0.6.2'
 end
 
 require 'xmpp4r/client'

data/mad-p-xmpp4r.gemspec

@@ -245,5 +245,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.24"
   s.specification_version = 3
   s.summary = "This is a fork from XMPP4R (https://github.com/ln/xmpp4r), fixing BOSH"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 end

data/test/ts_xmpp4r.rb

@@ -13,7 +13,16 @@ require 'find'
 
 # List files' basenames, not full path!
 # EXCLUDED_FILES = [ 'tc_muc_simplemucclient.rb' ]
-EXCLUDED_FILES = ['tc_disconnect_cleanup.rb', './pubsub/tc_helper.rb', './muc/tc_muc_mucclient.rb', './reliable/tc_reliable_connection.rb', './reliable/tc_disconnect_exception.rb', './reliable/tc_listener_mocked_test.rb', './reliable/tc_reliable_connection.rb']
+EXCLUDED_FILES = %w[
+  tc_disconnect_cleanup.rb
+  ./pubsub/tc_helper.rb
+  ./muc/tc_muc_mucclient.rb
+  ./reliable/tc_reliable_connection.rb
+  ./reliable/tc_disconnect_exception.rb
+  ./reliable/tc_listener_mocked_test.rb
+  ./reliable/tc_reliable_connection.rb
+  ./bytestreams/tc_socks5bytestreams.rb
+].map {|f| f.gsub(%r[^\.], File.dirname(__FILE__)) }
 
 tc_files = []
 tc_subdirs = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mad-p-xmpp4r
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies: []
 description: This is a fork from XMPP4R (https://github.com/ln/xmpp4r), fixing BOSH
 email: kaoru.maeda@gmail.com