ruburple 0.0.5 → 0.0.6

data/README

@@ -18,7 +18,9 @@ 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 (using almost all methods defined in the ruburple gem):
+== Usage example:
+
+This example uses almost all methods defined in the ruburple gem. For a few other methods look at the test/ruburple_test.rb.
 
  require 'ruburple'
  Ruburple::init
@@ -35,4 +37,4 @@ This is mainly because I dont need any of the disabled features to get ruburple
 
 Do
  Ruburple::debug = true
-and mail me a description of the problem, and Ill see what I can do.
+and mail me a description of the problem, and Ill see what I can do. Warning: ruburple will be extremely chatty (pun intended) when you do this.

data/ext/ruburple_ext.c

@@ -55,7 +55,6 @@ static VALUE rb_ruburple_protocol_account_chat;
 static VALUE rb_ruburple_protocol_account_savedstatus;
 static VALUE rb_ruburple_protocol_connection;
 static VALUE rb_ruburple_blist_status;
-static VALUE rb_ruburple_blist_presence;
 static VALUE rb_ruburple_blist;
 static VALUE rb_ruburple_blist_buddy_icon;
 static VALUE rb_ruburple_blist_buddy;
@@ -115,7 +114,6 @@ static VALUE delete_method_id;
 #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_BLIST_PRESENCE(purple_presence_pointer) Data_Wrap_Struct(rb_ruburple_blist_presence, NULL, NULL, purple_presence_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)
@@ -141,7 +139,6 @@ 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_PRESENCE(rb_ruburple_blist_presence,purple_presence_pointer) Data_Get_Struct(rb_ruburple_blist_presence, PurplePresence, purple_presence_pointer)
 #define PURPLE_STATUS(rb_ruburple_blist_status,purple_status_pointer) Data_Get_Struct(rb_ruburple_blist_status, PurpleStatus, purple_status_pointer)
 #define GPOINTER(rb_ruburple_pointer,gpointer) Data_Get_Struct(rb_ruburple_pointer, void, gpointer)
 
@@ -504,6 +501,12 @@ ruburple_get_protocols(gpointer data)
   return (gpointer) purple_plugins_get_protocols();
 }
 
+static gpointer
+ruburple_get_protocol(gpointer data)
+{
+  return (gpointer) purple_plugins_find_with_name((char *) data);
+}
+
 static VALUE
 rb_ruburple_get_protocols(VALUE self)
 {
@@ -519,16 +522,23 @@ rb_ruburple_get_protocols(VALUE self)
 
 static VALUE
 rb_ruburple_get_protocol(VALUE self, VALUE name)
+{
+  PurplePlugin *protocol = (PurplePlugin *) call_and_get_result(ruburple_get_protocol, (gpointer) RSTRING(name)->ptr);
+  RETURN_QNIL_IF_NULL(protocol);
+  return RB_RUBURPLE_PROTOCOL(protocol);
+}
+
+static VALUE
+rb_ruburple_has_protocol(VALUE self, VALUE name)
 {
   GList *iter;
-  VALUE return_value;
 
   for (iter = (GList *) call_and_get_result(ruburple_get_protocols, NULL); iter; iter = iter->next) {
     if (strcmp(purple_plugin_get_name((PurplePlugin *) iter->data), RSTRING(name)->ptr) == 0)
-      return RB_RUBURPLE_PROTOCOL(iter->data);
+      return Qtrue;
   }
 
-  return Qnil;
+  return Qfalse;
 }
 
 static gpointer
@@ -619,24 +629,35 @@ rb_ruburple_protocol_account_set_password(VALUE self, VALUE password)
 }
 
 static gpointer
-ruburple_protocol_account_connect(gpointer data)
+ruburple_protocol_account_set_enabled(gpointer data)
 {
-  PurpleAccount *account = (PurpleAccount *) data;
-  purple_account_set_enabled(account, UI_ID, TRUE);
+  gpointer *args = (gpointer *) data;
+  purple_account_set_enabled((PurpleAccount *) args[0], UI_ID, * (gboolean *) args[1]);
   return NULL;
 }
 
 static VALUE
