ruburple 0.0.2 → 0.0.3

data/README

@@ -18,17 +18,15 @@ Then, to build, I did:
 
 This is mainly because I dont need any of the disabled features to get ruburple running, and the configure script had big trouble finding the gnutls headers and libs on its own.
 
-== Usage example:
+== Usage example (using (almost?) all methods defined in the ruburple gem):
 
  require 'ruburple'
  Ruburple::init
  Ruburple::subscribe(:received_im_msg, (Proc.new do |a,b,c,d,e| puts "rcv im: #{a}, #{b}, #{c}, #{d}, #{e}" end))
  Ruburple::subscribe(:signed_on, (Proc.new do |a| puts "signed on: #{a}" end))
  p = Ruburple::protocols[5]
- a = p.get_account("some@msn.account")
- a.password = "some_msn_password"
+ puts "gonna connect to #{p.id}, #{p.name}, #{p.version}, #{p.summary}, #{p.description}, #{p.author}, #{p.homepage}"
+ a = p.get_account("some@msn.account", "some_msn_password")
  a.connect
  a.connection.send_im("some_other@msn_account", "some message")
-
-
-
+ a.connection.close

data/ext/ruburple_ext.c

@@ -195,18 +195,16 @@ typedef struct
   gpointer result;
   GCond *done;
   GMutex *lock;
-  gboolean do_free;
   gboolean run;
 } RuburpleSingleShotCall;
 
 /* Creator of single shot calls */
 static RuburpleSingleShotCall*
-ruburple_single_shot_call_new(RuburpleCallFunc function, gpointer data, gboolean do_free)
+ruburple_single_shot_call_new(RuburpleCallFunc function, gpointer data)
 {
   RuburpleSingleShotCall *return_value = g_new(RuburpleSingleShotCall, 1);
   return_value->function = function;
   return_value->data = data;
-  return_value->do_free = do_free;
   return_value->run = FALSE;
   return_value->done = g_cond_new();
   return_value->lock = g_mutex_new();
@@ -236,18 +234,14 @@ call_single_shot(gpointer data)
 
   g_mutex_unlock(call->lock);
 
-  if (call->do_free) {
-    ruburple_single_shot_call_free(call);
-  }  
-  
   return FALSE;
 }
 
 /* Ask glib to run something once */
 static RuburpleSingleShotCall*
-add_single_shot(RuburpleCallFunc function, gpointer data, gboolean do_free)
+add_single_shot(RuburpleCallFunc function, gpointer data)
 {
-  RuburpleSingleShotCall *call = ruburple_single_shot_call_new(function, data, do_free);
+  RuburpleSingleShotCall *call = ruburple_single_shot_call_new(function, data);
   g_idle_add(call_single_shot, call);
   return call;
 }
@@ -256,7 +250,7 @@ add_single_shot(RuburpleCallFunc function, gpointer data, gboolean do_free)
 static gpointer
 call_and_get_result(RuburpleCallFunc function, gpointer data)
 {
-  RuburpleSingleShotCall *call = add_single_shot(function, data, FALSE);
+  RuburpleSingleShotCall *call = add_single_shot(function, data);
   gpointer return_value;
 
   g_mutex_lock(call->lock);
@@ -527,20 +521,47 @@ ruburple_protocol_get_account(gpointer data)
   return (gpointer) purple_account_new((char *) args[0], (char *) args[1]);
 }
 
+static gpointer
+ruburple_protocol_get_account_and_set_password(gpointer data)
+{
+  gpointer *args = (gpointer *) data;
+  gpointer return_value;
+  return_value = (gpointer) purple_account_new((char *) args[0], (char *) args[1]);
+  purple_account_set_password((PurpleAccount *) return_value, (char *) args[2]);
+  return return_value;
+}
+
 static VALUE
