X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fdatabase.c;h=9c3dbd96f0b292f856c2ccca2448b8483503a568;hp=bb993d8688848df012f26d4f9a545f31b78c195d;hb=HEAD;hpb=5f49e3421f5d1f98951b55dd5ba106c2a106aba7

diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index bb993d86..ed224ef7 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -26,6 +26,19 @@ notmuch_rb_database_alloc (VALUE klass)
     return Data_Wrap_Notmuch_Object (klass, &notmuch_rb_database_type, NULL);
 }
 
+/*
+ * call-seq: DB.destroy => nil
+ *
+ * Destroys the database, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_database_destroy (VALUE self)
+{
+    notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
+
+    return Qnil;
+}
+
 /*
  * call-seq: Notmuch::Database.new(path [, {:create => false, :mode => Notmuch::MODE_READ_ONLY}]) => DB
  *
@@ -45,43 +58,59 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
     notmuch_database_t *database;
     notmuch_status_t ret;
 
+    path = NULL;
+    create = 0;
+    mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
+
     /* Check arguments */
-    rb_scan_args (argc, argv, "11", &pathv, &hashv);
+    rb_scan_args (argc, argv, "02", &pathv, &hashv);
 
-    SafeStringValue (pathv);
-    path = RSTRING_PTR (pathv);
+    if (!NIL_P (pathv)) {
+	SafeStringValue (pathv);
+	path = RSTRING_PTR (pathv);
+    }
 
     if (!NIL_P (hashv)) {
-	Check_Type (hashv, T_HASH);
-	create = RTEST (rb_hash_aref (hashv, ID2SYM (ID_db_create)));
-	modev = rb_hash_aref (hashv, ID2SYM (ID_db_mode));
-	if (NIL_P (modev))
-	    mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
-	else if (!FIXNUM_P (modev))
-	    rb_raise (rb_eTypeError, ":mode isn't a Fixnum");
-	else {
-	    mode = FIX2INT (modev);
-	    switch (mode) {
-	    case NOTMUCH_DATABASE_MODE_READ_ONLY:
-	    case NOTMUCH_DATABASE_MODE_READ_WRITE:
-		break;
-	    default:
-		rb_raise ( rb_eTypeError, "Invalid mode");
+	VALUE rmode, rcreate;
+	VALUE kwargs[2];
+	static ID keyword_ids[2];
+
+	if (!keyword_ids[0]) {
+	    keyword_ids[0] = rb_intern_const ("mode");
+	    keyword_ids[1] = rb_intern_const ("create");
+	}
+
+	rb_get_kwargs (hashv, keyword_ids, 0, 2, kwargs);
+
+	rmode = kwargs[0];
+	rcreate = kwargs[1];
+
+	if (rmode != Qundef) {
+	    if (!FIXNUM_P (rmode))
+		rb_raise (rb_eTypeError, ":mode isn't a Fixnum");
+	    else {
+		mode = FIX2INT (rmode);
+		switch (mode) {
+		case NOTMUCH_DATABASE_MODE_READ_ONLY:
+		case NOTMUCH_DATABASE_MODE_READ_WRITE:
+		    break;
+		default:
+		    rb_raise ( rb_eTypeError, "Invalid mode");
+		}
 	    }
 	}
-    } else {
-	create = 0;
-	mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
+	if (rcreate != Qundef)
+	    create = RTEST (rcreate);
     }
 
     rb_check_typeddata (self, &notmuch_rb_database_type);
     if (create)
 	ret = notmuch_database_create (path, &database);
     else
-	ret = notmuch_database_open (path, mode, &database);
+	ret = notmuch_database_open_with_config (path, mode, NULL, NULL, &database, NULL);
     notmuch_rb_status_raise (ret);
 
-    DATA_PTR (self) = database;
+    DATA_PTR (self) = notmuch_rb_object_create (database, "notmuch_rb_database");
 
     return self;
 }
@@ -113,8 +142,12 @@ notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass)
 VALUE
 notmuch_rb_database_close (VALUE self)
 {
+    notmuch_database_t *db;
     notmuch_status_t ret;
-    ret = notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
+
+    Data_Get_Notmuch_Database (self, db);
+
+    ret = notmuch_database_close (db);
     notmuch_rb_status_raise (ret);
 
     return Qnil;
@@ -391,21 +424,28 @@ notmuch_rb_database_get_all_tags (VALUE self)
 
 	rb_raise (notmuch_rb_eBaseError, "%s", msg);
     }
-    return Data_Wrap_Notmuch_Object (notmuch_rb_cTags, &notmuch_rb_tags_type, tags);
+    return notmuch_rb_tags_get (tags);
 }
 
 /*
- * call-seq: DB.query(query) => QUERY
+ * call-seq:
+ *   DB.query(query) => QUERY
+ *   DB.query(query, sort:, excluded_tags:, omit_excluded:) => QUERY
  *
- * Retrieve a query object for the query string 'query'
+ * Retrieve a query object for the query string 'query'. When using keyword
+ * arguments they are passwed to the query object.
  */
 VALUE
-notmuch_rb_database_query_create (VALUE self, VALUE qstrv)
+notmuch_rb_database_query_create (int argc, VALUE *argv, VALUE self)
 {
+    VALUE qstrv;
+    VALUE opts;
     const char *qstr;
     notmuch_query_t *query;
     notmuch_database_t *db;
 
+    rb_scan_args (argc, argv, "1:", &qstrv, &opts);
+
     Data_Get_Notmuch_Database (self, db);
 
     SafeStringValue (qstrv);
@@ -415,5 +455,39 @@ notmuch_rb_database_query_create (VALUE self, VALUE qstrv)
     if (!query)
         rb_raise (notmuch_rb_eMemoryError, "Out of memory");
 
+    if (!NIL_P (opts)) {
+	VALUE sort, exclude_tags, omit_excluded;
+	VALUE kwargs[3];
+	static ID keyword_ids[3];
+
+	if (!keyword_ids[0]) {
+	    keyword_ids[0] = rb_intern_const ("sort");
+	    keyword_ids[1] = rb_intern_const ("exclude_tags");
+	    keyword_ids[2] = rb_intern_const ("omit_excluded");
+	}
+
+	rb_get_kwargs (opts, keyword_ids, 0, 3, kwargs);
+
+	sort = kwargs[0];
+	exclude_tags = kwargs[1];
+	omit_excluded = kwargs[2];
+
+	if (sort != Qundef)
+	    notmuch_query_set_sort (query, FIX2UINT (sort));
+
+	if (exclude_tags != Qundef) {
+	    for (int i = 0; i < RARRAY_LEN (exclude_tags); i++) {
+		VALUE e = RARRAY_AREF (exclude_tags, i);
+		notmuch_query_add_tag_exclude (query, RSTRING_PTR (e));
+	    }
+	}
+
+	if (omit_excluded != Qundef) {
+	    notmuch_exclude_t omit;
+	    omit = FIXNUM_P (omit_excluded) ? FIX2UINT (omit_excluded) : RTEST(omit_excluded);
+	    notmuch_query_set_omit_excluded (query, omit);
+	}
+    }
+
     return Data_Wrap_Notmuch_Object (notmuch_rb_cQuery, &notmuch_rb_query_type, query);
 }