agoo 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1774bcd29b45056263ad986722015b99efa5c2bc8b0607b3a08afb79cd40cd70
-  data.tar.gz: dddc4062987102c87f1e2556ad425b33f3e0dd0a380c2a2416348ba2e07869d2
+  metadata.gz: 74cca7bbc7156c967212d01e349f2d9134af318c8abd59687167fa5580773e54
+  data.tar.gz: cf765b3109277f2caa4fbb2c25d5352990fd03a394a78de82cf81ed4b235b6f4
 SHA512:
-  metadata.gz: 5b4dbbe0b330c4456d46354019940e962a79229486b323940e20d3b8213416fd025d6279772b35f441bbbdd8e1fa5cfebe812ecba7f5d7e3a5ad16d46b41ef25
-  data.tar.gz: aad80f64bc75f27663c1372d02ced4a205ea5e89a5deba77619951cc09d0a083810f57520375a9fc8fe658e591f453367e1b4638f362ccfc95a2bbba3a183c7a
+  metadata.gz: 50ef0edcf1dcec15be40de1594ddd9dbbec5749fd9099f140ffd0ce986a50728d3ff442e63f4a2756f0bdcd082618cf37a183b31676c432cddb07f4ec916d48f
+  data.tar.gz: 485447bbd3013e516472a8f6531316eb5d1b4144b3197359425cc838807878756c990145c68ecaa5322a157ce93601a671449291fbece8cae05f0fe35d9c1f56

data/CHANGELOG.md

@@ -2,12 +2,30 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.15.1] - 2022-06-18
+
+### Added
+
+- Introspection can now be disabled with the `hide_schema` option to the Agoo server.
+
+- If an exception raised from a GraphQL callback responds to `code`
+  that code will be used as the HTTP status.
+
+- Added missing ability to set or add elements of a request argument
+  on GraphQL callback methods.
+
 ## [2.15.0] - 2022-05-20
 
 ### Added
 
 - Support added for PATCH.
 
+- A `:hide_schema` option has been added to show the graphql/schema as
+  not found unless added by with the handle method of the server.
+
+- Raising an exception that responds to `code` in a graphql resolve
+  function will return that code as the HTTP status code.
+
 ## [2.14.3] - 2022-05-05
 
 ### Fixed

data/ext/agoo/gqleval.c