-rb_ruburple_protocol_account_connect(VALUE self)
+rb_ruburple_protocol_account_set_enabled(VALUE self, VALUE enabled_value)
 {
   PurpleAccount *account;
+  gboolean enabled = GBOOL(enabled_value);
+  gpointer args[2];
+
   PURPLE_ACCOUNT(self, account);
+  args[0] = (gpointer) account;
+  args[1] = (gpointer) &enabled;
   
-  call_and_get_result(ruburple_protocol_account_connect, account);
+  call_and_get_result(ruburple_protocol_account_set_enabled, args);
 
   return Qnil;
 }
 
+static VALUE
+rb_ruburple_protocol_account_connect(VALUE self)
+{
+  return rb_ruburple_protocol_account_set_enabled(self, Qtrue);
+}
+
 static gpointer
 ruburple_protocol_account_get_username(gpointer data)
 {
@@ -691,6 +712,23 @@ rb_ruburple_protocol_account_get_alias(VALUE self)
   return rb_str_new2(rval);
 }
 
+static gpointer
+ruburple_protocol_account_get_status(gpointer data)
+{
+  return (gpointer) purple_account_get_active_status((PurpleAccount *) data);
+}
+
+static VALUE
+rb_ruburple_protocol_account_get_status(VALUE self)
+{
+  PurpleAccount *account;
+  PurpleStatus *status;
+  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);
+}
+
 static gpointer
 ruburple_protocol_account_set_savedstatus(gpointer data)
 {
@@ -1163,34 +1201,38 @@ rb_ruburple_protocol_connection_send_im(int argc, VALUE *argv, VALUE self)
 }
 
 static gpointer
-ruburple_protocol_connection_close(gpointer data)
+ruburple_protocol_account_is_connected(gpointer data)
 {
-  PurpleConnection *connection = (PurpleConnection *) data;
-  PurpleAccount *account = purple_connection_get_account(connection);
-  if (!purple_account_is_disconnected(account) && !account->disconnecting)
-    purple_account_disconnect(account);
+  gpointer *args = (gpointer *) data;
+  * (gboolean *) args[1] = purple_account_is_connected((PurpleAccount *) args[0]);
   return NULL;
 }
 
 static VALUE
-rb_ruburple_protocol_connection_close(VALUE self)
+rb_ruburple_protocol_account_is_connected(VALUE self)
 {
-  PurpleConnection *connection;
-  PURPLE_CONNECTION(self, connection);
-  call_and_get_result(ruburple_protocol_connection_close, connection);
-  return Qnil;
+  gpointer args[2];
+  PurpleAccount *account;
+  gboolean tmp;
+  VALUE rval;
+  PURPLE_ACCOUNT(self, account);
+  args[0] = (gpointer) account;
+  args[1] = (gpointer) &tmp;
+  call_and_get_result(ruburple_protocol_account_is_connected, args);
+  rval = BOOL(tmp);
+  return rval;
 }
 
 static gpointer
-ruburple_protocol_account_is_connected(gpointer data)
+ruburple_protocol_account_is_connecting(gpointer data)
 {
   gpointer *args = (gpointer *) data;
-  * (gboolean *) args[1] = purple_account_is_connected((PurpleAccount *) args[0]);
+  * (gboolean *) args[1] = purple_account_is_connecting((PurpleAccount *) args[0]);
   return NULL;
 }
 
 static VALUE
-rb_ruburple_protocol_account_is_connected(VALUE self)
+rb_ruburple_protocol_account_is_connecting(VALUE self)
 {
   gpointer args[2];
   PurpleAccount *account;
@@ -1199,7 +1241,7 @@ rb_ruburple_protocol_account_is_connected(VALUE self)
   PURPLE_ACCOUNT(self, account);
   args[0] = (gpointer) account;
   args[1] = (gpointer) &tmp;
-  call_and_get_result(ruburple_protocol_account_is_connected, args);
+  call_and_get_result(ruburple_protocol_account_is_connecting, args);
   rval = BOOL(tmp);
   return rval;
 }
