agoo 2.7.0 → 2.8.0

data/ext/agoo/graphql.h

@@ -14,15 +14,16 @@
 
 typedef enum {
     GQL_UNDEF		= (int8_t)0, // not defined yet
-    GQL_OBJECT		= (int8_t)1,
-    GQL_FRAG		= (int8_t)2,
-    GQL_INPUT		= (int8_t)3,
-    GQL_UNION		= (int8_t)4,
-    GQL_INTERFACE	= (int8_t)5,
-    GQL_ENUM		= (int8_t)6,
-    GQL_SCALAR		= (int8_t)7,
-    GQL_LIST		= (int8_t)8,
-    GQL_NON_NULL	= (int8_t)9,
+    GQL_SCHEMA		= (int8_t)1,
+    GQL_OBJECT		= (int8_t)2,
+    GQL_FRAG		= (int8_t)3,
+    GQL_INPUT		= (int8_t)4,
+    GQL_UNION		= (int8_t)5,
+    GQL_INTERFACE	= (int8_t)6,
+    GQL_ENUM		= (int8_t)7,
+    GQL_SCALAR		= (int8_t)8,
+    GQL_LIST		= (int8_t)9,
+    GQL_NON_NULL	= (int8_t)10,
 } gqlKind;
 
 typedef enum {
@@ -37,8 +38,9 @@ typedef enum {
     GQL_SCALAR_VAR	= (int8_t)8,
     GQL_SCALAR_TIME	= (int8_t)9,
     GQL_SCALAR_UUID	= (int8_t)10,
-    GQL_SCALAR_LIST	= (int8_t)11,
-    GQL_SCALAR_OBJECT	= (int8_t)12,
+    GQL_SCALAR_ID	= (int8_t)11,
+    GQL_SCALAR_LIST	= (int8_t)12,
+    GQL_SCALAR_OBJECT	= (int8_t)13,
 } gqlScalarKind;
 
 typedef enum {
@@ -125,7 +127,7 @@ typedef struct _gqlType {
     gqlScalarKind	scalar_kind;
     bool		core;
     union {
-	struct { // Objects and interfaces
+	struct { // Schema (just fields), Objects and Interfaces
 	    gqlField		fields;
 	    gqlTypeLink		interfaces;	// Types
 	};
@@ -206,9 +208,11 @@ typedef struct _gqlDoc {
 extern int	gql_init(agooErr err);
 extern void	gql_destroy(); // clear out all
 
+extern gqlType	gql_schema_create(agooErr err, const char *desc, size_t dlen);
 extern gqlType	gql_type_create(agooErr err, const char *name, const char *desc, size_t dlen, gqlTypeLink interfaces);
 extern gqlType	gql_assure_type(agooErr err, const char *name);
-extern void	gql_type_directive_use(gqlType type, gqlDirUse use);
+extern int	gql_type_directive_use(agooErr err, gqlType type, gqlDirUse use);
+extern bool	gql_type_has_directive_use(gqlType type, const char *dir);
 
 extern gqlType	gql_input_create(agooErr err, const char *name, const char *desc, size_t dlen);
 extern gqlType	gql_interface_create(agooErr err, const char *name, const char *desc, size_t dlen);

data/ext/agoo/log.c

@@ -62,7 +62,9 @@ struct _agooLogCat	agoo_push_cat;
 agooColor
 find_color(const char *name) {
     if (NULL != name) {
-	for (agooColor c = colors; NULL != c->name; c++) {
+	agooColor	c;
+
+	for (c = colors; NULL != c->name; c++) {
 	    if (0 == strcasecmp(c->name, name)) {
 		return c;
 	    }
@@ -98,7 +100,7 @@ agoo_log_listen() {
 	}
     }
     atomic_store(&agoo_log.wait_state, WAITING);
-    
+
     return agoo_log.rsock;
 }
 
@@ -116,6 +118,7 @@ static agooLogEntry
 agoo_log_queue_pop(double timeout) {
     agooLogEntry	e = atomic_load(&agoo_log.head);
     agooLogEntry	next;
+    int			cnt;
 
     if (e->ready) {
 	return e;
@@ -125,7 +128,7 @@ agoo_log_queue_pop(double timeout) {
 	next = agoo_log.q;
     }
     // If the next is the tail then wait for something to be appended.
-    for (int cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&agoo_log.tail) == next; cnt--) {
+    for (cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&agoo_log.tail) == next; cnt--) {
 	struct pollfd	pa;
 
 	if (cnt <= 0) {
@@ -176,7 +179,7 @@ classic_write(agooLogEntry e, FILE *file) {
     long long	frac = (long long)e->when % 1000000000LL;
     char	levelc = level_chars[e->cat->level];
     int		cnt = 0;
-    
+
     t += agoo_log.zone;
     if (agoo_log.day_start <= t && t < agoo_log.day_end) {
 	t -= agoo_log.day_start;
@@ -271,6 +274,7 @@ void
 agoo_log_rotate() {
     char	from[1060];
     char	to[1060];
+    int		seq;
 
     if (NULL != agoo_log.file) {
 	fclose(agoo_log.file);
@@ -280,7 +284,7 @@ agoo_log_rotate() {
 	char	name[32];
 
 	sprintf(name, "%s_%d.log", agoo_log.app, getpid());
-	for (int seq = agoo_log.max_files; 0 < seq; seq--) {
+	for (seq = agoo_log.max_files; 0 < seq; seq--) {
 	    snprintf(to, sizeof(to) - 1, "%s/%s_%d.log.%d", agoo_log.dir, agoo_log.app, getpid(), seq + 1);
 	    snprintf(from, sizeof(from) - 1, "%s/%s_%d.log.%d", agoo_log.dir, agoo_log.app, getpid(), seq);
 	    rename(from, to);
@@ -288,7 +292,7 @@ agoo_log_rotate() {
 	snprintf(to, sizeof(to) - 1, "%s/%s_%d.log.%d", agoo_log.dir, agoo_log.app, getpid(), 1);
 	snprintf(from, sizeof(from) - 1, "%s/%s", agoo_log.dir, name);
     } else {
-	for (int seq = agoo_log.max_files; 0 < seq; seq--) {
+	for (seq = agoo_log.max_files; 0 < seq; seq--) {
 	    snprintf(to, sizeof(to) - 1, "%s/%s.log.%d", agoo_log.dir, agoo_log.app, seq + 1);
 	    snprintf(from, sizeof(from) - 1, "%s/%s.log.%d", agoo_log.dir, agoo_log.app, seq);
 	    rename(from, to);
@@ -338,7 +342,7 @@ loop(void *ctx) {
 bool
 agoo_log_flush(double timeout) {
     timeout += dtime();
-    
+
     while (!agoo_log.done && !agoo_log_queue_empty()) {
 	if (timeout < dtime()) {
 	    return false;
@@ -405,7 +409,7 @@ agoo_log_close() {
 void
 agoo_log_cat_reg(agooLogCat cat, const char *label, agooLogLevel level, const char *color, bool on) {
     agooLogCat	xcat = agoo_log_cat_find(label);
-    
+
     if (NULL != xcat) {
 	cat = xcat;
     }
@@ -448,7 +452,7 @@ agoo_log_cat_find(const char *label) {
 int64_t
 agoo_now_nano() {
     struct timespec	ts;
-	    
+
     clock_gettime(CLOCK_REALTIME, &ts);
 
     return (int64_t)ts.tv_sec * 1000000000LL + (int64_t)ts.tv_nsec;
@@ -502,13 +506,13 @@ agoo_log_catv(agooLogCat cat, const char *tid, const char *fmt, va_list ap) {
     if (cat->on && !agoo_log.done) {
 	agooLogEntry	e;
 	agooLogEntry	tail;
-	
+
 	while (atomic_flag_test_and_set(&agoo_log.push_lock)) {
 	    dsleep(RETRY_SECS);
 	}
 	if (0 == agoo_log.thread) {
 	    struct _agooLogEntry	entry;
-	    
+
 	    set_entry(&entry, cat, tid, fmt, ap);
 	    if (agoo_log.classic) {
 		classic_write(&entry, stdout);
@@ -560,7 +564,7 @@ agoo_log_tid_cat(agooLogCat cat, const char *tid, const char *fmt, ...) {
 int
 agoo_log_start(agooErr err, bool with_pid) {
     int	stat;
-    
+
     if (0 != agoo_log.thread) {
 	// Already started.
 	return AGOO_ERR_OK;

data/ext/agoo/rack_logger.c

@@ -17,7 +17,7 @@ rack_logger_new() {
 static void
 log_message(agooLogCat cat, VALUE message) {
     volatile VALUE	rs = rb_funcall(message, rb_intern("to_s"), 0);
-    
+
     rb_check_type(rs, T_STRING);
     if (!agoo_server.active) {
 	return;
@@ -31,6 +31,9 @@ log_message(agooLogCat cat, VALUE message) {
 	    text = agoo_text_append(text, ": ", 2);
 	    text = agoo_text_append(text, StringValuePtr(rs), (int)RSTRING_LEN(rs));
 	}
+	if (NULL == text) {
+	    rb_raise(rb_eNoMemError, "Failed to allocate memory for a log message.");
+	}
 	agoo_log_cat(cat, "%s", text->text);
 	agoo_text_release(text);
     } else {

data/ext/agoo/request.c

@@ -359,7 +359,6 @@ rack_run_once(VALUE self) {
     return Qfalse;
 }
 
-// TBD req.c
 static void
 add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen) {
     if (sizeof(content_type) - 1 == klen && 0 == strncasecmp(key, content_type, sizeof(content_type) - 1)) {
@@ -370,7 +369,7 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
 	char		hkey[1024];
 	char		*k = hkey;
 	volatile VALUE	sval = rb_str_new(val, vlen);
-	
+
 	strcpy(hkey, "HTTP_");
 	k = hkey + 5;
 	if ((int)(sizeof(hkey) - 5) <= klen) {
@@ -378,7 +377,7 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
 	}
 	strncpy(k, key, klen);
 	hkey[klen + 5] = '\0';
-    
+
 	//rb_hash_aset(hh, rb_str_new(hkey, klen + 5), sval);
 	// Contrary to the Rack spec, Rails expects all upper case keys so add those as well.
 	for (k = hkey + 5; '\0' != *k; k++) {
@@ -392,7 +391,6 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
     }
 }
 
-// TBD req.c
 static void
 fill_headers(agooReq r, VALUE hash) {
     char	*h = r->header.start;
@@ -408,7 +406,7 @@ fill_headers(agooReq r, VALUE hash) {
     if (NULL == r) {
 	rb_raise(rb_eArgError, "Request is no longer valid.");
     }
-    
+
     for (; h < end; h++) {
 	switch (*h) {
 	case ':':
@@ -533,7 +531,7 @@ VALUE
 request_env(agooReq req, VALUE self) {
     if (Qnil == (VALUE)req->env) {
 	volatile VALUE	env = rb_hash_new();
-    
+
 	// As described by
 	// http://www.rubydoc.info/github/rack/rack/master/file/SPEC and
 	// https://github.com/rack/rack/blob/master/SPEC.
@@ -625,7 +623,7 @@ call(VALUE self) {
 
     io = rb_class_new_instance(1, args, rb_cIO);
     rb_hash_aset((VALUE)r->env, rack_hijack_io_val, io);
-    
+
     return io;
 }
 
@@ -669,12 +667,12 @@ request_init(VALUE mod) {
     rb_define_method(req_class, "call", call, 0);
 
     new_id = rb_intern("new");
-    
+
     rack_version_val_val = rb_ary_new();
     rb_ary_push(rack_version_val_val, INT2NUM(1));
     rb_ary_push(rack_version_val_val, INT2NUM(3));
     rb_gc_register_address(&rack_version_val_val);
-    
+
     stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
 
     connect_val = rb_str_new_cstr("CONNECT");			rb_gc_register_address(&connect_val);

data/ext/agoo/rgraphql.c

@@ -31,7 +31,7 @@ static VALUE		vroot = Qnil;
 static TypeClass	type_class_map = NULL;
 
 static int
-make_ruby_use(agooErr err, VALUE root, const char *method, const char *type_name) {
+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;
@@ -44,14 +44,18 @@ make_ruby_use(agooErr err, VALUE root, const char *method, const char *type_name
     if (NULL == (type = gql_type_get(type_name))) {
 	return agoo_err_set(err, AGOO_ERR_ARG, "Failed to find the '%s' type.", type_name);
     }
-    if (NULL == (use = gql_dir_use_create(err, "ruby"))) {
-	return err->code;
+    if (fresh) {
+	if (NULL == gql_type_field(err, schema_type, method, type, NULL, desc, 0, false)) {
+	    return err->code;
+	}
     }
-    if (AGOO_ERR_OK != gql_dir_use_arg(err, use, "class", gql_string_create(err, rb_obj_classname(v), 0))) {
-	return err->code;
+    if (!gql_type_has_directive_use(type, "ruby")) {
+	if (NULL == (use = gql_dir_use_create(err, "ruby")) ||
+	    AGOO_ERR_OK != gql_dir_use_arg(err, use, "class", gql_string_create(err, rb_obj_classname(v), 0)) ||
+	    AGOO_ERR_OK != gql_type_directive_use(err, type, use)) {
+	    return err->code;
+	}
     }
-    gql_type_directive_use(type, use);
-
     return AGOO_ERR_OK;
 }
 
@@ -120,6 +124,7 @@ gval_to_ruby(gqlValue value) {
 	    break;
 	case GQL_SCALAR_STRING:
 	case GQL_SCALAR_TOKEN:
+	case GQL_SCALAR_ID:
 	    rval = rb_str_new_cstr(gql_string_get(value));
 	    break;
 	case GQL_SCALAR_TIME: {
@@ -290,6 +295,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	    break;
 	case GQL_SCALAR_STRING:
 	case GQL_SCALAR_TOKEN:
+	case GQL_SCALAR_ID:
 	    v = ref_to_string(ref);
 	    value = gql_string_create(err, rb_string_value_ptr(&v), RSTRING_LEN(v));
 	    break;
@@ -559,29 +565,30 @@ rescue_yield(VALUE x) {
 static VALUE
 graphql_schema(VALUE self, VALUE root) {
     struct _agooErr	err = AGOO_ERR_INIT;
-    gqlType		type;
     gqlDir		dir;
     gqlDirUse		use;
+    gqlType		schema_type;
+    bool		fresh = false;
 
     if (!rb_block_given_p()) {
 	rb_raise(rb_eStandardError, "A block is required.");
     }
     if (AGOO_ERR_OK != gql_init(&err)) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(1);
     }
     if (NULL == (dir = gql_directive_create(&err, "ruby", "Associates a Ruby class with a GraphQL type.", 0))) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(2);
     }
     if (NULL == gql_dir_arg(&err, dir, "class", &gql_string_type, NULL, 0, NULL, true)) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(3);
     }
     if (AGOO_ERR_OK != gql_directive_on(&err, dir, "SCHEMA", 6) ||
 	AGOO_ERR_OK != gql_directive_on(&err, dir, "OBJECT", 6)) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(4);
     }
     gql_root = (gqlRef)root;
     vroot = root;
@@ -594,33 +601,36 @@ graphql_schema(VALUE self, VALUE root) {
 
     if (NULL == (use = gql_dir_use_create(&err, "ruby"))) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(5);
     }
     if (AGOO_ERR_OK != gql_dir_use_arg(&err, use, "class", gql_string_create(&err, rb_obj_classname(root), 0))) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
-    }
-    if (NULL == (type = gql_type_get("schema"))) {
-	printf("*-*-* Error: Failed to find the 'schema' type.");
-	exit(0);
-    }
-    gql_type_directive_use(type, use);
-
-    if (AGOO_ERR_OK != make_ruby_use(&err, root, "query", "Query") ||
-	AGOO_ERR_OK != make_ruby_use(&err, root, "mutation", "Mutation") ||
-	AGOO_ERR_OK != make_ruby_use(&err, root, "subscription", "Subscription")) {
-	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(6);
     }
     rb_rescue2(rescue_yield, Qnil, rescue_yield_error, (VALUE)&err, rb_eException, 0);
     if (AGOO_ERR_OK != err.code) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(7);
+    }
+    if (NULL == (schema_type = gql_type_get("schema"))) {
+	if (NULL == (schema_type = gql_schema_create(&err, "The GraphQL root Object.", 0))) {
+	    printf("*-*-* %s\n", err.msg);
+	    exit(8);
+	}
+	fresh = true;
+    }
+
+    if (AGOO_ERR_OK != gql_type_directive_use(&err, schema_type, use) ||
+	AGOO_ERR_OK != make_ruby_use(&err, root, "query", "Query", fresh, schema_type, "Root level query.") ||
+	AGOO_ERR_OK != make_ruby_use(&err, root, "mutation", "Mutation", fresh, schema_type, "Root level mutation.") ||
+	AGOO_ERR_OK != make_ruby_use(&err, root, "subscription", "Subscription", fresh, schema_type, "Root level subscription.")) {
+	printf("*-*-* %s\n", err.msg);
+	exit(9);
     }
     if (AGOO_ERR_OK != gql_validate(&err) ||
 	AGOO_ERR_OK != build_type_class_map(&err)) {
 	printf("*-*-* %s\n", err.msg);
-	exit(0);
+	exit(10);
     }
     return Qnil;
 }
@@ -726,8 +736,9 @@ graphql_sdl_dump(VALUE self, VALUE options) {
     if (Qnil != v) {
 	all = (Qtrue == v);
     }
-    t = gql_schema_sdl(t, with_desc, all);
-
+    if (NULL == (t = gql_schema_sdl(t, with_desc, all))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for a schema dump.");
+    }
     dump = rb_str_new(t->text, t->len);
     agoo_text_release(t);
 

data/ext/agoo/rresponse.c

@@ -33,7 +33,7 @@ response_new() {
     }
     memset(res, 0, sizeof(struct _agooResponse));
     res->code = 200;
-    
+
     return Data_Wrap_Struct(res_class, NULL, response_free, res);
 }
 
@@ -53,7 +53,7 @@ to_s(VALUE self) {
 	rb_raise(rb_eNoMemError, "out of memory");
     }
     agoo_response_fill(res, s);
-    
+
     return rb_str_new(s, len);
 }
 
@@ -150,7 +150,7 @@ head_get(VALUE self, VALUE key) {
     agooHeader		h;
     const char		*ks = StringValuePtr(key);
     int			klen = (int)RSTRING_LEN(key);
-    
+
     for (h = res->headers; NULL != h; h = h->next) {
 	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
 	    return rb_str_new(h->text + klen + 2, h->len - klen - 4);
@@ -227,9 +227,10 @@ response_text(VALUE self) {
     int			len = agoo_response_len(res);
     agooText		t = agoo_text_allocate(len);
 
-    agoo_response_fill(res, t->text);
-    t->len = len;
-
+    if (NULL != t) {
+	agoo_response_fill(res, t->text);
+	t->len = len;
+    }
     return t;
 }