-rb_ruburple_protocol_get_account(VALUE self, VALUE name)
+rb_ruburple_protocol_get_account(int argc, VALUE *argv, VALUE self)
 {
   PurplePlugin *plugin;
-  gpointer *args = g_new(gpointer, 2);
+  gpointer *args;
   VALUE return_value;
 
-  Check_Type(name, T_STRING);
+  if (argc > 2)
+    rb_raise(rb_eRuntimeError, "Ruburple::Protocol#get_account(USERNAME, PASSWORD = nil) takes at most 2 arguments");
+  else if (argc < 1)
+    rb_raise(rb_eRuntimeError, "Ruburple::Protocol#get_account(USERNAME, PASSWORD = nil) takes at least 1 argument");
+  else if (argc > 1)
+    Check_Type(argv[1], T_STRING);
+  Check_Type(argv[0], T_STRING);
+
   PURPLE_PLUGIN(self, plugin);
 
-  args[0] = (gpointer) RSTRING(name)->ptr;
+  if (argc == 1)
+    args = g_new(gpointer, 2);
+  else if (argc == 2)
+    args = g_new(gpointer, 3);
+
+  args[0] = (gpointer) RSTRING(argv[0])->ptr;
   args[1] = (gpointer) plugin->info->id;
   
-  return_value = RB_RUBURPLE_PROTOCOL_ACCOUNT_gc((PurpleAccount *) call_and_get_result(ruburple_protocol_get_account, args));
+  if (argc == 1)
+    return_value = RB_RUBURPLE_PROTOCOL_ACCOUNT_gc((PurpleAccount *) call_and_get_result(ruburple_protocol_get_account, args));
+  else if (argc == 2) {
+    args[2] = (gpointer) RSTRING(argv[1])->ptr;
+    return_value = RB_RUBURPLE_PROTOCOL_ACCOUNT_gc((PurpleAccount *) call_and_get_result(ruburple_protocol_get_account_and_set_password, args));
+  }
 
   g_free(args);
 
@@ -1042,7 +1063,7 @@ rb_ruburple_protocol_connection_send_im(int argc, VALUE *argv, VALUE self)
   int rval;
 
   if (argc > 3)
-    rb_raise(rb_eRuntimeError, "Connection#send_im(RECIPIENT, MESSAGE, FLAGS = 0) takes at most 3 arguments");
+    rb_raise(rb_eRuntimeError, "Ruburple::Protocol::Connection#send_im(RECIPIENT, MESSAGE, FLAGS = 0) takes at most 3 arguments");
   if (argc == 3) {
     Check_Type(argv[2], T_FIXNUM);
     flags = NUM2INT(argv[2]);
@@ -1051,7 +1072,7 @@ rb_ruburple_protocol_connection_send_im(int argc, VALUE *argv, VALUE self)
     Check_Type(argv[1], T_STRING);
     Check_Type(argv[0], T_STRING);
   } else {
-    rb_raise(rb_eRuntimeError, "Connection#send_im(RECIPIENT, MESSAGE, FLAGS = 0) takes at least 2 arguments");
+    rb_raise(rb_eRuntimeError, "Ruburple::Protocol::Connection#send_im(RECIPIENT, MESSAGE, FLAGS = 0) takes at least 2 arguments");
   }
 
   PURPLE_CONNECTION(self, connection);
@@ -1165,7 +1186,7 @@ extern "C" {
     rb_ruburple_plugin = rb_define_class_under(rb_ruburple, "Plugin", rb_cObject);
 
     rb_ruburple_protocol = rb_define_class_under(rb_ruburple, "Protocol", rb_ruburple_plugin);
-    rb_define_method(rb_ruburple_protocol, "get_account", rb_ruburple_protocol_get_account, 1);
+    rb_define_method(rb_ruburple_protocol, "get_account", rb_ruburple_protocol_get_account, -1);
     rb_define_method(rb_ruburple_protocol, "id", rb_protocol_get_id, 0);
     rb_define_method(rb_ruburple_protocol, "name", rb_protocol_get_name, 0);
     rb_define_method(rb_ruburple_protocol, "version", rb_protocol_get_version, 0);

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruburple
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 date: 2007-05-05 00:00:00 +02:00
 summary: An ruby extension to libpurple.
 require_paths: