diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2021-05-23 21:19:09 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-06-27 14:13:03 -0300 |
| commit | 814abafc3e4280de115d4bc0ac01f8d026a0a7f9 (patch) | |
| tree | b01da71f2624e56230e4cce756c01021ee6e3b72 /bindings/ruby | |
| parent | 6e7365fb2033d59d4040d20c1d05c0e652dfcc7b (diff) | |
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>
Diffstat (limited to 'bindings/ruby')
| -rw-r--r-- | bindings/ruby/database.c | 47 | ||||
| -rw-r--r-- | bindings/ruby/defs.h | 2 | ||||
| -rw-r--r-- | bindings/ruby/init.c | 2 |
3 files changed, 46 insertions, 5 deletions
diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c index bb993d86..d6c804ac 100644 --- 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, ¬much_rb_query_type, query); } diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 9860ee17..995bcafd 100644 --- 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 bedfbf60..d421c601 100644 --- 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 |