yong-stropheruby 0.1.1 → 0.1.2

data/README.txt

@@ -9,9 +9,10 @@ This is a fork of flamontagne's stropheruby (http://github.com/flamontagne/strop
 * (libstrophe) Fixed basic auth: http://groups.google.com/group/strophe-dev/browse_thread/thread/b770f72c83d1a0b9
 * (libstrophe) Changed xmpp_run_once's return code so that the application can tell if an error or timeout occurs
 * (libstrophe) Better error reporting for login failure
+* (libstrophe) If no password given, do not login. This will give 'register' a chance to run 
 * (stropheruby) Added send_raw_string method
 * (stropheruby) Detect login failure
-* (stropheruby) Fix resource leak
+* (stropheruby) Fixed a resource leak
 * (stropheruby) Added wrapper class for xmpp_stream_error_t (StropheRuby::StreamError)
 
 == INSTALLATION
@@ -24,4 +25,4 @@ config.gem "yong-stropheruby", :source => "http://gems.github.com", :lib => "str
 
 == EXAMPLE
 
-See example.rb
+See examples/xmpp_client.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'hoe'
 
 EXT = "ext/strophe_ruby.#{Hoe::DLEXT}"
 
-Hoe.new('stropheruby', '0.1.1') do |p|
+Hoe.new('stropheruby', '0.1.2') do |p|
   p.developer('François Lamontagne', 'flamontagne@gmail.com') 
   p.summary = 'strophe_ruby' 
 

data/examples/xmpp_client.rb

@@ -7,7 +7,7 @@ class XmppClient
       @connection.add_handler("iq") do |iq|
         case current_stage
         when 1 
-          @connection.send_raw_string("<iq type='get' id='1238647002'><query xmlns='jabber:iq:roster'/></iq>")
+          @connection.send_raw_string("<iq type='get' id='#{Time.now.to_i.to_s}'><query xmlns='jabber:iq:roster'/></iq>")
           current_stage += 1
         else
           StropheRuby::EventLoop.stop(@ctx)
@@ -15,6 +15,18 @@ class XmppClient
       end
     }
   end
+
+  def create_user(jid, password)
+    new_connection(jid, "", false) {
+      #create_user is special, it does not wait for an iq reply to send the resgister message
+      @connection.add_handler("iq") do |iq|
+        StropheRuby::EventLoop.stop(@ctx)
+      end
+      username = jid.split('@')[0]
+      hostname = jid.split('@')[1]
+      @connection.send_raw_string("<iq type='set' id='#{Time.now.to_i.to_s}' to='#{hostname}' xmlns='jabber:client'><query xmlns='jabber:iq:register'><username>#{username}</username><password>#{password}</password></query></iq>")
+    }
+  end
   
 private
 
@@ -60,5 +72,6 @@ end
 
 if $0 == __FILE__
   client = XmppClient.new
-  client.query_roster("a1@localhost", 'a1')
+  client.create_user("test@localhost", 'password')
+  client.query_roster("test@localhost", 'password')
 end

data/ext/conn.c

@@ -408,7 +408,7 @@ void conn_disconnect_clean(xmpp_conn_t * const conn)
 {
     /* remove the timed handler */
     xmpp_timed_handler_delete(conn, _disconnect_cleanup);
-
+    conn->error = -4;
     conn_disconnect(conn);
 }
 
@@ -440,7 +440,7 @@ static int _disconnect_cleanup(xmpp_conn_t * const conn,
 {
     xmpp_debug(conn->ctx, "xmpp",
 	       "disconnection forced by cleanup timeout");
-
+    conn->error = -5;
     conn_disconnect(conn);
 
     return 0;

data/ext/event.c

@@ -226,6 +226,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 	if (!sock_is_recoverable(sock_error())) {
 	xmpp_error(ctx, "xmpp", "event watcher internal error %d", 
                    sock_error());
+  conn->error = sock_error();
 	return -1;
     }
     }
@@ -278,6 +279,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 			/* parse error, we need to shut down */
 			/* FIXME */
 			xmpp_debug(ctx, "xmpp", "parse error, disconnecting");
+                        conn -> error = -1;
 			conn_disconnect(conn);
 		    }
 		} else {

data/ext/parser.c

@@ -64,6 +64,7 @@ void parser_handle_start(void *userdata,
 	if (strcmp(name, "stream:stream") != 0) {
 	    xmpp_error(conn->ctx, "xmpp",
 		       "Server did not open valid stream.");
+	    conn->error = -3;
 	    conn_disconnect(conn);
 	} else {
 	    _log_open_tag(conn, attr);
@@ -73,6 +74,7 @@ void parser_handle_start(void *userdata,
 	    if (!conn->stream_id) {
 		xmpp_error(conn->ctx, "xmpp",
 			   "Memory allocation failure.");
+		conn->error = -2;
 		conn_disconnect(conn);
 	    }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yong-stropheruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Lamontagne"