revolution 0.1 → 0.2

data/extconf.rb

@@ -1,7 +1,11 @@
 require 'mkmf'
 
-$CPPFLAGS += " -Wall " + `pkg-config --cflags libebook-1.0 libecal-1.0 glib-2.0 evolution-data-server-1.0`
-$LOCAL_LIBS += `pkg-config --libs libebook-1.0 libecal-1.0`
+pkg_config('libebook-1.2') || pkg_config('libebook-1.0')
+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 "
 
 create_makefile("revolution")
 

data/revolution.c

@@ -8,15 +8,6 @@
 #include <libebook/e-book.h>
 #include <libecal/e-cal.h>
 
-#include <libical/pvl.h>
-#include <libical/ical.h>
-
-#include <libical/icalcomponent.h>
-#include <libical/icalproperty.h>
-#include <libical/icalvalue.h>
-#include <libical/icaltime.h>
-#include <libical/icalenums.h>
-
 VALUE crRevolution;
 VALUE module;
 
@@ -84,6 +75,8 @@ static VALUE evTask_init(VALUE self) {
   rb_define_attr(crEvTask, "description", 1, 0);
   rb_define_attr(crEvTask, "start", 1, 0);
   rb_define_attr(crEvTask, "due", 1, 0);
+  rb_define_attr(crEvTask, "status", 1, 0);
+  rb_define_attr(crEvTask, "priority", 1, 0);
   rb_define_attr(crEvTask, "last_modification", 1, 0);
 	return Qtrue;
 }
@@ -111,6 +104,34 @@ void copy_into_task(const VALUE ruby_task, ECalComponent* ev_task) {
 			rb_iv_set(ruby_task, "@due", rb_funcall( rb_cTime, rb_intern( "at" ), 1, INT2NUM(icaltime_as_timet(*due_date.value))));
 			e_cal_component_free_datetime(&due_date);
 		}
+
+		// Does this need to be freed?  There's no API call to free it...
+		icalproperty_status status;
+		e_cal_component_get_status(ev_task, &status);
+		if (status == ICAL_STATUS_NONE) {
+			rb_iv_set(ruby_task, "@status", rb_str_new2("Not started"));
+		} else if (status == ICAL_STATUS_INPROCESS) {
+			rb_iv_set(ruby_task, "@status", rb_str_new2("In progress"));
+		} else if (status == ICAL_STATUS_COMPLETED) {
+			rb_iv_set(ruby_task, "@status", rb_str_new2("Completed"));
+		} else if (status == ICAL_STATUS_CANCELLED) {
+			rb_iv_set(ruby_task, "@status", rb_str_new2("Cancelled"));
+		}
+
+		int* priority;
+		e_cal_component_get_priority(ev_task, &priority);
+		if (priority) {
+			if (*priority == 7) {
+				rb_iv_set(ruby_task, "@priority", rb_str_new2("Low"));
+			} else if (*priority == 5) {
+				rb_iv_set(ruby_task, "@priority", rb_str_new2("Normal"));
+			} else if (*priority == 3) {
+				rb_iv_set(ruby_task, "@priority", rb_str_new2("High"));
+			} /* seems like nil is as good as undefined - else {
+				rb_iv_set(ruby_task, "@priority", rb_str_new2("Undefined"));
+			}*/
+			e_cal_component_free_priority(priority);
+		}
 }
 
 /* 
@@ -276,6 +297,8 @@ static VALUE revolution_get_all_appointments(VALUE self, VALUE start, VALUE end)
 ///////////////////////////////////////////////////////
 // Address Book
 VALUE crEvContact;
+VALUE crEvContactAddress;
+VALUE crEvContactIMAddress;
 
 /* 
  *	call-seq:
@@ -289,42 +312,150 @@ static VALUE evContact_init(VALUE self) {
   rb_define_attr(crEvContact, "last_name", 1, 0);
   rb_define_attr(crEvContact, "home_email", 1, 0);
   rb_define_attr(crEvContact, "work_email", 1, 0);
+  rb_define_attr(crEvContact, "email_addresses", 1, 0);
+  rb_define_attr(crEvContact, "birthday", 1, 0);
+  rb_define_attr(crEvContact, "home_phone", 1, 0);
+  rb_define_attr(crEvContact, "work_phone", 1, 0);
+  rb_define_attr(crEvContact, "mobile_phone", 1, 0);
+  rb_define_attr(crEvContact, "home_address", 1, 0);
+  rb_define_attr(crEvContact, "work_address", 1, 0);
+  rb_define_attr(crEvContact, "other_address", 1, 0);
+  rb_define_attr(crEvContact, "organization", 1, 0);
+  rb_define_attr(crEvContact, "title", 1, 0);
+  rb_define_attr(crEvContact, "im_addresses", 1, 0);
+  return Qtrue;
+}
+
+/* 
+ *	call-seq:
+ *		new() -> EvContactIMAddress
+ *		
+ * Creates a new EvContactIMAddress object
+ */
+static VALUE evContactIMAddress_init(VALUE self) {
+  rb_define_attr(crEvContactIMAddress, "provider", 1, 0);
+  rb_define_attr(crEvContactIMAddress, "location", 1, 0);
+  rb_define_attr(crEvContactIMAddress, "address", 1, 0);
+  return Qtrue;
+}
+/* 
+ *	call-seq:
+ *		new() -> EvContactAddress
+ *		
+ * Creates a new EvContactAddress object
+ */
+static VALUE evContactAddress_init(VALUE self) {
+  rb_define_attr(crEvContactAddress, "address_format", 1, 0);
+  rb_define_attr(crEvContactAddress, "po", 1, 0);
+  rb_define_attr(crEvContactAddress, "ext", 1, 0);
+  rb_define_attr(crEvContactAddress, "street", 1, 0);
+  rb_define_attr(crEvContactAddress, "locality", 1, 0);
+  rb_define_attr(crEvContactAddress, "region", 1, 0);
+  rb_define_attr(crEvContactAddress, "code", 1, 0);
+  rb_define_attr(crEvContactAddress, "country", 1, 0);
   return Qtrue;
 }
 