@@ -478,8 +478,14 @@ gql_eval_get_hook(agooReq req) {
 	result = gql_doc_eval_func(&err, doc);
     }
     if (NULL == result) {
+	int code = 500;
+
+	if (err.code < 0) {
+	    code = -err.code;
+	}
+	err.code = AGOO_ERR_EVAL;
 	gql_doc_destroy(doc);
-	err_resp(req->res, &err, 500);
+	err_resp(req->res, &err, code);
 	return;
     }
     if (GQL_SUBSCRIPTION == doc->op->kind) {
@@ -648,7 +654,13 @@ gql_eval_post_hook(agooReq req) {
 	indent = (int)strtol(s, NULL, 10);
     }
     if (NULL == (result = eval_post(&err, req)) && AGOO_ERR_OK != err.code) {
-	err_resp(req->res, &err, 400);
+	int code = 400;
+
+	if (err.code < 0) {
+	    code = -err.code;
+	}
+	err.code = AGOO_ERR_EVAL;
+	err_resp(req->res, &err, code);
     } else if (NULL == result) {
 	value_resp(req, result, 200, indent);
     } else {

data/ext/agoo/request.c

@@ -684,6 +684,24 @@ call(VALUE self) {
     return io;
 }
 
+/* Document-method: set
+ *
+ * call-seq: set()
+ *
+ * Sets an key value pair to the environment of the request.
+ */
+static VALUE
+set(VALUE self, VALUE key, VALUE val) {
+    agooReq	r = DATA_PTR(self);
+
+    if (NULL == r) {
+	rb_raise(rb_eArgError, "Request is no longer valid.");
+    }
+    rb_hash_aset((VALUE)r->env, key, val);
+
+    return Qnil;
+}
+
 VALUE
 request_wrap(agooReq req) {
     // freed from the C side of things
@@ -723,6 +741,7 @@ request_init(VALUE mod) {
     rb_define_method(req_class, "body", body, 0);
     rb_define_method(req_class, "rack_logger", rack_logger, 0);
     rb_define_method(req_class, "call", call, 0);
+    rb_define_method(req_class, "set", set, 2);
 
     new_id = rb_intern("new");
 

data/ext/agoo/rgraphql.c

@@ -58,8 +58,24 @@ make_ruby_use(agooErr    err,
     volatile VALUE	v;
     ID			m = rb_intern(method);
 
-    if (!rb_respond_to(root, m) ||
-	Qnil == (v = rb_funcall(root, m, 0))) {
+    if (!rb_respond_to(root, m)) {
+	return AGOO_ERR_OK;
+    }
+    switch (rb_obj_method_arity(root, m)) {
+    case 0:
+	v = rb_funcall(root, m, 0);
+	break;
+    case 1:
+	v = rb_funcall(root, m, 1, Qnil);
+	break;
+    case 2:
+	v = rb_funcall(root, m, 2, Qnil, Qnil);
+	break;
+    default:
+	v = Qnil;
+	break;
+    }
+    if (Qnil == v) {
 	return AGOO_ERR_OK;
     }
     if (NULL == (type = gql_type_get(type_name))) {
@@ -89,7 +105,13 @@ rescue_error(VALUE x, VALUE ignore) {
     const char		*ms = rb_string_value_ptr(&msg);
 
     agoo_err_set(eval->err, AGOO_ERR_EVAL, "%s: %s", classname, ms);
+    if (rb_respond_to(info, rb_intern("code"))) {
+	VALUE	code = rb_funcall(info, rb_intern("code"), 0);
 
+	if (RUBY_T_FIXNUM == rb_type(code)) {
+	    eval->err->code = -FIX2INT(code);
+	}
+    }
     return Qfalse;
 }
 

data/ext/agoo/rserver.c

@@ -208,12 +208,12 @@ configure(agooErr err, int port, const char *root, VALUE options) {
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("graphql"))))) {
 	    const char	*path;
-	    agooHook	dump_hook;
 	    agooHook	get_hook;
 	    agooHook	post_hook;
 	    agooHook	options_hook;
-	    char	schema_path[256];
+	    agooHook	head = NULL;
 	    long	plen;
+	    VALUE	hide_schema = Qnil;
 
 	    rb_check_type(v, T_STRING);
 	    if (AGOO_ERR_OK != gql_init(err)) {
@@ -221,21 +221,29 @@ configure(agooErr err, int port, const char *root, VALUE options) {
 	    }
 	    path = StringValuePtr(v);
 	    plen = (long)RSTRING_LEN(v);
-	    if ((int)sizeof(schema_path) - 8 < plen) {
-		rb_raise(rb_eArgError, "A graphql schema path is limited to %d characters.", (int)(sizeof(schema_path) - 8));
-	    }
-	    memcpy(schema_path, path, plen);
-	    memcpy(schema_path + plen, "/schema", 8);
 
-	    dump_hook = agoo_hook_func_create(AGOO_GET, schema_path, gql_dump_hook, &agoo_server.eval_queue);
 	    get_hook = agoo_hook_func_create(AGOO_GET, path, gql_eval_get_hook, &agoo_server.eval_queue);
 	    post_hook = agoo_hook_func_create(AGOO_POST, path, gql_eval_post_hook, &agoo_server.eval_queue);
 	    options_hook = agoo_hook_func_create(AGOO_OPTIONS, path, gql_eval_options_hook, &agoo_server.eval_queue);
-	    dump_hook->next = get_hook;
+	    if (Qnil != (hide_schema = rb_hash_lookup(options, ID2SYM(rb_intern("hide_schema")))) && Qtrue == hide_schema) {
+		head = get_hook;
+	    } else {
+		char		schema_path[256];
+		agooHook	dump_hook;
+
+		if ((int)sizeof(schema_path) - 8 < plen) {
+		    rb_raise(rb_eArgError, "A graphql schema path is limited to %d characters.", (int)(sizeof(schema_path) - 8));
+		}
+		memcpy(schema_path, path, plen);
+		memcpy(schema_path + plen, "/schema", 8);
+		dump_hook = agoo_hook_func_create(AGOO_GET, schema_path, gql_dump_hook, &agoo_server.eval_queue);
+		dump_hook->next = get_hook;
+		head = dump_hook;
+	    }
 	    get_hook->next = post_hook;
 	    post_hook->next = options_hook;
 	    options_hook->next = agoo_server.hooks;
-	    agoo_server.hooks = dump_hook;
+	    agoo_server.hooks = head;
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("quiet"))))) {
 	    if (Qtrue == v) {
@@ -296,6 +304,8 @@ configure(agooErr err, int port, const char *root, VALUE options) {
  *   - *:ssl_sert* [_String_] filepath to the SSL certificate file.
  *
  *   - *:ssl_key* [_String_] filepath to the SSL private key file.
+ *
+ *   - *:hide_schema* [_true_|_false_] if true the graphql/schema path is handled.
  */
 static VALUE
 rserver_init(int argc, VALUE *argv, VALUE self) {

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.15.0'
+  VERSION = '2.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj