yong-purple_ruby 0.2.1 → 0.3.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'hoe'
 
 EXT = "ext/ruburple_ext.#{Hoe::DLEXT}"
 
-Hoe.new('purple_ruby', '0.2.1') do |p|
+Hoe.new('purple_ruby', '0.3.0') do |p|
   p.author = 'yong'
   p.email = 'yong@intridea.com'
   p.url = 'http://www.intridea.com'

data/examples/purplegw_example.rb

@@ -41,7 +41,8 @@ class PurpleGWExample
     end
     
     PurpleRuby.watch_connection_error do |acc, type, description| 
-      raise "connection_error: #{acc.username} #{type} #{description}"
+      puts "connection_error: #{acc.username} #{type} #{description}"
+      true #'true': auto-reconnect; 'false': do nothing
     end
     
     #request can be: 'SSL Certificate Verification' etc
@@ -51,11 +52,11 @@ class PurpleGWExample
     end
     
     #listen a tcp port, parse incoming data and send it out.
-    #We assume the incoming data is in the following format:
-    #<protocol> <user> <message>
+    #We assume the incoming data is in the following format (separated by comma):
+    #<protocol>,<user>,<message>
     PurpleRuby.watch_incoming_ipc(SERVER_IP, SERVER_PORT) do |data|
       protocol, user, message = data.split(",").collect{|x| x.chomp.strip}
-      puts "send: #{protocol}, #{user}, #{message}"
+      puts "send: #{protocol},#{user},#{message}"
       puts accounts[protocol].send_im(user, message)
     end
         

data/ext/purple_ruby.c

@@ -1,3 +1,22 @@
+/*
+ * Author: yong@intridea.com 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
 #include <libpurple/account.h>
 #include <libpurple/conversation.h>
 #include <libpurple/core.h>
@@ -102,7 +121,7 @@ static PurpleEventLoopUiOps glib_eventloops =
 
 static VALUE cPurpleRuby;
 static VALUE cAccount;
-static char* UI_ID = "purplegw";
+const char* UI_ID = "purplegw";
 static GMainLoop *main_loop = NULL;
 static VALUE im_handler = Qnil;
 static VALUE signed_on_handler = Qnil;
@@ -113,17 +132,25 @@ static GHashTable* data_hash_table = NULL;
 static GHashTable* fd_hash_table = NULL;
 static ID CALL;
 
-static void connection_error(PurpleConnection* connection, 
-                    PurpleConnectionError type,
-                    const gchar *description,
-                    gpointer unused)
+extern void
+finch_connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason,
+		const char *text);
+		
+extern void finch_connections_init();
+
+void report_disconnect(PurpleConnection *gc, PurpleConnectionError reason, const char *text)
 {
   if (Qnil != connection_error_handler) {
     VALUE *args = g_new(VALUE, 3);
-    args[0] = Data_Wrap_Struct(cAccount, NULL, NULL, purple_connection_get_account(connection));
-    args[1] = INT2FIX(type);
-    args[2] = rb_str_new2(description);
-    rb_funcall2((VALUE)connection_error_handler, CALL, 3, args);
+    args[0] = Data_Wrap_Struct(cAccount, NULL, NULL, purple_connection_get_account(gc));
+    args[1] = INT2FIX(reason);
+    args[2] = rb_str_new2(text);
+    VALUE v = rb_funcall2((VALUE)connection_error_handler, CALL, 3, args);
+    
+    if (v != Qnil && v != Qfalse) {
+      finch_connection_report_disconnect(gc, reason, text);
+    }
+    
     g_free(args);
   }
 }
@@ -139,7 +166,7 @@ static void write_conv(PurpleConversation *conv, const char *who, const char *al
        * In that case, libpurple will notify user with two regular im message.
        * The first message is an error message, the second one is the original message that failed to send.
        */
-      connection_error(purple_account_get_connection(account), PURPLE_CONNECTION_ERROR_NETWORK_ERROR, message, NULL);
+      report_disconnect(purple_account_get_connection(account), PURPLE_CONNECTION_ERROR_NETWORK_ERROR, message);
     } else {
       VALUE *args = g_new(VALUE, 3);
       args[0] = rb_str_new2(purple_account_get_username(account));
@@ -174,11 +201,6 @@ static PurpleConversationUiOps conv_uiops =
 	NULL
 };
 
-static void report_disconnect_reason(PurpleConnection *gc, PurpleConnectionError reason, const char *text)
-{
-  connection_error(gc, reason, text, NULL);
-}
-
 static PurpleConnectionUiOps connection_ops = 
 {
 	NULL, /* connect_progress */
@@ -188,7 +210,7 @@ static PurpleConnectionUiOps connection_ops =
 	NULL,
 	NULL, /* network_connected */
 	NULL, /* network_disconnected */
-	report_disconnect_reason,
+	report_disconnect,
 	NULL,
 	NULL,
 	NULL
@@ -368,12 +390,13 @@ static VALUE watch_signed_on_event(VALUE self)
 
 static VALUE watch_connection_error(VALUE self)
 {
+  finch_connections_init();
   purple_connections_set_ui_ops(&connection_ops);
   
   connection_error_handler = rb_block_proc();
-  int handle;
+  /*int handle;
 	purple_signal_connect(purple_connections_get_handle(), "connection-error", &handle,
-				PURPLE_CALLBACK(connection_error), NULL);
+				PURPLE_CALLBACK(connection_error), NULL);*/
   return connection_error_handler;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yong-purple_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - yong