agoo 2.11.7 → 2.12.0

data/ext/agoo/gqljson.c

@@ -424,6 +424,7 @@ parse_value(agooErr err, agooDoc doc) {
 	if (4 <= doc->end - doc->cur &&
 	    'r' == doc->cur[1] && 'u' == doc->cur[2] && 'e' == doc->cur[3]) {
 	    value = gql_bool_create(err, true);
+	    doc->cur += 4;
 	} else {
 	    agoo_doc_err(doc, err, "invalid token");
 	}
@@ -432,6 +433,7 @@ parse_value(agooErr err, agooDoc doc) {
 	if (5 <= doc->end - doc->cur &&
 	    'a' == doc->cur[1] && 'l' == doc->cur[2] && 's' == doc->cur[3] && 'e' == doc->cur[4]) {
 	    value = gql_bool_create(err, false);
+	    doc->cur += 5;
 	} else {
 	    agoo_doc_err(doc, err, "invalid token");
 	}
@@ -440,6 +442,7 @@ parse_value(agooErr err, agooDoc doc) {
 	if (4 <= doc->end - doc->cur &&
 	    'u' == doc->cur[1] && 'l' == doc->cur[2] && 'l' == doc->cur[3]) {
 	    value = gql_null_create(err);
+	    doc->cur += 4;
 	} else {
 	    agoo_doc_err(doc, err, "invalid token");
 	}

data/ext/agoo/gqlvalue.c

@@ -590,8 +590,7 @@ list_destroy(gqlValue value) {
 
     while (NULL != (link = value->members)) {
 	value->members = link->next;
-	gql_value_destroy(link->value);
-	AGOO_FREE(link);
+	gql_link_destroy(link);
     }
 }
 
@@ -679,9 +678,7 @@ object_destroy(gqlValue value) {
 
     while (NULL != (link = value->members)) {
 	value->members = link->next;
-	gql_value_destroy(link->value);
-	AGOO_FREE(link->key);
-	AGOO_FREE(link);
+	gql_link_destroy(link);
     }
 }
 
@@ -1572,6 +1569,9 @@ int
 gql_value_convert(agooErr err, gqlValue value, gqlType type) {
     int	code = AGOO_ERR_OK;
 
+    if (GQL_NON_NULL == type->kind) {
+	type = type->base;
+    }
     if (type != value->type) {
 	switch (type->scalar_kind) {
 	case GQL_SCALAR_BOOL:

data/ext/agoo/graphql.c

@@ -517,8 +517,7 @@ gql_type_field(agooErr		err,
 	       gqlType		return_type,
 	       gqlValue		default_value,
 	       const char	*desc,
-	       size_t		dlen,
-	       bool		required) {
+	       size_t		dlen) {
     gqlField	f = (gqlField)AGOO_MALLOC(sizeof(struct _gqlField));
 
     if (NULL == f) {
@@ -538,7 +537,6 @@ gql_type_field(agooErr		err,
 	f->args = NULL;
 	f->dir = NULL;
 	f->default_value = default_value;
-	f->required = required;
 	if (NULL == type->fields) {
 	    type->fields = f;
 	} else {
@@ -559,8 +557,7 @@ gql_field_arg(agooErr		err,
 	      gqlType		type,
 	      const char	*desc,
 	      size_t		dlen,
-	      struct _gqlValue	*def_value,
-	      bool		required) {
+	      struct _gqlValue	*def_value) {
     gqlArg	a = (gqlArg)AGOO_MALLOC(sizeof(struct _gqlArg));
 
     if (NULL == a) {
@@ -579,7 +576,6 @@ gql_field_arg(agooErr		err,
 	}
 	a->default_value = def_value;
 	a->dir = NULL;
-	a->required = required;
 	if (NULL == field->args) {
 	    field->args = a;
 	} else {
@@ -600,8 +596,7 @@ gql_input_arg(agooErr		err,
 	      gqlType		type,
 	      const char	*desc,
 	      size_t		dlen,
-	      struct _gqlValue	*def_value,
-	      bool		required) {
+	      struct _gqlValue	*def_value) {
     gqlArg	a = (gqlArg)AGOO_MALLOC(sizeof(struct _gqlArg));
 
     if (NULL == a) {
@@ -620,7 +615,6 @@ gql_input_arg(agooErr		err,
 	}
 	a->default_value = def_value;
 	a->dir = NULL;
-	a->required = required;
 	if (NULL == input->args) {
 	    input->args = a;
 	} else {
@@ -801,8 +795,7 @@ gql_dir_arg(agooErr 		err,
 	    gqlType		type,
 	    const char	 	*desc,
 	    size_t		dlen,
-	    struct _gqlValue	*def_value,
-	    bool 		required) {
+	    struct _gqlValue	*def_value) {
 
     gqlArg	a = (gqlArg)AGOO_MALLOC(sizeof(struct _gqlArg));
 
@@ -822,7 +815,6 @@ gql_dir_arg(agooErr 		err,
 	}
 	a->default_value = def_value;
 	a->dir = NULL;
-	a->required = required;
 	if (NULL == dir->args) {
 	    dir->args = a;
 	} else {
@@ -863,11 +855,11 @@ gql_directive_on(agooErr err, gqlDir d, const char *on, int len) {
 }
 
 gqlType
-gql_assure_list(agooErr err, gqlType base, bool not_empty) {
+gql_assure_list(agooErr err, gqlType base) {
     char	name[256];
     gqlType	type;
 
-    if ((int)sizeof(name) <= snprintf(name, sizeof(name), "[%s%s]", base->name, not_empty ? "!" : "")) {
+    if ((int)sizeof(name) <= snprintf(name, sizeof(name), "[%s]", base->name)) {
 	agoo_err_set(err, AGOO_ERR_ARG, "Name too long");
 	return NULL;
     }
@@ -876,7 +868,24 @@ gql_assure_list(agooErr err, gqlType base, bool not_empty) {
 	    return NULL;
 	}
 	type->base = base;
-	type->not_empty = not_empty;
+    }
+    return type;
+}
+
+gqlType
+gql_assure_nonnull(agooErr err, gqlType base) {
+    char	name[256];
+    gqlType	type;
+
+    if ((int)sizeof(name) <= snprintf(name, sizeof(name), "%s!", base->name)) {
+	agoo_err_set(err, AGOO_ERR_ARG, "Name too long");
+	return NULL;
+    }
+    if (NULL == (type = gql_type_get(name))) {
+	if (NULL == (type = type_create(err, GQL_NON_NULL, name, NULL, 0))) {
+	    return NULL;
+	}
+	type->base = base;
     }
     return type;
 }
@@ -988,9 +997,6 @@ arg_sdl(agooText text, gqlArg a, bool with_desc, bool same_line, bool last) {
     if (NULL != a->type) { // should always be true
 	text = agoo_text_append(text, a->type->name, -1);
     }
-    if (a->required) {
-	text = agoo_text_append(text, "!", 1);
-    }
     if (NULL != a->default_value) {
 	text = agoo_text_append(text, " = ", 3);
 	text = gql_value_sdl(text, a->default_value, 0, 0);
@@ -1024,9 +1030,6 @@ field_sdl(agooText text, gqlField f, bool with_desc) {
     }
     text = agoo_text_append(text, ": ", 2);
     text = agoo_text_append(text, f->type->name, -1);
-    if (f->required) {
-	text = agoo_text_append(text, "!", 1);
-    }
     if (NULL != f->default_value) {
 	text = agoo_text_append(text, " = ", 3);
 	text = gql_value_sdl(text, f->default_value, 0, 0);
@@ -1204,7 +1207,7 @@ gql_schema_sdl(agooText text, bool with_desc, bool all) {
     for (bucket = buckets, i = 0; i < BUCKET_SIZE; bucket++, i++) {
 	for (s = *bucket; NULL != s; s = s->next) {
 	    type = s->type;
-	    if (GQL_LIST == type->kind) {
+	    if (GQL_LIST == type->kind || GQL_NON_NULL == type->kind) {
 		continue;
 	    }
 	    if (!all && type->core) {
@@ -1216,11 +1219,12 @@ gql_schema_sdl(agooText text, bool with_desc, bool all) {
     if (0 < cnt) {
 	gqlType	types[cnt];
 	gqlType	*tp = types;
+	long	len;
 
 	for (bucket = buckets, i = 0; i < BUCKET_SIZE; bucket++, i++) {
 	    for (s = *bucket; NULL != s; s = s->next) {
 		type = s->type;
-		if (GQL_LIST == type->kind) {
+		if (GQL_LIST == type->kind || GQL_NON_NULL == type->kind) {
 		    continue;
 		}
 		if (!all && type->core) {
@@ -1231,8 +1235,9 @@ gql_schema_sdl(agooText text, bool with_desc, bool all) {
 	}
 	qsort(types, cnt, sizeof(gqlType), type_cmp);
 	for (i = 0, tp = types; i < cnt; i++, tp++) {
+	    len = text->len;
 	    text = gql_type_sdl(text, *tp, with_desc);
-	    if (i < cnt - 1) {
+	    if (i < cnt - 1 && len < text->len) {
 		text = agoo_text_append(text, "\n", 1);
 	    }
 	}
@@ -1355,6 +1360,9 @@ gql_doc_create(agooErr err) {
 	doc->ops = NULL;
 	doc->vars = NULL;
 	doc->frags = NULL;
+	doc->req = NULL;
+	doc->ctx = NULL;
+	doc->ctx_free = NULL;
     }
     return doc;
 }
@@ -1474,6 +1482,9 @@ gql_doc_destroy(gqlDoc doc) {
 	doc->frags = frag->next;
 	gql_frag_destroy(frag);
     }
+    if (NULL != doc->ctx_free) {
+	doc->ctx_free(doc->ctx);
+    }
     AGOO_FREE(doc);
 }
 

data/ext/agoo/graphql.h

@@ -88,7 +88,6 @@ typedef struct _gqlArg {
     struct _gqlType	*type;
     struct _gqlValue	*default_value;
     struct _gqlDirUse	*dir;
-    bool		required;
 } *gqlArg;
 
 typedef struct _gqlField {
@@ -99,7 +98,6 @@ typedef struct _gqlField {
     gqlArg		args;
     struct _gqlDirUse	*dir;
     struct _gqlValue	*default_value;
-    bool		required;
 } *gqlField;
 
 typedef struct _gqlDir {
@@ -133,15 +131,12 @@ typedef struct _gqlType {
 	gqlTypeLink		types;		// Union
 	gqlEnumVal		choices;	// Enums
 	gqlArg			args;		// InputObject
+	struct _gqlType		*base;		// List and NonNull types
 	struct {				// scalar
 	    agooText		(*to_sdl)(agooText text, struct _gqlValue *value, int indent, int depth);
 	    agooText		(*to_json)(agooText text, struct _gqlValue *value, int indent, int depth);
 	    void		(*destroy)(struct _gqlValue *value);
 	};
-	struct { // List types
-	    struct _gqlType	*base;
-	    bool		not_empty;
-	};
     };
 } *gqlType;
 
@@ -202,6 +197,9 @@ typedef struct _gqlDoc {
     gqlFrag		frags;
     gqlOp		op; // the op to execute
     struct _gqlFuncs	funcs;
+    struct _agooReq	*req;
+    void		*ctx;
+    void		(*ctx_free)(void*);
 } *gqlDoc;
 
 extern int	gql_init(agooErr err);
@@ -222,8 +220,7 @@ extern gqlField	gql_type_field(agooErr		err,
 			       gqlType		return_type,
 			       struct _gqlValue	*default_value,
 			       const char	*desc,
-			       size_t		dlen,
-			       bool 		required);
+			       size_t		dlen);
 
 extern gqlArg	gql_field_arg(agooErr 		err,
 			      gqlField 		field,
@@ -231,8 +228,7 @@ extern gqlArg	gql_field_arg(agooErr 		err,
 			      gqlType	 	type,
 			      const char 	*desc,
 			      size_t		dlen,
-			      struct _gqlValue	*def_value,
-			      bool 		required);
+			      struct _gqlValue	*def_value);
 
 extern gqlArg	gql_input_arg(agooErr		err,
 			      gqlType		input,
@@ -240,8 +236,7 @@ extern gqlArg	gql_input_arg(agooErr		err,
 			      gqlType		type,
 			      const char	*desc,
 			      size_t		dlen,
-			      struct _gqlValue	*def_value,
-			      bool		required);
+			      struct _gqlValue	*def_value);
 
 extern gqlType		gql_scalar_create(agooErr err, const char *name, const char *desc, size_t dlen);
 
@@ -252,8 +247,7 @@ extern gqlArg		gql_dir_arg(agooErr 		err,
 				    gqlType 		type,
 				    const char	 	*desc,
 				    size_t		dlen,
-				    struct _gqlValue	*def_value,
-				    bool 		required);
+				    struct _gqlValue	*def_value);
 extern int		gql_directive_on(agooErr err, gqlDir d, const char *on, int len);
 extern gqlDir		gql_directive_get(const char *name);
 
@@ -266,7 +260,8 @@ extern int		gql_union_add(agooErr err, gqlType type, gqlType member);
 extern gqlType		gql_enum_create(agooErr err, const char *name, const char *desc, size_t dlen);
 extern gqlEnumVal	gql_enum_append(agooErr err, gqlType type, const char *value, size_t len, const char *desc, size_t dlen);
 
-extern gqlType		gql_assure_list(agooErr err, gqlType base, bool not_empty);
+extern gqlType		gql_assure_list(agooErr err, gqlType base);
+extern gqlType		gql_assure_nonnull(agooErr err, gqlType base);
 
 extern int		gql_type_set(agooErr err, gqlType type);
 extern gqlType		gql_type_get(const char *name);
@@ -291,6 +286,7 @@ extern agooText		gql_doc_sdl(gqlDoc doc, agooText text);
 extern void		gql_dump_hook(struct _agooReq *req);
 extern void		gql_eval_get_hook(struct _agooReq *req);
 extern void		gql_eval_post_hook(struct _agooReq *req);
+extern void		gql_eval_options_hook(struct _agooReq *req);
 
 extern int		gql_validate(agooErr err);
 

data/ext/agoo/rgraphql.c

@@ -13,6 +13,7 @@
 #include "gqlvalue.h"
 #include "graphql.h"
 #include "pub.h"
+#include "request.h"
 #include "sdl.h"
 #include "server.h"
 
@@ -27,13 +28,28 @@ typedef struct _typeClass {
     const char	*classname;
 } *TypeClass;
 
+typedef struct _bhArgs {
+    agooErr	err;
+    agooReq	req;
+    agooText	headers;
+} *bhArgs;
+
 static VALUE		graphql_class = Qundef;
 static VALUE		vroot = Qnil;
+static VALUE		build_headers_func = Qnil;
+
+static ID		call_id;
 
 static TypeClass	type_class_map = NULL;
 
 static int
-make_ruby_use(agooErr err, VALUE root, const char *method, const char *type_name, bool fresh, gqlType schema_type, const char *desc) {
+make_ruby_use(agooErr    err,
+	      VALUE      root,
+	      const char *method,
+	      const char *type_name,
+	      bool       fresh,
+	      gqlType    schema_type,
+	      const char *desc) {
     gqlType		type;
     gqlDirUse		use;
     volatile VALUE	v;
@@ -47,7 +63,7 @@ make_ruby_use(agooErr err, VALUE root, const char *method, const char *type_name
 	return agoo_err_set(err, AGOO_ERR_ARG, "Failed to find the '%s' type.", type_name);
     }
     if (fresh) {
-	if (NULL == gql_type_field(err, schema_type, method, type, NULL, desc, 0, false)) {
+	if (NULL == gql_type_field(err, schema_type, method, type, NULL, desc, 0)) {
 	    return err->code;
 	}
     }
@@ -225,6 +241,9 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
     if (Qnil == (VALUE)ref) {
 	return gql_null_create(err);
     }
+    if (NULL != type && GQL_NON_NULL == type->kind) {
+	type = type->base;
+    }
     if (NULL == type) {
 	// This is really an error but make a best effort anyway.
 	switch (rb_type((VALUE)ref)) {
@@ -372,12 +391,25 @@ ref_type(gqlRef ref) {
     return type;
 }
 
+static VALUE
+make_plan(gqlSel sel) {
+
+    // TBD create a plan object that wraps the sel, create children as needed
+    // plan is not valid outside of method
+    // should be able to create SDL from it
+
+    return Qnil;
+}
+
 static int
 resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlValue result, int depth) {
     volatile VALUE	child;
+    volatile VALUE	rreq = Qnil;
     VALUE		obj = (VALUE)target;
     int			d2 = depth + 1;
     const char		*key = sel->name;
+    ID			method;
+    int			arity;
 
     if ('_' == *sel->name && '_' == sel->name[1]) {
 	if (0 == strcmp("__typename", sel->name)) {
@@ -397,8 +429,10 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
 	    return agoo_err_set(err, AGOO_ERR_EVAL, "Not a valid operation on the root object.");
 	}
     }
-    if (NULL == sel->args) {
-	child = rb_funcall(obj, rb_intern(sel->name), 0);
+    method = rb_intern(sel->name);
+    arity = rb_obj_method_arity(obj, method);
+    if (0 == arity) {
+	child = rb_funcall(obj, method, 0);
     } else {
 	volatile VALUE	rargs = rb_hash_new();
 	gqlSelArg	sa;
@@ -429,7 +463,21 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
 	    }
 	    rb_hash_aset(rargs, rb_str_new_cstr(sa->name), gval_to_ruby(v));
 	}
-	child = rb_funcall(obj, rb_intern(sel->name), 1, rargs);
+	if (-1 == arity || 1 == arity) {
+	    child = rb_funcall(obj, method, 1, rargs);
+	} else {
+	    if (NULL == doc->ctx) {
+		rreq = request_wrap(doc->req);
+		doc->ctx = (void*)rreq;
+	    } else {
+		rreq = (VALUE)doc->ctx;
+	    }
+	    if (-2 == arity || 2 == arity) {
+		child = rb_funcall(obj, method, 2, rargs, rreq);
+	    } else {
+		child = rb_funcall(obj, method, 3, rargs, rreq, make_plan(sel));
+	    }
+	}
     }
     if (GQL_SUBSCRIPTION == doc->op->kind && RUBY_T_STRING == rb_type(child)) {
 	gqlValue	c;
@@ -591,6 +639,7 @@ graphql_schema(VALUE self, VALUE root) {
     gqlDirUse		use;
     gqlType		schema_type;
     bool		fresh = false;
+    gqlType		string_nn;
 
     if (!rb_block_given_p()) {
 	rb_raise(rb_eStandardError, "A block is required.");
@@ -603,7 +652,8 @@ graphql_schema(VALUE self, VALUE root) {
 	printf("*-*-* %s\n", err.msg);
 	exit(2);
     }
-    if (NULL == gql_dir_arg(&err, dir, "class", &gql_string_type, NULL, 0, NULL, true)) {
+    if (NULL == (string_nn = gql_assure_nonnull(&err, &gql_string_type)) ||
+	NULL == gql_dir_arg(&err, dir, "class", string_nn, NULL, 0, NULL)) {
 	printf("*-*-* %s\n", err.msg);
 	exit(3);
     }
@@ -791,6 +841,105 @@ graphql_publish(VALUE self, VALUE subject, VALUE event) {
     return Qnil;
 }
 
+static VALUE
+rescue_build_header(VALUE x, VALUE ignore) {
+    bhArgs		args = (bhArgs)x;
+    volatile VALUE	info = rb_errinfo();
+    volatile VALUE	msg = rb_funcall(info, rb_intern("message"), 0);
+
+    agoo_err_set(args->err, AGOO_ERR_EVAL, "%s", rb_string_value_ptr(&msg));
+
+    return Qnil;
+}
+
+static int
+build_headers_cb(VALUE key, VALUE value, VALUE x) {
+    bhArgs		args = (bhArgs)x;
+    const char		*ks = rb_string_value_ptr((VALUE*)&key);
+    volatile VALUE	vs = rb_obj_as_string(value);
+    const char		*s = rb_string_value_ptr((VALUE*)&vs);
+
+    if (NULL == (args->headers = gql_add_header(args->err, args->headers, ks, s))) {
+	rb_raise(rb_eStandardError, "%s", args->err->msg);
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+inner_build_headers(VALUE x) {
+    volatile VALUE	hh = rb_funcall(build_headers_func, call_id, 1, request_wrap(((bhArgs)x)->req));
+
+    rb_hash_foreach(hh, build_headers_cb, x);
+
+    return Qnil;
+}
+
+static void*
+protected_build_headers(void *x) {
+    return (void*)rb_rescue2(inner_build_headers, (VALUE)x, rescue_build_header, (VALUE)x, rb_eException, 0);
+}
+
+static agooText
+build_headers(agooErr err, agooReq req, agooText headers) {
+    struct _bhArgs	args = {
+	.err = err,
+	.req = req,
+	.headers = headers,
+    };
+    rb_thread_call_with_gvl(protected_build_headers, &args);
+
+    return args.headers;
+}
+
+/* Document-method: build_headers=
+ *
+ * call-seq: build_headers=(func)
+ *
+ * Provide a function to call that builds headers for GraphQL responses. The
+ * function should expect a single request and should return a Hash of the
+ * headers to add. Content-Type and Content-Length should not be set.
+ */
+static VALUE
+graphql_build_headers(VALUE self, VALUE func) {
+    gql_build_headers = build_headers;
+    build_headers_func = func;
+    rb_gc_register_address(&build_headers_func);
+
+    return Qnil;
+}
+
+static int
+headers_cb(VALUE key, VALUE value, VALUE x) {
+    agooText		*tp = (agooText*)x;
+    const char		*ks = rb_string_value_ptr((VALUE*)&key);
+    volatile VALUE	vs = rb_obj_as_string(value);
+    const char		*s = rb_string_value_ptr((VALUE*)&vs);
+    struct _agooErr	err = AGOO_ERR_INIT;
+
+    if (NULL == (*tp = gql_add_header(&err, *tp, ks, s))) {
+	rb_raise(rb_eStandardError, "%s", err.msg);
+    }
+    return ST_CONTINUE;
+}
+
+
+/* Document-method: headers
+ *
+ * call-seq: headers(header_hash)
+ *
+ * Provide a Hash to be used as the headers for GraphQL responses.
+ * Content-Type and Content-Length should not be set.
+ */
+static VALUE
+graphql_headers(VALUE self, VALUE map) {
+    agooText	t = agoo_text_allocate(1024);
+
+    rb_hash_foreach(map, headers_cb, (VALUE)&t);
+    gql_headers = t;
+
+    return Qnil;
+}
+
 /* Document-class: Agoo::Graphql
  *
  * The Agoo::GraphQL class provides support for the GraphQL API as defined in
@@ -815,4 +964,9 @@ graphql_init(VALUE mod) {
     rb_define_module_function(graphql_class, "sdl_dump", graphql_sdl_dump, 1);
 
     rb_define_module_function(graphql_class, "publish", graphql_publish, 2);
+
+    rb_define_module_function(graphql_class, "build_headers=", graphql_build_headers, 1);
+    rb_define_module_function(graphql_class, "headers", graphql_headers, 1);
+
+    call_id = rb_intern("call");
 }