X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fdefs.h;h=3f9512ba903b9b9a9bb5c32c4be37696fc1cd2f8;hp=44f6e32198b939adc0ed6c706b82c93a5189ccf3;hb=35cb1c95cc8afa964900d29c813349ad8e24e7a8;hpb=05dddf883dd762420bb8e6b86790e68d734fd568

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index 44f6e321..3f9512ba 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -1,6 +1,6 @@
 /* The Ruby interface to the notmuch mail library
  *
- * Copyright © 2010, 2011 Ali Polatel
+ * Copyright © 2010, 2011, 2012 Ali Polatel
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,76 +50,81 @@ ID ID_call;
 ID ID_db_create;
 ID ID_db_mode;
 
-#define Data_Get_Notmuch_Database (obj, ptr)		\
-    do {						\
-	Check_Type (obj, T_DATA);			\
-	if (DATA_PTR (obj) == NULL)			\
-	rb_raise (rb_eRuntimeError, "database closed");	\
-	Data_Get_Struct (obj, notmuch_database_t, ptr);	\
+/* RSTRING_PTR() is new in ruby-1.9 */
+#if !defined(RSTRING_PTR)
+# define RSTRING_PTR(v) (RSTRING((v))->ptr)
+#endif /* !defined (RSTRING_PTR) */
+
+#define Data_Get_Notmuch_Database(obj, ptr)			\
+    do {							\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
+	rb_raise (rb_eRuntimeError, "database closed");		\
+	Data_Get_Struct ((obj), notmuch_database_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Directory (obj, ptr)			\
+#define Data_Get_Notmuch_Directory(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "directory destroyed");	\
-	Data_Get_Struct (obj, notmuch_directory_t, ptr);	\
+	Data_Get_Struct ((obj), notmuch_directory_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_FileNames (obj, ptr)			\
+#define Data_Get_Notmuch_FileNames(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "filenames destroyed");	\
-	Data_Get_Struct (obj, notmuch_filenames_t, ptr);	\
+	Data_Get_Struct ((obj), notmuch_filenames_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Query (obj, ptr)			\
+#define Data_Get_Notmuch_Query(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
-	rb_raise (rb_eRuntimeError, "query destroyed");	\
-	Data_Get_Struct (obj, notmuch_query_t, ptr);		\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
+	rb_raise (rb_eRuntimeError, "query destroyed");		\
+	Data_Get_Struct ((obj), notmuch_query_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Threads (obj, ptr)			\
+#define Data_Get_Notmuch_Threads(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "threads destroyed");	\
-	Data_Get_Struct (obj, notmuch_threads_t, ptr);		\
+	Data_Get_Struct ((obj), notmuch_threads_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Messages (obj, ptr)			\
+#define Data_Get_Notmuch_Messages(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "messages destroyed");	\
-	Data_Get_Struct (obj, notmuch_messages_t, ptr);		\
+	Data_Get_Struct ((obj), notmuch_messages_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Thread (obj, ptr)			\
+#define Data_Get_Notmuch_Thread(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "thread destroyed");	\
-	Data_Get_Struct (obj, notmuch_thread_t, ptr);		\
+	Data_Get_Struct ((obj), notmuch_thread_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Message (obj, ptr)			\
+#define Data_Get_Notmuch_Message(obj, ptr)			\
     do {							\
-	Check_Type (obj, T_DATA);				\
-	if (DATA_PTR (obj) == NULL)				\
+	Check_Type ((obj), T_DATA);				\
+	if (DATA_PTR ((obj)) == NULL)				\
 	rb_raise (rb_eRuntimeError, "message destroyed");	\
-	Data_Get_Struct (obj, notmuch_message_t, ptr);		\
+	Data_Get_Struct ((obj), notmuch_message_t, (ptr));	\
     } while (0)
 
-#define Data_Get_Notmuch_Tags (obj, ptr)		\
+#define Data_Get_Notmuch_Tags(obj, ptr)			\
     do {						\
-	Check_Type (obj, T_DATA);			\
-	if (DATA_PTR (obj) == NULL)			\
+	Check_Type ((obj), T_DATA);			\
+	if (DATA_PTR ((obj)) == NULL)			\
 	rb_raise (rb_eRuntimeError, "tags destroyed");	\
-	Data_Get_Struct (obj, notmuch_tags_t, ptr);	\
+	Data_Get_Struct ((obj), notmuch_tags_t, (ptr));	\
     } while (0)
 
 /* status.c */
@@ -166,6 +171,12 @@ notmuch_rb_database_add_message (VALUE self, VALUE pathv);
 VALUE
 notmuch_rb_database_remove_message (VALUE self, VALUE pathv);
 
+VALUE
+notmuch_rb_database_find_message (VALUE self, VALUE idv);
+
+VALUE
+notmuch_rb_database_find_message_by_filename (VALUE self, VALUE pathv);
+
 VALUE
 notmuch_rb_database_query_create (VALUE self, VALUE qstrv);
 
@@ -205,12 +216,21 @@ notmuch_rb_query_set_sort (VALUE self, VALUE sortv);
 VALUE
 notmuch_rb_query_get_string (VALUE self);
 
+VALUE
+notmuch_rb_query_add_tag_exclude (VALUE self, VALUE tagv);
+
+VALUE
+notmuch_rb_query_set_omit_excluded (VALUE self, VALUE omitv);
+
 VALUE
 notmuch_rb_query_search_threads (VALUE self);
 
 VALUE
 notmuch_rb_query_search_messages (VALUE self);
 
+VALUE
+notmuch_rb_query_count_messages (VALUE self);
+
 /* threads.c */
 VALUE
 notmuch_rb_threads_destroy (VALUE self);