@@ -1218,6 +1260,14 @@ rb_ruburple_protocol_connection_get_account(VALUE self)
   return RB_RUBURPLE_PROTOCOL_ACCOUNT((PurpleAccount *) call_and_get_result(ruburple_protocol_connection_get_account, (gpointer) plugin));
 }
 
+static VALUE
+rb_ruburple_protocol_connection_close(VALUE self)
+{
+  VALUE account = rb_ruburple_protocol_connection_get_account(self);
+  rb_ruburple_protocol_account_set_enabled(account, Qfalse);
+  return Qnil;
+}
+
 static gpointer
 ruburple_protocol_account_get_buddy(gpointer data)
 {
@@ -1312,47 +1362,49 @@ rb_ruburple_blist_buddy_get_name(VALUE self)
 }
 
 static gpointer
-ruburple_blist_buddy_get_presence(gpointer data)
+ruburple_blist_status_get_name(gpointer data)
 {
-  return (gpointer) purple_buddy_get_presence((PurpleBuddy *) data);
+  PurpleStatus *status = (PurpleStatus *) data;
+  return (gpointer) purple_status_get_name(status);
 }
 
 static VALUE
-rb_ruburple_blist_buddy_get_presence(VALUE self)
+rb_ruburple_blist_status_get_name(VALUE self)
 {
-  PurpleBuddy *buddy;
-  PURPLE_BUDDY(self, buddy);
-  return RB_RUBURPLE_BLIST_PRESENCE((PurplePresence *) call_and_get_result(ruburple_blist_buddy_get_presence, (gpointer) buddy));
+  PurpleStatus *status;
+  PURPLE_STATUS(self, status);
+  return rb_str_new2((char *) call_and_get_result(ruburple_blist_status_get_name, (gpointer) status));
 }
 
-static gpointer
-ruburple_blist_presence_get_active_status(gpointer data)
+static VALUE
+rb_ruburple_protocol_account_get_uid(VALUE self)
 {
-  PurplePresence *presence = (PurplePresence *) data;
-  return purple_presence_get_active_status(presence);
+  PurpleAccount *account;
+  PURPLE_ACCOUNT(self, account);
+  return INT2NUM((int) account);
 }
 
 static VALUE
-rb_ruburple_blist_presence_get_active_status(VALUE self)
+rb_ruburple_protocol_connection_get_protocol(VALUE self)
 {
-  PurplePresence *presence;
-  PURPLE_PRESENCE(self, presence);
-  return RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_presence_get_active_status, (gpointer) presence));
+  PurpleConnection *connection;
+  PURPLE_CONNECTION(self, connection);
+  RETURN_QNIL_IF_NULL(connection->prpl);
+  return RB_RUBURPLE_PROTOCOL(connection->prpl);
 }
 
 static gpointer
-ruburple_blist_status_get_name(gpointer data)
+ruburple_blist_buddy_get_status(gpointer data)
 {
-  PurpleStatus *status = (PurpleStatus *) data;
-  return (gpointer) purple_status_get_name(status);
+  return (gpointer) purple_presence_get_active_status(purple_buddy_get_presence((PurpleBuddy *) data));
 }
 
 static VALUE
-rb_ruburple_blist_status_get_name(VALUE self)
+rb_ruburple_blist_buddy_get_status(VALUE self)
 {
-  PurpleStatus *status;
-  PURPLE_STATUS(self, status);
-  return rb_str_new2((char *) call_and_get_result(ruburple_blist_status_get_name, (gpointer) status));
+  PurpleBuddy *buddy;
+  PURPLE_BUDDY(self, buddy);
+  return RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_buddy_get_status, (gpointer) buddy));
 }
 
 #ifdef __cplusplus
