ruburple 0.0.6 → 0.0.7

data/README

@@ -14,9 +14,13 @@ pkg-config:: Just for extconf.rb to be able to find glib-2.0. Should be installe
 I hade some trouble getting a precompiled set of libpurple libs with headers, so I downloaded the source.
 
 Then, to build, I did:
- ./configure --disable-gtkui --disable-consoleui --disable-screensaver --disable-startup-notification --disable-sm --disable-gtkspell --disable-gevolution --disable-cap --disable-gstreamer --disable-tcl --disable-tk --disable-doxygen --disable-perl --with-gnutls-includes=/opt/local/include/ --with-gnutls-libs=/opt/local/lib/
+ env CFLAGS="-I/opt/local/include -L/opt/local/lib" ./configure --disable-gtkui --disable-consoleui --disable-screensaver --disable-startup-notification --disable-sm --disable-gtkspell --disable-gevolution --disable-cap --disable-gstreamer --disable-tcl --disable-tk --disable-doxygen --disable-perl --with-gnutls-includes=/opt/local/include/ --with-gnutls-libs=/opt/local/lib/
 
-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.
+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. Also, the CFLAGS are because for some reason configure couldnt find my gettext header files...
+
+!!!NOTE!!! You wont be able to use MSN and some other protocols unless your build finds an SSL library, like gnutls above!
+
+To make sure that you have found an SSL library, just look at the results of the ./configure command.
 
 == Usage example:
 

data/ext/ruburple_ext.c

@@ -53,8 +53,8 @@ static VALUE rb_ruburple_protocol_account_transfer;
 static VALUE rb_ruburple_protocol_account_conversation;
 static VALUE rb_ruburple_protocol_account_chat;
 static VALUE rb_ruburple_protocol_account_savedstatus;
+static VALUE rb_ruburple_protocol_account_status;
 static VALUE rb_ruburple_protocol_connection;
-static VALUE rb_ruburple_blist_status;
 static VALUE rb_ruburple_blist;
 static VALUE rb_ruburple_blist_buddy_icon;
 static VALUE rb_ruburple_blist_buddy;
@@ -113,7 +113,7 @@ static VALUE delete_method_id;
 #define RB_RUBURPLE_PROTOCOL(purple_plugin_pointer) Data_Wrap_Struct(rb_ruburple_protocol, NULL, NULL, purple_plugin_pointer)
 #define RB_RUBURPLE_PLUGIN(purple_plugin_pointer) Data_Wrap_Struct(rb_ruburple_plugin, NULL, NULL, purple_plugin_pointer)
 #define RB_RUBURPLE_PROTOCOL_INFO(purple_plugin_info_pointer) Data_Wrap_Struct(rb_ruburple_protocol_info, NULL, NULL, purple_plugin_info_pointer)
-#define RB_RUBURPLE_BLIST_STATUS(purple_status_pointer) Data_Wrap_Struct(rb_ruburple_blist_status, NULL, NULL, purple_status_pointer)
+#define RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS(purple_status_pointer) Data_Wrap_Struct(rb_ruburple_protocol_account_status, NULL, NULL, purple_status_pointer)
 #define RB_RUBURPLE_BLIST(purple_blist_pointer) Data_Wrap_Struct(rb_ruburple_blist, NULL, NULL, purple_blist_pointer)
 #define RB_RUBURPLE_BLIST_BUDDY(purple_buddy_pointer) Data_Wrap_Struct(rb_ruburple_blist_buddy, NULL, NULL, purple_buddy_pointer)
 #define RB_RUBURPLE_BLIST_NODE(purple_blist_node_pointer) Data_Wrap_Struct(rb_ruburple_blist_node, NULL, NULL, purple_blist_node_pointer)
@@ -139,7 +139,7 @@ static VALUE delete_method_id;
 #define RUBURPLE_SIGNAL_HANDLER(rb_ruburple_subscription,ruburple_signal_handler_pointer) Data_Get_Struct(rb_ruburple_subscription, RuburpleSignalHandler, ruburple_signal_handler_pointer)
 #define PURPLE_CONNECTION(rb_ruburple_protocol_connection,purple_connection_pointer) Data_Get_Struct(rb_ruburple_protocol_connection, PurpleConnection, purple_connection_pointer)
 #define PURPLE_BUDDY(rb_ruburple_blist_buddy,purple_buddy_pointer) Data_Get_Struct(rb_ruburple_blist_buddy, PurpleBuddy, purple_buddy_pointer)
