ruby: add keyword arguments to db.query

That way we don't need pass them to the query object ourselves.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index bb993d8688848df012f26d4f9a545f31b78c195d..d6c804ac244bb0693ff78e493fe4699cb7e33462 100644 (file)
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -395,17 +395,24 @@ notmuch_rb_database_get_all_tags (VALUE self)
 }
 
 /*
- * 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 +422,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);
 }

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index 9860ee17d9479e1bc1101978585ed986e0e704c1..995bcafd2b0e78e003a9e73419c1805c19e9cd8c 100644 (file)
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -174,7 +174,7 @@ VALUE
 notmuch_rb_database_get_all_tags (VALUE self);
 
 VALUE
-notmuch_rb_database_query_create (VALUE self, VALUE qstrv);
+notmuch_rb_database_query_create (int argc, VALUE *argv, VALUE self);
 
 /* directory.c */
 VALUE

diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c
index bedfbf60646cf4d2d4c4ebc209ea0e2c145faece..d421c6010dc4fddb21c6e081829a0403e1643df1 100644 (file)
--- a/bindings/ruby/init.c
+++ b/bindings/ruby/init.c
@@ -275,7 +275,7 @@ Init_notmuch (void)
     rb_define_method (notmuch_rb_cDatabase, "find_message_by_filename",
                      notmuch_rb_database_find_message_by_filename, 1); /* in database.c */
     rb_define_method (notmuch_rb_cDatabase, "all_tags", notmuch_rb_database_get_all_tags, 0); /* in database.c */
-    rb_define_method (notmuch_rb_cDatabase, "query", notmuch_rb_database_query_create, 1); /* in database.c */
+    rb_define_method (notmuch_rb_cDatabase, "query", notmuch_rb_database_query_create, -1); /* in database.c */
 
     /*
      * Document-class: Notmuch::Directory

diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh
index d36d4affbe6be0c127e490e42d3261a7a1f6063a..e828efed3dbe4bca31ccf0f134c560b021cea928 100755 (executable)
--- a/test/T395-ruby.sh
+++ b/test/T395-ruby.sh
@@ -82,4 +82,22 @@ q.search_threads.each do |t|
 end
 EOF
 
+test_begin_subtest "check sort argument"
+notmuch search --sort=oldest-first --output=threads tag:inbox > EXPECTED
+test_ruby <<"EOF"
+q = db.query('tag:inbox', sort: Notmuch::SORT_OLDEST_FIRST)
+q.search_threads.each do |t|
+  puts 'thread:%s' % t.thread_id
+end
+EOF
+
+test_begin_subtest "check exclude_tags argument"
+notmuch search --output=threads --exclude=all tag:inbox > EXPECTED
+test_ruby <<"EOF"
+q = db.query('tag:inbox', exclude_tags: %w[deleted], omit_excluded: Notmuch::EXCLUDE_ALL)
+q.search_threads.each do |t|
+  puts 'thread:%s' % t.thread_id
+end
+EOF
+
 test_done