@@ -1387,7 +1439,8 @@ extern "C" {
     rb_define_singleton_method(rb_ruburple, "debug=", rb_ruburple_set_debug, 1);
     rb_define_singleton_method(rb_ruburple, "protocols", rb_ruburple_get_protocols, 0);
     rb_define_singleton_method(rb_ruburple, "get_protocol", rb_ruburple_get_protocol, 1);
-    rb_define_singleton_method(rb_ruburple, "init", rb_ruburple_init, 0);
+    rb_define_singleton_method(rb_ruburple, "has_protocol?", rb_ruburple_has_protocol, 1);
+    rb_define_singleton_method(rb_ruburple, "_init", rb_ruburple_init, 0);
     rb_define_singleton_method(rb_ruburple, "_subscribe", rb_ruburple_subscribe, 3);
     rb_define_singleton_method(rb_ruburple, "_read_event", rb_ruburple_read_event, 0);
     rb_define_const(rb_ruburple, "MESSAGE_SEND", INT2NUM(PURPLE_MESSAGE_SEND)); /**< Outgoing message.        */
@@ -1441,15 +1494,19 @@ extern "C" {
     rb_ruburple_protocol_account = rb_define_class_under(rb_ruburple, "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);
     rb_define_method(rb_ruburple_protocol_account, "savedstatus=", rb_ruburple_protocol_account_set_savedstatus, 1);
     rb_define_method(rb_ruburple_protocol_account, "connection", rb_ruburple_protocol_account_get_connection, 0);
     rb_define_method(rb_ruburple_protocol_account, "connected?", rb_ruburple_protocol_account_is_connected, 0);
+    rb_define_method(rb_ruburple_protocol_account, "connecting?", rb_ruburple_protocol_account_is_connecting, 0);
     rb_define_method(rb_ruburple_protocol_account, "username", rb_ruburple_protocol_account_get_username, 0);
     rb_define_method(rb_ruburple_protocol_account, "password", rb_ruburple_protocol_account_get_password, 0);
     rb_define_method(rb_ruburple_protocol_account, "alias", rb_ruburple_protocol_account_get_alias, 0);
     rb_define_method(rb_ruburple_protocol_account, "has_buddy?", rb_ruburple_protocol_account_has_buddy, 1);
     rb_define_method(rb_ruburple_protocol_account, "get_buddy", rb_ruburple_protocol_account_get_buddy, 1);
     rb_define_method(rb_ruburple_protocol_account, "buddies", rb_ruburple_protocol_account_get_buddies, -1);
+    rb_define_method(rb_ruburple_protocol_account, "uid", rb_ruburple_protocol_account_get_uid, 0);
+    rb_define_method(rb_ruburple_protocol_account, "status", rb_ruburple_protocol_account_get_status, 0);
 
     rb_ruburple_protocol_account_conversation = rb_define_class_under(rb_ruburple_protocol_account, "Conversation", rb_cObject);
 
@@ -1472,6 +1529,7 @@ extern "C" {
 
     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);
+    rb_define_method(rb_ruburple_protocol_connection, "protocol", rb_ruburple_protocol_connection_get_protocol, 0);
     rb_define_method(rb_ruburple_protocol_connection, "close", rb_ruburple_protocol_connection_close, 0);
     rb_define_method(rb_ruburple_protocol_connection, "account", rb_ruburple_protocol_connection_get_account, 0);
 
@@ -1482,10 +1540,7 @@ extern "C" {
     rb_ruburple_blist_buddy = rb_define_class_under(rb_ruburple_blist, "Buddy", rb_ruburple_blist_node);
     rb_define_method(rb_ruburple_blist_buddy, "account", rb_ruburple_blist_buddy_get_account, 0);
     rb_define_method(rb_ruburple_blist_buddy, "name", rb_ruburple_blist_buddy_get_name, 0);
-    rb_define_method(rb_ruburple_blist_buddy, "presence", rb_ruburple_blist_buddy_get_presence, 0);
-
-    rb_ruburple_blist_presence = rb_define_class_under(rb_ruburple_blist, "Presence", rb_cObject);
-    rb_define_method(rb_ruburple_blist_presence, "active_status", rb_ruburple_blist_presence_get_active_status, 0);
+    rb_define_method(rb_ruburple_blist_buddy, "status", rb_ruburple_blist_buddy_get_status, 0);
 
     rb_ruburple_blist_group = rb_define_class_under(rb_ruburple_blist, "Group", rb_ruburple_blist_node);
 

data/lib/ruburple/ruburple.rb

@@ -95,17 +95,20 @@ module Ruburple
     self._subscribe(subsystem_handle, event.to_s.gsub(/_/, "-"), callable)
   end
 
-  @@event_fetcher.kill if defined?(@@event_fetcher) && @@event_fetcher
-  @@event_fetcher = Thread.new do
-    loop do
-      begin
-        select([EVENT_INPUT], nil, nil)
-        _read_event
-      rescue Exception => e
-        puts "#{e.class}: #{e}"
-        pp e.backtrace
+  def self.init
+    @@event_fetcher.kill if defined?(@@event_fetcher) && @@event_fetcher
+    @@event_fetcher = Thread.new do
+      loop do
+        begin
+          select([EVENT_INPUT], nil, nil)
+          _read_event
+        rescue Exception => e
+          puts "#{e.class}: #{e}"
+          pp e.backtrace
+        end
       end
     end
+    self._init
   end
   
 end

data/tests/ruburple_test.rb

@@ -39,25 +39,36 @@ class RuburpleTest < Test::Unit::TestCase
 
   def test_operations(protocol)
     puts "testing #{protocol}..."
+    assert(Ruburple::has_protocol?(protocol))
     test_accounts = $TEST_ACCOUNTS[protocol]
     p = Ruburple::get_protocol(protocol)
-    puts "testing sign on..."
+    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)
+    puts "testing connecting..."
+    assert(!a1.connecting?)
     a1.connect
+    assert(a1.connecting?)
+    puts "testing sign on..."
     assert_within(30) do 
       @@events[:signed_on].find do |e|
         e.account.username == a1.username
       end
     end
+    assert(!a1.connecting?)
+    assert(a1.connected?)
+    puts "testing uid..."
+    assert(a1.uid != a2.uid)
+    assert_equal(a1.uid, a1.connection.account.uid)
     puts "testing buddies..."
     assert(a1.has_buddy?(a2.username))
     assert(buddy2 = a1.buddies.find do |b|
              b.name == a2.username
            end)
     puts "testing presence..."
-    assert_equal("Offline", buddy2.presence.active_status.name)
-    a2.connect
+    assert_equal("Offline", buddy2.status.name)
+    puts "testing set enabled..."
+    a2.enabled = true
     assert_within(30) do 
       @@events[:signed_on].find do |e|
         e.account.username == a2.username
@@ -70,10 +81,10 @@ class RuburpleTest < Test::Unit::TestCase
            end)
     puts "testing presence..."
     assert_within(30) do
-      buddy1.presence.active_status.name == "Available"
+      buddy1.status.name == "Available"
     end
     assert_within(30) do
-      buddy2.presence.active_status.name == "Available"
+      buddy2.status.name == "Available"
     end
     puts "testing send im..."
     a1.connection.send_im(a2.username, "hello a2")
@@ -87,11 +98,11 @@ class RuburpleTest < Test::Unit::TestCase
       end
       a1_got_message && a2_got_message
     end
-    puts "testing close..."
-    a1.connection.close
+    puts "testing set enabled..."
+    a1.enabled = false
     puts "testing presence..."
     assert_within(30) do
-      buddy1.presence.active_status.name == "Offline"
+      buddy1.status.name == "Offline"
     end
     puts "testing close..."
     a2.connection.close

metadata

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