-char* fetch_field_or_empty_str(EContact* ev_contact, const EContactField field) {
-	char* value = e_contact_get(ev_contact, field);
-	return (value) ? value : "";
+void copy_in_address(EContactAddress* address, VALUE ruby_contact, char* field) {
+	if (address) {
+		VALUE rb_addr = rb_class_new_instance(0, 0, crEvContactAddress);
+		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);
+		rb_iv_set(rb_addr, "@street", address->street ? rb_str_new2(address->street) : Qnil);
+		rb_iv_set(rb_addr, "@locality", address->locality ? rb_str_new2(address->locality) : Qnil);
+		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, crEvContactIMAddress);
+	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 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));
-		rb_iv_set(ruby_contact, "@uid", rb_str_new2(fetch_field_or_empty_str(ev_contact, E_CONTACT_UID)));
-		rb_iv_set(ruby_contact, "@first_name", rb_str_new2(fetch_field_or_empty_str(ev_contact, E_CONTACT_GIVEN_NAME)));
-		rb_iv_set(ruby_contact, "@last_name", rb_str_new2(fetch_field_or_empty_str(ev_contact, E_CONTACT_FAMILY_NAME)));
-
-		gpointer email1 = e_contact_get(ev_contact, E_CONTACT_EMAIL);
-		if (email1) {
-			GList* attrs, *attr;
-			attrs = e_contact_get_attributes(ev_contact, E_CONTACT_EMAIL);
-			for (attr = attrs; attr ; attr = attr->next) {
-				EVCardAttribute* a = attr->data; // g_message("attr name = %s\n", e_vcard_attribute_get_name(a));
-				char* value = e_vcard_attribute_get_value(a);
-				GList* params, *l;
-				params = e_vcard_attribute_get_params(a);
-				for (l = params; l; l = l->next) {
-					EVCardAttributeParam* p = l->data;
-					if (!g_ascii_strcasecmp((char*)e_vcard_attribute_param_get_name(p), "TYPE")) {
-						char* type = e_vcard_attribute_param_get_values(p)->data;
-						if (!g_ascii_strcasecmp(type, "WORK")) {
-							rb_iv_set(ruby_contact, "@work_email", rb_str_new2(value));
-						} else if (!g_ascii_strcasecmp(type, "HOME")) {
-							rb_iv_set(ruby_contact, "@home_email", rb_str_new2(value));
-						}
+	// 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);
+	}
+
+	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)));
 				}
-			}	
-		}
+			}
+		}	
+	}
+
+	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);
 }
 
 /* 
@@ -381,6 +512,10 @@ void Init_revolution() {
 
   crEvContact = rb_define_class_under(module, "EvContact", rb_cObject);
   rb_define_method(crEvContact, "initialize", evContact_init, 0);
+  crEvContactAddress = rb_define_class_under(module, "EvContactAddress", rb_cObject);
+  rb_define_method(crEvContactAddress, "initialize", evContactAddress_init, 0);
+  crEvContactIMAddress = rb_define_class_under(module, "EvContactIMAddress", rb_cObject);
+  rb_define_method(crEvContactIMAddress, "initialize", evContactIMAddress_init, 0);
 
   crEvAppointment = rb_define_class_under(module, "EvAppointment", rb_cObject);
   rb_define_method(crEvAppointment, "initialize", evAppointment_init, 0);

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.4
 specification_version: 1
 name: revolution
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2005-03-21
+  version: "0.2"
+date: 2005-03-25
 summary: Revolution is a binding for the Evolution email client
 require_paths: 
   - ''