-#define PURPLE_STATUS(rb_ruburple_blist_status,purple_status_pointer) Data_Get_Struct(rb_ruburple_blist_status, PurpleStatus, purple_status_pointer)
+#define PURPLE_STATUS(rb_ruburple_protocol_account_status,purple_status_pointer) Data_Get_Struct(rb_ruburple_protocol_account_status, PurpleStatus, purple_status_pointer)
 #define GPOINTER(rb_ruburple_pointer,gpointer) Data_Get_Struct(rb_ruburple_pointer, void, gpointer)
 
 /*
@@ -341,15 +341,55 @@ static guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInput
 }
 
 static PurpleEventLoopUiOps glib_eventloops = 
-{
-	g_timeout_add,
-	g_source_remove,
-	glib_input_add,
-	g_source_remove,
-	NULL
-};
+  {
+    g_timeout_add,
+    g_source_remove,
+    glib_input_add,
+    g_source_remove,
+    NULL
+  };
 /*** End of the eventloop functions. ***/
 
+static gpointer
+ruburple_notify_message(PurpleNotifyMsgType type, 
+			const char *title,
+			const char *primary, 
+			const char *secondary)
+{
+  switch (type) {
+  case PURPLE_NOTIFY_MSG_ERROR:
+    printf("Error message: %s\n%s\n%s\n", title, primary, secondary);
+    break;
+  case PURPLE_NOTIFY_MSG_WARNING:
+    printf("Warning message: %s\n%s\n%s\n", title, primary, secondary); 
+    break;
+ case PURPLE_NOTIFY_MSG_INFO:
+    printf("Error message: %s\n%s\n%s\n", title, primary, secondary);
+    break;
+  default:
+    printf("Unknown message: %s\n%s\n%s\n", title, primary, secondary);
+    break;
+  }
+  fflush(NULL);
+}
+
+static PurpleNotifyUiOps notify_ops =
+  {
+    ruburple_notify_message,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+  };
+
 static gpointer
 run_the_loop(gpointer data)
 {
@@ -367,6 +407,8 @@ rb_ruburple_init(VALUE self)
     /* Set the uiops for the eventloop. If your client is glib-based, you can safely
      * copy this verbatim. */
     purple_eventloop_set_ui_ops(&glib_eventloops);
+    
+    purple_notify_set_ui_ops(&notify_ops);
 
     /* Now that all the essential stuff has been set, let's try to init the core. It's
      * necessary to provide a non-NULL name for the current ui to the core. This name
@@ -726,7 +768,7 @@ rb_ruburple_protocol_account_get_status(VALUE self)
   PURPLE_ACCOUNT(self, account);
   status = (PurpleStatus *) call_and_get_result(ruburple_protocol_account_get_status, (gpointer) account);
   RETURN_QNIL_IF_NULL(status);
-  return RB_RUBURPLE_BLIST_STATUS(status);
+  return RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS(status);
 }
 
 static gpointer
@@ -835,7 +877,7 @@ get_ruby_instance_from_subtype(PurpleValue *value, gpointer data, int i, char *s
     return(RB_RUBURPLE_CIPHER((PurpleCipher *) data));
     break;
   case PURPLE_SUBTYPE_STATUS:
-    return(RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) data));
+    return(RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS((PurpleStatus *) data));
     break;
   case PURPLE_SUBTYPE_LOG:
     return(RB_RUBURPLE_LOG((PurpleLog *) data));
@@ -1362,18 +1404,41 @@ rb_ruburple_blist_buddy_get_name(VALUE self)
 }
 
 static gpointer
-ruburple_blist_status_get_name(gpointer data)
+ruburple_protocol_account_status_get_name(gpointer data)
 {
   PurpleStatus *status = (PurpleStatus *) data;
   return (gpointer) purple_status_get_name(status);
 }
 
 static VALUE
-rb_ruburple_blist_status_get_name(VALUE self)
+rb_ruburple_protocol_account_status_get_name(VALUE self)
 {
   PurpleStatus *status;
   PURPLE_STATUS(self, status);
-  return rb_str_new2((char *) call_and_get_result(ruburple_blist_status_get_name, (gpointer) status));
+  return rb_str_new2((char *) call_and_get_result(ruburple_protocol_account_status_get_name, (gpointer) status));
+}
+
+static gpointer
+ruburple_protocol_account_status_get_primitive(gpointer data)
+{
+  gpointer *args = (gpointer *) data;
+  * (int *) args[1] = purple_status_type_get_primitive((PurpleStatusType *) args[0]);
+  return NULL;
+}
+
+static VALUE
+rb_ruburple_protocol_account_status_get_primitive(VALUE self)
+{
+  PurpleStatus *status;
+  PurpleStatusType *type;
+  gpointer args[2];
+  int rval;
+  PURPLE_STATUS(self, status);
+  type = purple_status_get_type(status);
+  args[0] = type;
+  args[1] = &rval;
+  call_and_get_result(ruburple_protocol_account_status_get_primitive, (gpointer) args);
+  return INT2NUM(rval);
 }
 
 static VALUE
@@ -1404,7 +1469,7 @@ rb_ruburple_blist_buddy_get_status(VALUE self)
 {
   PurpleBuddy *buddy;
   PURPLE_BUDDY(self, buddy);
-  return RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_buddy_get_status, (gpointer) buddy));
+  return RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_buddy_get_status, (gpointer) buddy));
 }
 
 #ifdef __cplusplus
@@ -1491,7 +1556,7 @@ extern "C" {
     rb_define_method(rb_ruburple_protocol, "author", rb_protocol_get_author, 0);
     rb_define_method(rb_ruburple_protocol, "homepage", rb_protocol_get_homepage, 0);
 
-    rb_ruburple_protocol_account = rb_define_class_under(rb_ruburple, "Account", rb_cObject);
+    rb_ruburple_protocol_account = rb_define_class_under(rb_ruburple_protocol, "Account", rb_cObject);
     rb_define_method(rb_ruburple_protocol_account, "password=", rb_ruburple_protocol_account_set_password, 1);
     rb_define_method(rb_ruburple_protocol_account, "connect", rb_ruburple_protocol_account_connect, 0);
     rb_define_method(rb_ruburple_protocol_account, "enabled=", rb_ruburple_protocol_account_set_enabled, 1);
@@ -1516,16 +1581,17 @@ extern "C" {
 
     rb_ruburple_blist = rb_define_class_under(rb_ruburple, "BuddyList", rb_cObject);
 
-    rb_ruburple_blist_status = rb_define_class_under(rb_ruburple_blist, "Status", rb_cObject);
-    rb_define_method(rb_ruburple_blist_status, "name", rb_ruburple_blist_status_get_name, 0);
-    rb_define_const(rb_ruburple_blist_status, "STATUS_UNSET", INT2NUM(PURPLE_STATUS_UNSET));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_OFFLINE", INT2NUM(PURPLE_STATUS_OFFLINE));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_AVAILABLE", INT2NUM(PURPLE_STATUS_AVAILABLE));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_UNAVAILABLE", INT2NUM(PURPLE_STATUS_UNAVAILABLE));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_INVISIBLE", INT2NUM(PURPLE_STATUS_INVISIBLE));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_AWAY", INT2NUM(PURPLE_STATUS_AWAY));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_EXTENDED_AWAY", INT2NUM(PURPLE_STATUS_EXTENDED_AWAY));
-    rb_define_const(rb_ruburple_blist_status, "STATUS_MOBILE", INT2NUM(PURPLE_STATUS_MOBILE));
+    rb_ruburple_protocol_account_status = rb_define_class_under(rb_ruburple_protocol_account, "Status", rb_cObject);
+    rb_define_method(rb_ruburple_protocol_account_status, "name", rb_ruburple_protocol_account_status_get_name, 0);
+    rb_define_method(rb_ruburple_protocol_account_status, "primitive", rb_ruburple_protocol_account_status_get_primitive, 0);
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_UNSET", INT2NUM(PURPLE_STATUS_UNSET));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_OFFLINE", INT2NUM(PURPLE_STATUS_OFFLINE));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_AVAILABLE", INT2NUM(PURPLE_STATUS_AVAILABLE));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_UNAVAILABLE", INT2NUM(PURPLE_STATUS_UNAVAILABLE));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_INVISIBLE", INT2NUM(PURPLE_STATUS_INVISIBLE));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_AWAY", INT2NUM(PURPLE_STATUS_AWAY));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_EXTENDED_AWAY", INT2NUM(PURPLE_STATUS_EXTENDED_AWAY));
+    rb_define_const(rb_ruburple_protocol_account_status, "STATUS_MOBILE", INT2NUM(PURPLE_STATUS_MOBILE));
 
     rb_ruburple_protocol_connection = rb_define_class_under(rb_ruburple_protocol, "Connection", rb_cObject);
     rb_define_method(rb_ruburple_protocol_connection, "send_im", rb_ruburple_protocol_connection_send_im, -1);

data/tests/ruburple_test.rb

@@ -29,22 +29,23 @@ class RuburpleTest < Test::Unit::TestCase
     }
   end
 
-  def test_protocols
-    $TEST_ACCOUNTS.keys.each do |key|
-      test_operations(key)
+  def test_accounts
+    $TEST_ACCOUNTS.each do |ac1, ac2|
+      test_operations(ac1, ac2)
     end
   end
 
   private
 
-  def test_operations(protocol)
-    puts "testing #{protocol}..."
-    assert(Ruburple::has_protocol?(protocol))
-    test_accounts = $TEST_ACCOUNTS[protocol]
-    p = Ruburple::get_protocol(protocol)
+  def test_operations(ac1, ac2)
+    puts "testing #{ac1.protocol} + #{ac2.protocol}..."
+    assert(Ruburple::has_protocol?(ac1.protocol))
+    assert(Ruburple::has_protocol?(ac2.protocol))
+    p1 = Ruburple::get_protocol(ac1.protocol)
+    p2 = Ruburple::get_protocol(ac2.protocol)
     puts "testing get account..."
-    a1 = p.get_account(test_accounts.first.username, test_accounts.first.password)
-    a2 = p.get_account(test_accounts.last.username, test_accounts.last.password)
+    a1 = p1.get_account(ac1.username, ac1.password)
+    a2 = p2.get_account(ac2.username, ac2.password)
     puts "testing connecting..."
     assert(!a1.connecting?)
     a1.connect
@@ -60,13 +61,12 @@ class RuburpleTest < Test::Unit::TestCase
     puts "testing uid..."
     assert(a1.uid != a2.uid)
     assert_equal(a1.uid, a1.connection.account.uid)
+    sleep 2
     puts "testing buddies..."
     assert(a1.has_buddy?(a2.username))
     assert(buddy2 = a1.buddies.find do |b|
-             b.name == a2.username
+             a2.username =~ /#{Regexp.escape(b.name)}/
            end)
-    puts "testing presence..."
-    assert_equal("Offline", buddy2.status.name)
     puts "testing set enabled..."
     a2.enabled = true
     assert_within(30) do 
@@ -74,18 +74,19 @@ class RuburpleTest < Test::Unit::TestCase
         e.account.username == a2.username
       end
     end
+    a1.savedstatus = Ruburple::Protocol::Account::SavedStatus.new(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE)
+    a2.savedstatus = Ruburple::Protocol::Account::SavedStatus.new(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE)
+    puts "testing status..."
+    assert_equal("Available", a1.status.name)
+    assert_equal("Available", a2.status.name)
+    assert_equal(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE, a1.status.primitive)
+    assert_equal(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE, a2.status.primitive)
     puts "testing buddies..."
+    sleep 2
     assert(a2.has_buddy?(a1.username))
     assert(buddy1 = a2.buddies.find do |b|
-             b.name == a1.username
+             a1.username =~ /#{Regexp.escape(b.name)}/
            end)
-    puts "testing presence..."
-    assert_within(30) do
-      buddy1.status.name == "Available"
-    end
-    assert_within(30) do
-      buddy2.status.name == "Available"
-    end
     puts "testing send im..."
     a1.connection.send_im(a2.username, "hello a2")
     a2.connection.send_im(a1.username, "hello a1")
@@ -100,10 +101,6 @@ class RuburpleTest < Test::Unit::TestCase
     end
     puts "testing set enabled..."
     a1.enabled = false
-    puts "testing presence..."
-    assert_within(30) do
-      buddy1.status.name == "Offline"
-    end
     puts "testing close..."
     a2.connection.close
   end

data/tests/test_accounts.rb

@@ -1,7 +1,8 @@
 
-$TEST_ACCOUNTS = {
-  "MSN" => [
-            TestAccount.new("MSN", "blabahtest1@blabah.com", "blabah"),
-            TestAccount.new("MSN", "blabahtest2@blabah.com", "blabah")
-           ]
-}
+#
+# These accounts should be on each others buddy lists for the tests to run.
+#
+$TEST_ACCOUNTS = [[
+                   TestAccount.new("XMPP", "blabahtest1@gmail.com", "blabah1"),
+                   TestAccount.new("XMPP", "blabahtest3@gmail.com", "blabah3")
+                  ]]

data/tests/test_accounts.rb.template

@@ -2,9 +2,7 @@
 #
 # These accounts should be on each others buddy lists for the tests to run.
 #
-$TEST_ACCOUNTS = {
-  "MSN" => [
-            TestAccount.new("MSN", "some@msn.account", "some_msn_password"),
-            TestAccount.new("MSN", "some@msn.account", "some_msn_password")
-           ]
-}
+$TEST_ACCOUNTS = [[
+                   TestAccount.new("XMPP", "some@xmpp.account", "some_xmpp_password"),
+                   TestAccount.new("XMPP", "some@xmpp.account", "some_xmpp_password")
+                  ]]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruburple
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2007-05-08 00:00:00 +02:00
+  version: 0.0.7
+date: 2007-05-13 00:00:00 +02:00
 summary: An ruby extension to libpurple.
 require_paths: 
 - lib