revolution 0.4 → 0.5

data/extconf.rb

@@ -5,7 +5,8 @@ pkg_config('libecal-1.2') || pkg_config('libecal-1.0')
 pkg_config('evolution-data-server-1.2') || pkg_config('evolution-data-server-1.0')
 pkg_config('glib-2.0')
 
-$CPPFLAGS += " -Wall "
+$CPPFLAGS += " -Wall"
+#$CPPFLAGS += " -W -Wwrite-strings -Waggregate-return -Wnested-externs -Wundef -Wpointer-arith -Wcast-align -Wshadow -Werror"
 
 create_makefile("revolution")
 

data/revolution.c

@@ -1,10 +1,20 @@
 #include <stdio.h>
 #include "ruby.h"
 #include <libebook/e-book.h>
+#include <libebook/e-contact.h>
 #include <libecal/e-cal.h>
 
-VALUE cRevolution;
-VALUE module;
+
+static VALUE rb_cRevolution;
+static VALUE rb_cRevolutionException;
+static VALUE rb_mRevolution;
+static VALUE rb_cAppointment;
+static VALUE rb_cTask;
+static VALUE rb_cContact;
+static VALUE rb_cContactAddress;
+static VALUE rb_cContactIMAddress;
+
+static GHashTable* im_hash;
 
 /* 
  *	call-seq:
@@ -16,10 +26,26 @@ static VALUE revolution_init(VALUE self) {
 	return Qnil;
 }
 
-static gint cal_opened_status = -1;
+void check_error(GError* error, const char* msg_fmt) {
+	if (error) {
+		char* msg = g_strdup(error->message);
+		g_clear_error(&error);
+		rb_raise(rb_cRevolutionException, msg_fmt, msg);
+	}
+}
 
-static void revolution_calendar_opened_callback(ECal* calendar, gint arg, gpointer user_data) {
-	cal_opened_status = arg;
+ECal* open_cal(short open_tasks) {
+	// This works, but what about getting an ESourceList and all that?
+	ECal* cal;
+	if (open_tasks) {
+	 	cal = e_cal_new_system_tasks();
+	} else {
+	 	cal = e_cal_new_system_calendar();
+	}
+	GError* error = 0;
+	e_cal_open(cal, FALSE, &error);
+	check_error(error, "Unable to open calendar: %s");
+	return cal;
 }
 
 void copy_summary(const VALUE ruby_obj, ECalComponent* ev_obj) {
@@ -56,8 +82,6 @@ void copy_uid(const VALUE ruby_obj, ECalComponent* ev_obj) {
 
 ///////////////////////////////////////////////////////
 // Tasks
-VALUE cTask;
-
 /* 
  *	call-seq:
  *		new() -> Task
@@ -138,50 +162,24 @@ void copy_into_task(const VALUE ruby_task, ECalComponent* ev_task) {
  * Fetches all tasks 
  */
 static VALUE revolution_get_all_tasks(VALUE self) {
-	VALUE result = rb_ary_new();
-
- 	ECal* cal = e_cal_new_system_tasks();
-	g_signal_connect(G_OBJECT(cal), "cal-opened", G_CALLBACK(revolution_calendar_opened_callback), NULL);
-	GError* error = 0;
-	e_cal_open(cal, FALSE, &error);
-	if (error) {
-		g_warning("Unable to open calendar: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-
-	while (cal_opened_status == -1) {
-		g_usleep(G_USEC_PER_SEC*0.01);
-	}
-	if (cal_opened_status != 0) {
-		g_warning("Unable to open calendar; error code %d", cal_opened_status);
-		return result;
-	}
-	
+	ECal* cal = open_cal(1);
 	GList* objects, *l;
-	// #t == true, i.e. return everything
+	GError* error = 0;
 	e_cal_get_object_list_as_comp(cal, "#t", &objects, &error);
-	if (error) {
-		g_warning("Unable to query calendar: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-
+	check_error(error, "Unable to query calendar: %s");
+	VALUE result = rb_ary_new();
 	for (l = objects; l;l = l->next) {
     ECalComponent *ev_task = E_CAL_COMPONENT (l->data);
-		VALUE ruby_task = rb_class_new_instance(0, 0, cTask);
+		VALUE ruby_task = rb_class_new_instance(0, 0, rb_cTask);
 		copy_into_task(ruby_task, ev_task);
 		rb_ary_push(result, ruby_task);	
     g_object_unref (ev_task);
   }
-
 	return result;
 }
 
 ///////////////////////////////////////////////////////
 // Calendar
-VALUE cAppointment;
-
 /* 
  *	call-seq:
  *		new() -> Appointment
@@ -249,55 +247,26 @@ void copy_into_appt(const VALUE ruby_appt, ECalComponent* ev_appt) {
  * Fetches all appointments between the given Time values.
  */
 static VALUE revolution_get_all_appointments(VALUE self, VALUE start, VALUE end) {
-	VALUE result = rb_ary_new();
-
-	// This works, but what about getting an ESourceList and all that?
- 	ECal* cal = e_cal_new_system_calendar();
-	g_signal_connect(G_OBJECT(cal), "cal-opened", G_CALLBACK(revolution_calendar_opened_callback), NULL);
+ 	ECal* cal = open_cal(0);
 	GError* error = 0;
-	e_cal_open(cal, FALSE, &error);
-	if (error) {
-		g_warning("Unable to open calendar: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-
-	while (cal_opened_status == -1) {
-		g_usleep(G_USEC_PER_SEC*0.01);
-	}
-	if (cal_opened_status != 0) {
-		g_warning("Unable to open calendar; error code %d", cal_opened_status);
-		return result;
-	}
-	
 	GList* results, *l;
 	e_cal_get_object_list_as_comp(cal, "#t", &results, &error);
-	if (error) {
-		g_warning("Unable to query calendar: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-
+	check_error(error, "Unable to query calendar %s");
+	VALUE result = rb_ary_new();
 	for (l = results; l;l = l->next) {
     ECalComponent *ev_appt = E_CAL_COMPONENT(l->data);
-		VALUE ruby_appt = rb_class_new_instance(0, 0, cAppointment);
+		VALUE ruby_appt = rb_class_new_instance(0, 0, rb_cAppointment);
 		copy_into_appt(ruby_appt, ev_appt);
 		rb_ary_push(result, ruby_appt);	
     g_object_unref (ev_appt);
   }
-
   g_list_free(results);
-
 	return result;
 }
 
 
 ///////////////////////////////////////////////////////
 // Address Book
-VALUE cContact;
-VALUE cContactAddress;
-VALUE cContactIMAddress;
-
 /* 
  *	call-seq:
  *		new() -> Contact
@@ -321,6 +290,7 @@ VALUE cContactIMAddress;
  *  @im_addresses [Array] An Array of ContactIMAddress objects
  */
 static VALUE contact_init(VALUE self) {
+	rb_iv_set(self, "@im_addresses", rb_ary_new());
   return Qtrue;
 }
 
@@ -332,12 +302,16 @@ static VALUE contact_init(VALUE self) {
  *
  * Attributes:
  *  @provider [String] i.e., AOL, Yahoo
+ *  @location [String] HOME or WORK
  *  @address [String] i.e., tom_copeland
- *  @type [String] HOME or WORK
  */
-static VALUE contactIMAddress_init(VALUE self) {
+static VALUE contactIMAddress_init(VALUE self, VALUE provider, VALUE location, VALUE address) {	
+	rb_iv_set(self, "@provider", provider);
+	rb_iv_set(self, "@location", location);
+	rb_iv_set(self, "@address", address);
   return Qtrue;
 }
+
 /* 
  *	call-seq:
  *		new() -> ContactAddress
@@ -358,9 +332,21 @@ static VALUE contactAddress_init(VALUE self) {
   return Qtrue;
 }
 
-void copy_in_address(EContactAddress* address, VALUE ruby_contact, char* field) {
+EBook* open_book() {
+  GError* error = 0;
+  EBook* book = e_book_new_default_addressbook(&error);
+	check_error(error, "Unable to locate the default Evolution address book: %s");
+  e_book_open(book, TRUE, &error);
+	check_error(error, "Unable to open the Evolution address book: %s");
+	if (!book) {
+		rb_raise(rb_cRevolutionException, "Unable to open EBook");
+	}
+	return book;
+}
+
+void address_importer(EContactAddress* address, VALUE ruby_contact, const char* field) {
 	if (address) {
-		VALUE rb_addr = rb_class_new_instance(0, 0, cContactAddress);
+		VALUE rb_addr = rb_class_new_instance(0, 0, rb_cContactAddress);
 		rb_iv_set(rb_addr, "@address_format", address->address_format ? rb_str_new2(address->address_format) : Qnil);
 		rb_iv_set(rb_addr, "@po", address->po ? rb_str_new2(address->po) : Qnil);
 		rb_iv_set(rb_addr, "@ext", address->ext ? rb_str_new2(address->ext) : Qnil);
@@ -369,95 +355,99 @@ void copy_in_address(EContactAddress* address, VALUE ruby_contact, char* field)
 		rb_iv_set(rb_addr, "@region", address->region ? rb_str_new2(address->region) : Qnil);
 		rb_iv_set(rb_addr, "@code", address->code ? rb_str_new2(address->code) : Qnil);
 		rb_iv_set(rb_addr, "@country", address->country ? rb_str_new2(address->country) : Qnil);
-	
 		rb_iv_set(ruby_contact, field, rb_addr);
 		e_contact_address_free(address);
 	}
 }
 
-void copy_in_im_address(VALUE im_addresses, char* address, char* provider, char* location) {
-	if (!address) {
-		return;
-	}
-	VALUE rb_addr = rb_class_new_instance(0, 0, cContactIMAddress);
-	rb_iv_set(rb_addr, "@provider", rb_str_new2(provider));
-	rb_iv_set(rb_addr, "@location", rb_str_new2(location));
-	rb_iv_set(rb_addr, "@address", rb_str_new2(address));
-	rb_ary_push(im_addresses, rb_addr);
+void string_importer(const VALUE ruby_contact, EContact* ev_contact, const char* ruby_iv_name, int ev_field) {
+	char* value = e_contact_get(ev_contact, ev_field);
+	rb_iv_set(ruby_contact, ruby_iv_name, value ? rb_str_new2(value) : Qnil);
 }
 
-void copy_into_contact(const VALUE ruby_contact, EContact* ev_contact) {
-	// last mod time will work in v2.16+ :  e_contact_get (ev_contact, E_CONTACT_REV));
-	// what's the best way to handle version differences?  #ifdef them in?
-
-	rb_iv_set(ruby_contact, "@uid", rb_str_new2(e_contact_get(ev_contact, E_CONTACT_UID)));
-
-	char* value = e_contact_get(ev_contact, E_CONTACT_GIVEN_NAME);
-	rb_iv_set(ruby_contact, "@first_name", value ? rb_str_new2(value) : Qnil);
-
-	value = e_contact_get(ev_contact, E_CONTACT_FAMILY_NAME);
-	rb_iv_set(ruby_contact, "@last_name", value ? rb_str_new2(value) : Qnil);
-
-	value = e_contact_get(ev_contact, E_CONTACT_PHONE_HOME);
-	rb_iv_set(ruby_contact, "@home_phone", value ? rb_str_new2(value) : Qnil);
-
-	value = e_contact_get(ev_contact, E_CONTACT_PHONE_BUSINESS);
-	rb_iv_set(ruby_contact, "@work_phone", value ? rb_str_new2(value) : Qnil);
-		
-	value = e_contact_get(ev_contact, E_CONTACT_PHONE_MOBILE);
-	rb_iv_set(ruby_contact, "@mobile_phone", value ? rb_str_new2(value) : Qnil);
-	
-	value = e_contact_get(ev_contact, E_CONTACT_ORG);
-	rb_iv_set(ruby_contact, "@organization", value ? rb_str_new2(value) : Qnil);
-		
-	value = e_contact_get(ev_contact, E_CONTACT_TITLE);
-	rb_iv_set(ruby_contact, "@title", value ? rb_str_new2(value) : Qnil);
-		
-	EContactDate *birth_date = e_contact_get(ev_contact, E_CONTACT_BIRTH_DATE);
-	if (birth_date) {
-		rb_iv_set(ruby_contact, "@birthday", rb_funcall(rb_cTime, rb_intern("gm"), 6, INT2NUM(birth_date->year), INT2NUM(birth_date->month), INT2NUM(birth_date->day), INT2NUM(0), INT2NUM(0), INT2NUM(0)));
-		e_contact_date_free(birth_date);
+void date_importer(const VALUE ruby_contact, EContact* ev_contact, const char* ruby_iv_name, int ev_field) {
+	EContactDate* date = e_contact_get(ev_contact, ev_field);
+	if (date) {
+		rb_iv_set(ruby_contact, ruby_iv_name, rb_funcall(rb_cTime, rb_intern("gm"), 6, INT2NUM(date->year), INT2NUM(date->month), INT2NUM(date->day), INT2NUM(0), INT2NUM(0), INT2NUM(0)));
+		e_contact_date_free(date);
 	}
+}
 
-	rb_iv_set(ruby_contact, "@email_addresses", rb_hash_new());
-	if (e_contact_get(ev_contact, E_CONTACT_EMAIL)) {
-		GList* attrs, *attr;
-		attrs = e_contact_get_attributes(ev_contact, E_CONTACT_EMAIL);
-		for (attr = attrs; attr; attr = attr->next) {
-			EVCardAttribute* a = attr->data;
-			GList* l;
-			for (l = e_vcard_attribute_get_params(a); l; l = l->next) {
-				EVCardAttributeParam* p = l->data;
-				if (!g_ascii_strcasecmp((char*)e_vcard_attribute_param_get_name(p), "TYPE")) {
-					VALUE email_addresses = rb_iv_get(ruby_contact, "@email_addresses");
-					VALUE rb_type = rb_str_new2(e_vcard_attribute_param_get_values(p)->data);
-					if (rb_hash_aref(email_addresses, rb_type) == Qnil) {
-						rb_hash_aset(email_addresses, rb_type, rb_ary_new());
-					}
-					rb_ary_push(rb_hash_aref(email_addresses, rb_type), rb_str_new2(e_vcard_attribute_get_value(a)));
+void email_importer(VALUE ruby_contact, EContact* ev_contact) {
+	VALUE email_addresses = rb_hash_new();
+	GList* attrs = e_contact_get_attributes(ev_contact, E_CONTACT_EMAIL), *attr = NULL;
+	for (attr = attrs; attr; attr = attr->next) {
+		GList* l;
+		for (l = e_vcard_attribute_get_params(attr->data); l; l = l->next) {
+			if (!g_ascii_strcasecmp((char*)e_vcard_attribute_param_get_name(l->data), "TYPE")) {
+				VALUE rb_addr_type = rb_str_new2(e_vcard_attribute_param_get_values(l->data)->data);
+				if (rb_hash_aref(email_addresses, rb_addr_type) == Qnil) {
+					rb_hash_aset(email_addresses, rb_addr_type, rb_ary_new());
 				}
+				rb_ary_push(rb_hash_aref(email_addresses, rb_addr_type), rb_str_new2(e_vcard_attribute_get_value(attr->data)));
 			}
-		}	
+		}
+	}	
+	rb_iv_set(ruby_contact, "@email_addresses", email_addresses);
+}
+
+void im_importer(const VALUE ruby_contact, const char* address, const char* provider, const char* location) {
+	if (!address) {
+		return;
 	}
+	VALUE args[3] = {rb_str_new2(provider), rb_str_new2(location), rb_str_new2(address)};
+	VALUE rb_addr = rb_class_new_instance(3, args, rb_cContactIMAddress);
+	VALUE ary = rb_iv_get(ruby_contact, "@im_addresses");
+	rb_ary_push(ary, rb_addr);
+	rb_iv_set(ruby_contact, "@im_addresses", ary);
+}
+
+GList* run_query(EBook* book, EBookQuery* query) {
+  GError* error = 0;
+  GList* results = NULL;
+  e_book_get_contacts(book, query, &results, &error);
+	check_error(error, "Unable to query the Evolution address book: %s");
+	return results;
+}
 
-	copy_in_address(e_contact_get(ev_contact, E_CONTACT_ADDRESS_HOME), ruby_contact, "@home_address");
-	copy_in_address(e_contact_get(ev_contact, E_CONTACT_ADDRESS_WORK), ruby_contact, "@work_address");
-	copy_in_address(e_contact_get(ev_contact, E_CONTACT_ADDRESS_OTHER), ruby_contact, "@other_address");
-
-	VALUE im_addresses = rb_ary_new();
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_AIM_HOME_1), "AIM", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_AIM_WORK_1), "AIM", "WORK");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_YAHOO_HOME_1), "Yahoo", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_YAHOO_WORK_1), "Yahoo", "WORK");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_GROUPWISE_HOME_1), "Groupwise", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_GROUPWISE_WORK_1), "Groupwise", "WORK");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_JABBER_HOME_1), "Jabber", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_JABBER_WORK_1), "Jabber", "WORK");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_MSN_HOME_1), "MSN", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_MSN_WORK_1), "MSN", "WORK");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_ICQ_HOME_1), "ICQ", "HOME");
-	copy_in_im_address(im_addresses, e_contact_get(ev_contact, E_CONTACT_IM_ICQ_WORK_1), "ICQ", "WORK");
-	rb_iv_set(ruby_contact, "@im_addresses", im_addresses);
+VALUE copy_contacts(GList* results) {
+	VALUE result = rb_ary_new();
+	GList* l = NULL;
+  for (l = results; l; l = l->next) {
+  	EContact* ev_contact = E_CONTACT(l->data);
+		VALUE ruby_contact = rb_class_new_instance(0, 0, rb_cContact);
+		// last mod time will work in v2.16+ :  e_contact_get (ev_contact, E_CONTACT_REV));
+		// what's the best way to handle version differences?  #ifdef them in?
+		string_importer(ruby_contact, ev_contact, "@uid", E_CONTACT_UID);
+		string_importer(ruby_contact, ev_contact, "@first_name", E_CONTACT_GIVEN_NAME);
+		string_importer(ruby_contact, ev_contact, "@last_name", E_CONTACT_FAMILY_NAME);
+		string_importer(ruby_contact, ev_contact, "@home_phone", E_CONTACT_PHONE_HOME);
+		string_importer(ruby_contact, ev_contact, "@work_phone", E_CONTACT_PHONE_BUSINESS);
+		string_importer(ruby_contact, ev_contact, "@mobile_phone", E_CONTACT_PHONE_MOBILE);
+		string_importer(ruby_contact, ev_contact, "@organization", E_CONTACT_ORG);
+		string_importer(ruby_contact, ev_contact, "@title", E_CONTACT_TITLE);
+		date_importer(ruby_contact, ev_contact, "@birthday", E_CONTACT_BIRTH_DATE);
+		email_importer(ruby_contact, ev_contact);
+		address_importer(e_contact_get(ev_contact, E_CONTACT_ADDRESS_HOME), ruby_contact, "@home_address");
+		address_importer(e_contact_get(ev_contact, E_CONTACT_ADDRESS_WORK), ruby_contact, "@work_address");
+		address_importer(e_contact_get(ev_contact, E_CONTACT_ADDRESS_OTHER), ruby_contact, "@other_address");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_AIM_HOME_1), "AIM", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_AIM_WORK_1), "AIM", "WORK");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_YAHOO_HOME_1), "Yahoo", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_YAHOO_WORK_1), "Yahoo", "WORK");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_GROUPWISE_HOME_1), "Groupwise", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_GROUPWISE_WORK_1), "Groupwise", "WORK");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_JABBER_HOME_1), "Jabber", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_JABBER_WORK_1), "Jabber", "WORK");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_MSN_HOME_1), "MSN", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_MSN_WORK_1), "MSN", "WORK");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_ICQ_HOME_1), "ICQ", "HOME");
+		im_importer(ruby_contact, e_contact_get(ev_contact, E_CONTACT_IM_ICQ_WORK_1), "ICQ", "WORK");
+		rb_ary_push(result, ruby_contact);	
+  	g_object_unref(ev_contact);
+	}
+  g_list_free(results);
+	return result;
 }
 
 /* 
@@ -467,60 +457,12 @@ void copy_into_contact(const VALUE ruby_contact, EContact* ev_contact) {
  * Fetches all contacts 
  */
 static VALUE revolution_get_all_contacts(VALUE self) {
-	VALUE result = rb_ary_new();
-  GError* error = 0;
-  EBook* book = e_book_new_default_addressbook(&error);
-	if (error != NULL) {
-		g_warning("Unable to locate the default Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-  e_book_open(book, TRUE, &error);
-	if (error) {
-		g_warning("Unable to open the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-
   EBookQuery* query = e_book_query_any_field_contains("");
-
-  GList* results, *l = NULL;
-  e_book_get_contacts(book, query, &results, &error);
-	if (error) {
-		g_warning("Unable to query the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return result;
-	}
-  for (l = results; l; l = l->next) {
-  	EContact* ev_contact = E_CONTACT(l->data);
-		VALUE ruby_contact = rb_class_new_instance(0, 0, cContact);
-		copy_into_contact(ruby_contact, ev_contact);
-		rb_ary_push(result, ruby_contact);	
-  	g_object_unref(ev_contact);
-  }
+	VALUE result = copy_contacts(run_query(open_book(), query));
   e_book_query_unref(query);
-  g_list_free(results);
-
 	return result;
 }
 
-EBook* open_book() {
-  GError* error = 0;
-  EBook* book = e_book_new_default_addressbook(&error);
-	if (error != NULL) {
-		g_warning("Unable to locate the default Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return NULL;
-	}
-  e_book_open(book, TRUE, &error);
-	if (error) {
-		g_warning("Unable to open the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return NULL;
-	}
-	return book;
-}
-
 /* 
  *	call-seq:
  *		get_contacts_with_query(query)
@@ -529,32 +471,9 @@ EBook* open_book() {
  * return any contacts whose named contained "Smith" - Joe Smith, Fred Smithson, etc.
  */
 static VALUE revolution_get_contacts_with_query(VALUE self, VALUE rb_query) {
-	VALUE result = rb_ary_new();
-	EBook* book = open_book();
-	if (!book) {
-		return Qnil;
-	}
-	
-  EBookQuery* query = e_book_query_from_string(RSTRING(StringValue(rb_query))->ptr);
-  GError* error = 0;
-  GList* results, *l = NULL;
-  e_book_get_contacts(book, query, &results, &error);
-	if (error) {
-		g_warning("Unable to query the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return Qnil;
-	}
-
-  for (l = results; l; l = l->next) {
-  	EContact* ev_contact = E_CONTACT(l->data);
-		VALUE ruby_contact = rb_class_new_instance(0, 0, cContact);
-		copy_into_contact(ruby_contact, ev_contact);
-		rb_ary_push(result, ruby_contact);	
-  	g_object_unref(ev_contact);
-	}
+	EBookQuery* query = e_book_query_from_string(RSTRING(StringValue(rb_query))->ptr);
+	VALUE result = copy_contacts(run_query(open_book(), query));
   e_book_query_unref(query);
-  g_list_free(results);
-
 	return result;
 }
 
@@ -565,33 +484,9 @@ static VALUE revolution_get_contacts_with_query(VALUE self, VALUE rb_query) {
  * Gets contacts by name; returns any name that contains the passed in parameter
  */
 static VALUE revolution_get_contacts_by_name(VALUE self, VALUE rb_name) {
-	VALUE result = rb_ary_new();
-  GError* error = 0;
-	EBook* book = open_book();
-	if (!book) {
-		return Qnil;
-	}
-	char* name = RSTRING(StringValue(rb_name))->ptr;
-  char* query_str = g_strdup_printf ("(contains \"full_name\" \"%s\")", name);
-  EBookQuery* query = e_book_query_from_string(query_str);
-  GList* results, *l = NULL;
-  e_book_get_contacts(book, query, &results, &error);
-	if (error) {
-		g_warning("Unable to query the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return Qnil;
-	}
-
-  for (l = results; l; l = l->next) {
-  	EContact* ev_contact = E_CONTACT(l->data);
-		VALUE ruby_contact = rb_class_new_instance(0, 0, cContact);
-		copy_into_contact(ruby_contact, ev_contact);
-		rb_ary_push(result, ruby_contact);	
-  	g_object_unref(ev_contact);
-	}
+	EBookQuery* query = e_book_query_from_string(g_strdup_printf ("(contains \"full_name\" \"%s\")", RSTRING(StringValue(rb_name))->ptr));
+	VALUE result = copy_contacts(run_query(open_book(), query));
   e_book_query_unref(query);
-  g_list_free(results);
-
 	return result;
 }
 
@@ -602,35 +497,14 @@ static VALUE revolution_get_contacts_by_name(VALUE self, VALUE rb_name) {
  * Gets a single contact by the Evolution unique id
  */
 static VALUE revolution_get_contact_by_uid(VALUE self, VALUE contact_uid) {
-  GError* error = 0;
-	EBook* book = open_book();
-	if (!book) {
-		return Qnil;
-	}
-	
 	char* uid = RSTRING(StringValue(contact_uid))->ptr;
-  char* query_str = g_strdup_printf ("(is \"id\" \"%s\")", uid);
-  EBookQuery* query = e_book_query_from_string(query_str);
-  GList* results = NULL;
-  e_book_get_contacts(book, query, &results, &error);
-	if (error) {
-		g_warning("Unable to query the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return Qnil;
-	}
-	if (!results) {
-    // A contact for that id wasn't found, so just return nil
-		return Qnil;
+	EBookQuery* query = e_book_query_from_string(g_strdup_printf ("(is \"id\" \"%s\")", uid));
+	VALUE result = rb_ary_pop(copy_contacts(run_query(open_book(), query)));
+	if (result == Qnil) {
+		rb_raise(rb_cRevolutionException, "Unable to find contact with UID %s, so couldn't get it", uid);
 	}
-
-  EContact* ev_contact = E_CONTACT(results->data);
-	VALUE ruby_contact = rb_class_new_instance(0, 0, cContact);
-	copy_into_contact(ruby_contact, ev_contact);
-  g_object_unref(ev_contact);
   e_book_query_unref(query);
-  g_list_free(results);
-
-	return ruby_contact;
+	return result;
 }
 
 /* 
@@ -641,49 +515,34 @@ static VALUE revolution_get_contact_by_uid(VALUE self, VALUE contact_uid) {
  */
 static VALUE revolution_delete_contact(VALUE self, VALUE contact_uid) {
   GError* error = 0;
-	EBook* book = open_book();
-	if (!book) {
-		return Qnil;
-	}
-	
-	char* uid = RSTRING(StringValue(contact_uid))->ptr;
-  char* query_str = g_strdup_printf ("(is \"id\" \"%s\")", uid);
-  EBookQuery* query = e_book_query_from_string(query_str);
-  GList* results = NULL;
-  e_book_get_contacts(book, query, &results, &error);
-	if (error) {
-		g_warning("Unable to query the Evolution address book: %s", error->message);
-		g_clear_error(&error);
-		return Qnil;
-	}
-	if (!results) { // A contact for that id wasn't found, so just bail out
-		return Qnil;
-	}
-	
-	e_book_remove_contact(book, uid, &error);
-	if (error) {
-		g_warning("Unable to delete contact: %s", error->message);
-		g_clear_error(&error);
-	}
-
+	e_book_remove_contact(open_book(), RSTRING(StringValue(contact_uid))->ptr, &error);
+	check_error(error, "Unable to delete contact: %s");
 	return Qnil;
 }
 
-/* 
- *	call-seq:
- *		add_contact(contact) -> [String] the new contact's Evolution unique ID
- *		
- * Adds a contact 
- */
-static VALUE revolution_add_contact(VALUE self, VALUE rb_contact) {
-  GError* error = 0;
-	EBook* book = open_book();
-	if (!book) {
-		return Qnil;
+void export_email_addresses(VALUE email_addresses, GList** email_attrs, const char* type) {
+	VALUE addresses = rb_hash_aref(email_addresses, rb_str_new2(type));
+	if (addresses != Qnil) {
+		addresses = rb_funcall(addresses, rb_intern("reverse"), 0);	
+		VALUE rb_addr = Qnil;
+		while ((rb_addr = rb_ary_pop(addresses)) != Qnil) {
+			char* addr = RSTRING(StringValue(rb_addr))->ptr;
+			EVCardAttribute* attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
+			e_vcard_attribute_add_value(attr, addr);
+			e_vcard_attribute_add_param_with_value(attr, e_vcard_attribute_param_new (EVC_TYPE), type);
+			*email_attrs = g_list_append(*email_attrs, attr);
+		}
 	}
-	
-	EContact* ev_contact = e_contact_new();
+}
+
+void string_exporter(const VALUE rb_contact, EContact* ev_contact, const char* ruby_iv_name, int ev_field) {
+	VALUE value = rb_iv_get(rb_contact, ruby_iv_name);
+	if (value != Qnil) {
+  	e_contact_set(ev_contact, ev_field, RSTRING(StringValue(value))->ptr);
+	}
+}
 
+void name_exporter(const VALUE rb_contact, EContact* ev_contact) {
 	EContactName* name = e_contact_name_new ();
 	VALUE fname = rb_iv_get(rb_contact, "@first_name");
 	if (fname) {
@@ -693,98 +552,161 @@ static VALUE revolution_add_contact(VALUE self, VALUE rb_contact) {
 	if (lname) {
   	name->family = RSTRING(StringValue(lname))->ptr;
 	}
-
   e_contact_set(ev_contact, E_CONTACT_FULL_NAME, e_contact_name_to_string (name));
-	e_book_add_contact(book, ev_contact, &error);
-	// Hm, this causes problems... GLib complains about a double free
-	// e_contact_name_free (name);
+	// Hm, this causes problems... if I leave it here it segfaults,
+  // and if I move to down to after the contact commit call
+  // GLib complains about a double free
+	//e_contact_name_free(name); 
+}
 
-	if (error) {
-		g_warning("Unable to add a contact: %s", error->message);
-		g_clear_error(&error);
-		return Qnil;
+void date_exporter(const VALUE rb_contact, EContact* ev_contact, const char* ruby_iv_name, int ev_field) {
+	VALUE date = rb_iv_get(rb_contact, ruby_iv_name);
+	if (date != Qnil) {
+		EContactDate* d = e_contact_date_new();
+		d->year = NUM2INT(rb_funcall(date, rb_intern("year"), 0));
+		d->month = NUM2INT(rb_funcall(date, rb_intern("mon"), 0));
+		d->day = NUM2INT(rb_funcall(date, rb_intern("day"), 0));
+		e_contact_set(ev_contact, ev_field, d);
+	}
+}
+
+void email_exporter(const VALUE rb_contact, EContact* ev_contact) {
+	VALUE email_addresses = rb_iv_get(rb_contact, "@email_addresses");
+	if (email_addresses != Qnil) {
+		GList* email_attrs = NULL;
+		export_email_addresses(email_addresses, &email_attrs, "WORK");
+		export_email_addresses(email_addresses, &email_attrs, "HOME");
+		export_email_addresses(email_addresses, &email_attrs, "OTHER");
+		if (g_list_length(email_attrs) > 0) {
+			e_contact_set_attributes (ev_contact, E_CONTACT_EMAIL, email_attrs);
+		}
+		g_list_free(email_attrs);
+	}
+}
+
+void im_exporter(const VALUE rb_contact, EContact* ev_contact) {
+	VALUE im_addresses = rb_iv_get(rb_contact, "@im_addresses");
+	if (im_addresses != Qnil) {
+		VALUE rb_addr = Qnil;
+		while ((rb_addr = rb_ary_pop(im_addresses)) != Qnil) {
+			VALUE prov = rb_iv_get(rb_addr, "@provider");
+			char* provider = RSTRING(StringValue(prov))->ptr;
+			VALUE loc = rb_iv_get(rb_addr, "@location");
+			char* location = RSTRING(StringValue(loc))->ptr;
+			VALUE ad = rb_iv_get(rb_addr, "@address");
+			char* addr = RSTRING(StringValue(ad))->ptr;
+			e_contact_set(ev_contact, GPOINTER_TO_INT(g_hash_table_lookup(im_hash, g_strconcat(provider, location, NULL))), addr);
+		}
 	}
+}
 
+/* 
+ *	call-seq:
+ *		add_contact(contact) -> [String] the new contact's Evolution unique ID
+ *		
+ * Adds a contact 
+ */
+static VALUE revolution_add_contact(VALUE self, VALUE rb_contact) {
+	EContact* ev_contact = e_contact_new();
+	name_exporter(rb_contact, ev_contact);
+	string_exporter(rb_contact, ev_contact, "@home_phone", E_CONTACT_PHONE_HOME);
+	string_exporter(rb_contact, ev_contact, "@work_phone", E_CONTACT_PHONE_BUSINESS);
+	string_exporter(rb_contact, ev_contact, "@mobile_phone", E_CONTACT_PHONE_MOBILE);
+	string_exporter(rb_contact, ev_contact, "@organization", E_CONTACT_ORG);
+	string_exporter(rb_contact, ev_contact, "@title", E_CONTACT_TITLE);
+	date_exporter(rb_contact, ev_contact, "@birthday", E_CONTACT_BIRTH_DATE);
+	email_exporter(rb_contact, ev_contact);
+	im_exporter(rb_contact, ev_contact);
+  GError* error = 0;
+	e_book_add_contact(open_book(), ev_contact, &error);
+	check_error(error, "Unable to add contact: %s");
 	return rb_str_new2(e_contact_get(ev_contact, E_CONTACT_UID));
 }
 
+
 /*
  * An interface to the Evolution[http://www.gnome.org/projects/evolution/] 
  * calendar, contact, and task information.
  */
 void Init_revolution() {
-	module = rb_define_module("Revolution");
-
-  cContact = rb_define_class_under(module, "Contact", rb_cObject);
-  rb_define_attr(cContact, "uid", 1, 1);
-  rb_define_attr(cContact, "first_name", 1, 1);
-  rb_define_attr(cContact, "last_name", 1, 1);
-  rb_define_attr(cContact, "home_email", 1, 1);
-  rb_define_attr(cContact, "work_email", 1, 1);
-  rb_define_attr(cContact, "email_addresses", 1, 1);
-  rb_define_attr(cContact, "birthday", 1, 1);
-  rb_define_attr(cContact, "home_phone", 1, 1);
-  rb_define_attr(cContact, "work_phone", 1, 1);
-  rb_define_attr(cContact, "mobile_phone", 1, 1);
-  rb_define_attr(cContact, "home_address", 1, 1);
-  rb_define_attr(cContact, "work_address", 1, 1);
-  rb_define_attr(cContact, "other_address", 1, 1);
-  rb_define_attr(cContact, "organization", 1, 1);
-  rb_define_attr(cContact, "title", 1, 1);
-  rb_define_attr(cContact, "im_addresses", 1, 1);
-  rb_define_method(cContact, "initialize", contact_init, 0);
-  cContactAddress = rb_define_class_under(module, "ContactAddress", rb_cObject);
-  rb_define_attr(cContactAddress, "address_format", 1, 1);
-  rb_define_attr(cContactAddress, "po", 1, 1);
-  rb_define_attr(cContactAddress, "ext", 1, 1);
-  rb_define_attr(cContactAddress, "street", 1, 1);
-  rb_define_attr(cContactAddress, "locality", 1, 1);
-  rb_define_attr(cContactAddress, "region", 1, 1);
-  rb_define_attr(cContactAddress, "code", 1, 1);
-  rb_define_attr(cContactAddress, "country", 1, 1);
-  rb_define_method(cContactAddress, "initialize", contactAddress_init, 0);
-  cContactIMAddress = rb_define_class_under(module, "ContactIMAddress", rb_cObject);
-  rb_define_attr(cContactIMAddress, "provider", 1, 1);
-  rb_define_attr(cContactIMAddress, "location", 1, 1);
-  rb_define_attr(cContactIMAddress, "address", 1, 1);
-  rb_define_method(cContactIMAddress, "initialize", contactIMAddress_init, 0);
-
-  cAppointment = rb_define_class_under(module, "Appointment", rb_cObject);
-  rb_define_attr(cAppointment, "uid", 1, 1);
-  rb_define_attr(cAppointment, "summary", 1, 1);
-  rb_define_attr(cAppointment, "location", 1, 1);
-  rb_define_attr(cAppointment, "organizer", 1, 1);
-  rb_define_attr(cAppointment, "start", 1, 1);
-  rb_define_attr(cAppointment, "end", 1, 1);
-  rb_define_attr(cAppointment, "last_modification", 1, 1);
-  rb_define_attr(cAppointment, "alarm_set", 1, 1);
-  rb_define_attr(cAppointment, "busy_status", 1, 1);
-  rb_define_attr(cAppointment, "recurring", 1, 1);
-  rb_define_method(cAppointment, "initialize", evAppointment_init, 0);
+	rb_mRevolution = rb_define_module("Revolution");
+
+  rb_cContact = rb_define_class_under(rb_mRevolution, "Contact", rb_cObject);
+  rb_define_attr(rb_cContact, "uid", 1, 1);
+  rb_define_attr(rb_cContact, "first_name", 1, 1);
+  rb_define_attr(rb_cContact, "last_name", 1, 1);
+  rb_define_attr(rb_cContact, "home_email", 1, 1);
+  rb_define_attr(rb_cContact, "work_email", 1, 1);
+  rb_define_attr(rb_cContact, "email_addresses", 1, 1);
+  rb_define_attr(rb_cContact, "birthday", 1, 1);
+  rb_define_attr(rb_cContact, "home_phone", 1, 1);
+  rb_define_attr(rb_cContact, "work_phone", 1, 1);
+  rb_define_attr(rb_cContact, "mobile_phone", 1, 1);
+  rb_define_attr(rb_cContact, "home_address", 1, 1);
+  rb_define_attr(rb_cContact, "work_address", 1, 1);
+  rb_define_attr(rb_cContact, "other_address", 1, 1);
+  rb_define_attr(rb_cContact, "organization", 1, 1);
+  rb_define_attr(rb_cContact, "title", 1, 1);
+  rb_define_attr(rb_cContact, "im_addresses", 1, 1);
+  rb_define_method(rb_cContact, "initialize", contact_init, 0);
+  rb_cContactAddress = rb_define_class_under(rb_mRevolution, "ContactAddress", rb_cObject);
+  rb_define_attr(rb_cContactAddress, "address_format", 1, 1);
+  rb_define_attr(rb_cContactAddress, "po", 1, 1);
+  rb_define_attr(rb_cContactAddress, "ext", 1, 1);
+  rb_define_attr(rb_cContactAddress, "street", 1, 1);
+  rb_define_attr(rb_cContactAddress, "locality", 1, 1);
+  rb_define_attr(rb_cContactAddress, "region", 1, 1);
+  rb_define_attr(rb_cContactAddress, "code", 1, 1);
+  rb_define_attr(rb_cContactAddress, "country", 1, 1);
+  rb_define_method(rb_cContactAddress, "initialize", contactAddress_init, 0);
+  rb_cContactIMAddress = rb_define_class_under(rb_mRevolution, "ContactIMAddress", rb_cObject);
+  rb_define_attr(rb_cContactIMAddress, "provider", 1, 1);
+  rb_define_attr(rb_cContactIMAddress, "location", 1, 1);
+  rb_define_attr(rb_cContactIMAddress, "address", 1, 1);
+  rb_define_method(rb_cContactIMAddress, "initialize", contactIMAddress_init, 3);
+
+  rb_cAppointment = rb_define_class_under(rb_mRevolution, "Appointment", rb_cObject);
+  rb_define_attr(rb_cAppointment, "uid", 1, 1);
+  rb_define_attr(rb_cAppointment, "summary", 1, 1);
+  rb_define_attr(rb_cAppointment, "location", 1, 1);
+  rb_define_attr(rb_cAppointment, "organizer", 1, 1);
+  rb_define_attr(rb_cAppointment, "start", 1, 1);
+  rb_define_attr(rb_cAppointment, "end", 1, 1);
+  rb_define_attr(rb_cAppointment, "last_modification", 1, 1);
+  rb_define_attr(rb_cAppointment, "alarm_set", 1, 1);
+  rb_define_attr(rb_cAppointment, "busy_status", 1, 1);
+  rb_define_attr(rb_cAppointment, "recurring", 1, 1);
+  rb_define_method(rb_cAppointment, "initialize", evAppointment_init, 0);
   // INLINE RUBY CODE define an "all_day" method
 
-  cTask = rb_define_class_under(module, "Task", rb_cObject);
-  rb_define_attr(cTask, "uid", 1, 1);
-  rb_define_attr(cTask, "summary", 1, 1);
-  rb_define_attr(cTask, "description", 1, 1);
-  rb_define_attr(cTask, "start", 1, 1);
-  rb_define_attr(cTask, "due", 1, 1);
-  rb_define_attr(cTask, "status", 1, 1);
-  rb_define_attr(cTask, "priority", 1, 1);
-  rb_define_attr(cTask, "last_modification", 1, 1);
-  rb_define_method(cTask, "initialize", evTask_init, 0);
-
-	cRevolution = rb_define_class_under(module, "Revolution", rb_cObject);
-	rb_define_method(cRevolution, "initialize", revolution_init, 0);
-	rb_define_method(cRevolution, "add_contact", revolution_add_contact, 1);
-	rb_define_method(cRevolution, "delete_contact", revolution_delete_contact, 1);
-	rb_define_method(cRevolution, "get_contact_by_uid", revolution_get_contact_by_uid, 1);
-	rb_define_method(cRevolution, "get_contacts_by_name", revolution_get_contacts_by_name, 1);
-	rb_define_method(cRevolution, "get_contacts_with_query", revolution_get_contacts_with_query, 1);
-	rb_define_method(cRevolution, "get_all_contacts", revolution_get_all_contacts, 0);
-	rb_define_method(cRevolution, "get_all_appointments", revolution_get_all_appointments, 2);
-	rb_define_method(cRevolution, "get_all_tasks", revolution_get_all_tasks, 0);
+  rb_cTask = rb_define_class_under(rb_mRevolution, "Task", rb_cObject);
+  rb_define_attr(rb_cTask, "uid", 1, 1);
+  rb_define_attr(rb_cTask, "summary", 1, 1);
+  rb_define_attr(rb_cTask, "description", 1, 1);
+  rb_define_attr(rb_cTask, "start", 1, 1);
+  rb_define_attr(rb_cTask, "due", 1, 1);
+  rb_define_attr(rb_cTask, "status", 1, 1);
+  rb_define_attr(rb_cTask, "priority", 1, 1);
+  rb_define_attr(rb_cTask, "last_modification", 1, 1);
+  rb_define_method(rb_cTask, "initialize", evTask_init, 0);
+
+	rb_cRevolution = rb_define_class_under(rb_mRevolution, "Revolution", rb_cObject);
+	rb_define_method(rb_cRevolution, "initialize", revolution_init, 0);
+	rb_define_method(rb_cRevolution, "add_contact", revolution_add_contact, 1);
+	rb_define_method(rb_cRevolution, "delete_contact", revolution_delete_contact, 1);
+	rb_define_method(rb_cRevolution, "get_contact_by_uid", revolution_get_contact_by_uid, 1);
+	rb_define_method(rb_cRevolution, "get_contacts_by_name", revolution_get_contacts_by_name, 1);
+	rb_define_method(rb_cRevolution, "get_contacts_with_query", revolution_get_contacts_with_query, 1);
+	rb_define_method(rb_cRevolution, "get_all_contacts", revolution_get_all_contacts, 0);
+	rb_define_method(rb_cRevolution, "get_all_appointments", revolution_get_all_appointments, 2);
+	rb_define_method(rb_cRevolution, "get_all_tasks", revolution_get_all_tasks, 0);
+
+	rb_cRevolutionException = rb_define_class_under(rb_mRevolution, "RevolutionException", rb_eStandardError);
 
 	g_type_init();
+
+	im_hash = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(im_hash, "AIMHOME", GINT_TO_POINTER(E_CONTACT_IM_AIM_HOME_1));
+	g_hash_table_insert(im_hash, "AIMWORK", GINT_TO_POINTER(E_CONTACT_IM_AIM_WORK_1));
 }
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.10
 specification_version: 1
 name: revolution
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2005-03-30
+  version: "0.5"
+date: 2005-05-06
 summary: Revolution is a binding for the Evolution email client
 require_paths: 
   - ''