yong-stropheruby 0.1.0 → 0.1.1

data/Manifest.txt

@@ -2,7 +2,7 @@
 History.txt
 Manifest.txt
 PostInstall.txt
-README.rdoc
+README.txt
 Rakefile
 examples/xmpp_client.rb
 ext/md5.c

data/{README.rdoc → README.txt}

@@ -8,15 +8,20 @@ This is a fork of flamontagne's stropheruby (http://github.com/flamontagne/strop
 * (libstrophe) Fixed a timeout issue on Mac OSX: http://groups.google.com/group/strophe-dev/browse_thread/thread/ef4cb19785020fb6
 * (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
 * (stropheruby) Added send_raw_string method
 * (stropheruby) Detect login failure
 * (stropheruby) Fix resource leak
+* (stropheruby) Added wrapper class for xmpp_stream_error_t (StropheRuby::StreamError)
 
 == INSTALLATION
 
 sudo gem sources -a http://gems.github.com
 sudo gem install yong-stropheruby
 
+For Rails app, add this line in your config/environment.rb:
+config.gem "yong-stropheruby", :source => "http://gems.github.com", :lib => "strophe_ruby"
+
 == EXAMPLE
 
 See example.rb

data/Rakefile

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

data/examples/xmpp_client.rb

@@ -18,22 +18,21 @@ class XmppClient
   
 private
 
-  def new_connection(jid, password)
+  def new_connection(jid, password, login_can_not_fail = true)
     lib = StropheRuby::EventLoop.prepare
     @ctx = StropheRuby::Context.new(StropheRuby::Logging::DEBUG)
     @connection = StropheRuby::Connection.new(@ctx)
     @connection.jid = jid
     @connection.password = password
-    connected = false
-    @connection.connect do |status|
-      if !connected
-        connected = true
-        if status != StropheRuby::ConnectionEvents::CONNECT
+    logged_in = false
+    @connection.connect do |status, error, stream_error|
+      if !logged_in
+        if login_can_not_fail && status != StropheRuby::ConnectionEvents::CONNECT
           #do somthing after login fails
-          raise 'failed to login'
+          raise "failed to login: #{error} #{stream_error}"
         else
-          #do something after login
           yield if block_given?
+          logged_in = true
         end
       end
     end

data/ext/event.c

@@ -231,7 +231,10 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     }
     
     /* no events happened */
-    if (ret == 0) return 1;
+    if (ret == 0) {
+	conn->error = ETIMEDOUT;
+	return 1;
+    }
 
     /* process events */
     connitem = ctx->connlist;
@@ -244,7 +247,8 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 		/* connection complete */
 
 		/* check for error */
-		if (sock_connect_error(conn->sock) != 0) {
+		conn->error =  sock_connect_error(conn->sock); 
+		if (conn->error != 0) {
 		    /* connection failed */
 		    xmpp_debug(ctx, "xmpp", "connection failed");
 		    conn_disconnect(conn);

data/ext/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 have_library("expat")
 have_library("resolv")
-$CFLAGS = "#{ENV['CFLAGS']} -Wall -O3 "
+$CFLAGS = "#{ENV['CFLAGS']} -Wall -O3 -g"
 if CONFIG["MAJOR"].to_i >= 1 && CONFIG["MINOR"].to_i >= 8
   $CFLAGS << " -DHAVE_DEFINE_ALLOC_FUNCTION"
 end

data/ext/strophe_ruby.c

@@ -12,6 +12,7 @@ VALUE cStreamError;
 VALUE cEventLoop;
 VALUE client_conn_handler;
 VALUE cStanza;
+VALUE cStreamError;
 
 /* release the stanza. Called automatically by the GC */
 static void t_xmpp_stanza_release(void *stanza) {
@@ -186,8 +187,34 @@ static void _conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t stat
 		  const int error, xmpp_stream_error_t * const stream_error,
 		  void * const userdata) {
 	//yield code block for connection
-	if (RTEST(client_conn_handler))
-	    rb_funcall(client_conn_handler, rb_intern("call"), 1, INT2FIX(status));
+	if (RTEST(client_conn_handler)) {
+	    VALUE args[3];
+	    args[0] = INT2FIX(status);
+	    args[1] = INT2FIX(error);
+	    args[2] = (NULL == stream_error) ? Qnil : Data_Wrap_Struct(cStreamError, 0, NULL, stream_error);
+	    rb_funcall2(client_conn_handler, rb_intern("call"), 3, args);
+	}
+}
+
+/*Get the type of a StreamError. */
+static VALUE t_xmpp_stream_error_get_type(VALUE self) {
+    xmpp_stream_error_t *stream_error;    
+    Data_Get_Struct(self, xmpp_stream_error_t, stream_error);
+    return INT2FIX(stream_error->type);
+}
+
+/*Get the text of a StreamError. */
+static VALUE t_xmpp_stream_error_get_text(VALUE self) {
+    xmpp_stream_error_t *stream_error;    
+    Data_Get_Struct(self, xmpp_stream_error_t, stream_error);  
+    return (NULL != stream_error->text) ? rb_str_new2(stream_error->text) : Qnil;
+}
+
+/*Get the stanza of a StreamError. */
+static VALUE t_xmpp_stream_error_get_stanza(VALUE self) {
+    xmpp_stream_error_t *stream_error;    
+    Data_Get_Struct(self, xmpp_stream_error_t, stream_error);  
+    return (NULL != stream_error->stanza) ? Data_Wrap_Struct(cStanza, 0, NULL, stream_error->stanza) : Qnil;
 }
 
 /*this is called in a loop (rb_iterate). We invoke the block passed by the user*/
@@ -506,6 +533,7 @@ static VALUE t_xmpp_stanza_set_ns(VALUE self, VALUE rb_ns) {
     return Qtrue;
 }
 
+/*Convert Stanza to String */
 static VALUE t_xmpp_stanza_to_text(VALUE self) {
     xmpp_stanza_t *stanza;    
     Data_Get_Struct(self, xmpp_stanza_t, stanza);
@@ -661,6 +689,12 @@ void Init_strophe_ruby() {
     rb_define_method(cConnection, "add_handler", t_xmpp_handler_add, 1);
     rb_define_method(cConnection, "add_id_handler", t_xmpp_id_handler_add, 3);
 
+    /*StreamError*/
+    cStreamError = rb_define_class_under(mStropheRuby, "StreamError", rb_cObject);
+    rb_define_method(cStreamError, "error_type", t_xmpp_stream_error_get_type, 0);
+    rb_define_method(cStreamError, "text", t_xmpp_stream_error_get_text, 0);
+    rb_define_method(cStreamError, "stanza", t_xmpp_stream_error_get_stanza, 0);
+
     /*Stanza*/
     cStanza = rb_define_class_under(mStropheRuby, "Stanza", rb_cObject);
     rb_define_singleton_method(cStanza, "new", t_xmpp_stanza_new, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yong-stropheruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Lamontagne"
@@ -38,7 +38,7 @@ files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
+- README.txt
 - Rakefile
 - ext/md5.c
 - ext/parser.c