agoo 2.6.1 → 2.7.0

data/ext/agoo/sdl.c

@@ -28,7 +28,7 @@ extract_desc(agooErr err, agooDoc doc, const char **descp, size_t *lenp) {
     if ('"' == *doc->cur) {
 	const char	*desc_end = NULL;
 	const char	*desc = doc->cur + 1;
-	
+
     	if (AGOO_ERR_OK != agoo_doc_read_string(err, doc)) {
 	    return err->code;
 	}
@@ -88,7 +88,7 @@ make_scalar(agooErr err, agooDoc doc, const char *desc, int len) {
 	return err->code;
     }
     gql_scalar_create(err, name, desc, len);
-    
+
     return AGOO_ERR_OK;
 }
 
@@ -202,7 +202,7 @@ make_enum(agooErr err, agooDoc doc, const char *desc, size_t dlen) {
     gqlDirUse	uses = NULL;
     gqlEnumVal	ev;
     size_t	len;
-    
+
     if (AGOO_ERR_OK != extract_name(err, doc, enum_str, sizeof(enum_str) - 1, name, sizeof(name))) {
 	return err->code;
     }
@@ -254,7 +254,7 @@ make_union(agooErr err, agooDoc doc, const char *desc, int len) {
     gqlDirUse	uses = NULL;
     gqlType	member;
     bool	required;
-    
+
     if (AGOO_ERR_OK != extract_name(err, doc, union_str, sizeof(union_str) - 1, name, sizeof(name))) {
 	return err->code;
     }
@@ -425,7 +425,7 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
     size_t	dlen;
     bool 	required = false;
     gqlValue	dval = NULL;
-    
+
     if (AGOO_ERR_OK != extract_desc(err, doc, &desc, &dlen)) {
 	return err->code;
     }
@@ -438,7 +438,7 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
 	return agoo_doc_err(doc, err, "Expected :");
     }
     doc->cur++;
-    
+
     if (AGOO_ERR_OK != read_type(err, doc, &type, &required)) {
 	return err->code;
     }
@@ -463,7 +463,7 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
 }
 
 static int
-make_field(agooErr err, agooDoc doc, gqlType type, bool allow_args) {
+make_field(agooErr err, agooDoc doc, gqlType type) {
     char	name[256];
     gqlType	return_type;
     const char	*arg_start = NULL;
@@ -483,9 +483,6 @@ make_field(agooErr err, agooDoc doc, gqlType type, bool allow_args) {
     agoo_doc_skip_white(doc);
     switch (*doc->cur) {
     case '(':
-	if (!allow_args) {
-	    return agoo_doc_err(doc, err, "Input fields can not have arguments.");
-	}
 	doc->cur++;
 	arg_start = doc->cur;
 	if (!agoo_doc_skip_to(doc, ')')) {
@@ -539,12 +536,56 @@ make_field(agooErr err, agooDoc doc, gqlType type, bool allow_args) {
     return AGOO_ERR_OK;
 }
 
+static int
+make_input_arg(agooErr err, agooDoc doc, gqlType type) {
+    char	name[256];
+    gqlType	return_type;
+    gqlArg	arg;
+    gqlDirUse	uses = NULL;
+    gqlValue	dval = NULL;
+    const char	*desc = NULL;
+    size_t	dlen;
+    bool 	required = false;
+
+    if (AGOO_ERR_OK != extract_desc(err, doc, &desc, &dlen)) {
+	return err->code;
+    }
+    if (0 == read_name(err, doc, name, sizeof(name))) {
+	return err->code;
+    }
+    agoo_doc_skip_white(doc);
+    if (':' != *doc->cur) {
+	return agoo_doc_err(doc, err, "Expected :");
+    }
+    doc->cur++;
+    if (AGOO_ERR_OK != read_type(err, doc, &return_type, &required)) {
+	return err->code;
+    }
+    if ('=' == *doc->cur) {
+	doc->cur++;
+	if (NULL == (dval = agoo_doc_read_value(err, doc, return_type))) {
+	    return err->code;
+	}
+    }
+    if (AGOO_ERR_OK != extract_dir_use(err, doc, &uses)) {
+	return err->code;
+    }
+    // TBD zzzzzzzz
+
+    if (NULL == (arg = gql_input_arg(err, type, name, return_type, desc, dlen, dval, required))) {
+	return err->code;
+    }
+    arg->dir = uses;
+
+    return AGOO_ERR_OK;
+}
+
 static int
 make_interface(agooErr err, agooDoc doc, const char *desc, int len) {
     char	name[256];
     gqlType	type;
     gqlDirUse	uses = NULL;
-    
+
     if (AGOO_ERR_OK != extract_name(err, doc, interface_str, sizeof(interface_str) - 1, name, sizeof(name))) {
 	return err->code;
     }
@@ -567,7 +608,7 @@ make_interface(agooErr err, agooDoc doc, const char *desc, int len) {
 	    doc->cur++; // skip }
 	    break;
 	}
-	if (AGOO_ERR_OK != make_field(err, doc, type, true)) {
+	if (AGOO_ERR_OK != make_field(err, doc, type)) {
 	    return err->code;
 	}
 	agoo_doc_skip_white(doc);
@@ -604,7 +645,8 @@ make_input(agooErr err, agooDoc doc, const char *desc, int len) {
 	    doc->cur++; // skip }
 	    break;
 	}
-	if (AGOO_ERR_OK != make_field(err, doc, type, false)) {
+	// TBD zzzzzzzzzz make_arg
+	if (AGOO_ERR_OK != make_input_arg(err, doc, type)) {
 	    return err->code;
 	}
 	agoo_doc_skip_white(doc);
@@ -645,7 +687,7 @@ extract_interfaces(agooErr err, agooDoc doc, gqlTypeLink *interfacesp) {
 	    return err->code;
 	}
 	if (NULL == (link = (gqlTypeLink)AGOO_MALLOC(sizeof(struct _gqlTypeLink)))) {
-	    return agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a GraphQL interface.");
+	    return AGOO_ERR_MEM(err, "GraphQL Interface");
 	}
 	link->next = NULL;
 	link->type = type;
@@ -695,7 +737,7 @@ make_type(agooErr err, agooDoc doc, const char *desc, int len) {
 	    doc->cur++; // skip }
 	    break;
 	}
-	if (AGOO_ERR_OK != make_field(err, doc, type, true)) {
+	if (AGOO_ERR_OK != make_field(err, doc, type)) {
 	    return err->code;
 	}
 	agoo_doc_skip_white(doc);
@@ -708,7 +750,7 @@ sdl_parse(agooErr err, const char *str, int len) {
     struct _agooDoc	doc;
     const char		*desc = NULL;
     size_t		dlen = 0;
-    
+
     agoo_doc_init(&doc, str, len);
 
     while (doc.cur < doc.end) {
@@ -769,7 +811,7 @@ sdl_parse(agooErr err, const char *str, int len) {
 		if ('p' == doc.cur[2]) {
 		    if (AGOO_ERR_OK != make_input(err, &doc, desc, dlen)) {
 			return err->code;
-		    }	
+		    }
 		    desc = NULL;
 		    dlen = 0;
 		    break;
@@ -799,11 +841,12 @@ sel_arg_create(agooErr err, const char *name, gqlValue value, gqlVar var) {
     gqlSelArg	arg;
 
     if (NULL == (arg = (gqlSelArg)AGOO_MALLOC(sizeof(struct _gqlSelArg)))) {
-	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a selection field argument.");
+	AGOO_ERR_MEM(err, "GraphQL Selection Field Argument");
     } else {
 	arg->next = NULL;
 	if (NULL == (arg->name = AGOO_STRDUP(name))) {
-	    agoo_err_set(err, AGOO_ERR_MEMORY, "strdup of field name failed. %s:%d", __FILE__, __LINE__);
+	    AGOO_ERR_MEM(err, "strdup()");
+	    AGOO_FREE(arg);
 	    return NULL;
 	}
 	arg->var = var;
@@ -817,7 +860,7 @@ make_sel_arg(agooErr err, agooDoc doc, gqlDoc gdoc, gqlOp op, gqlSel sel) {
     gqlValue	value = NULL;
     gqlVar	var = NULL;
     gqlSelArg	arg;
-    
+
     agoo_doc_skip_white(doc);
     if (0 == read_name(err, doc, name, sizeof(name))) {
 	return err->code;
@@ -830,7 +873,7 @@ make_sel_arg(agooErr err, agooDoc doc, gqlDoc gdoc, gqlOp op, gqlSel sel) {
     agoo_doc_skip_white(doc);
     if ('$' == *doc->cur && NULL != op) {
 	char	var_name[256];
-	
+
 	doc->cur++;
 	if (0 == read_name(err, doc, var_name, sizeof(var_name))) {
 	    return err->code;
@@ -873,11 +916,12 @@ gql_op_var_create(agooErr err, const char *name, gqlType type, gqlValue value) {
     gqlVar	var;
 
     if (NULL == (var = (gqlVar)AGOO_MALLOC(sizeof(struct _gqlVar)))) {
-	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a operation variable.");
+	AGOO_ERR_MEM(err, "GraphQL Operations Variable");
     } else {
 	var->next = NULL;
 	if (NULL == (var->name = AGOO_STRDUP(name))) {
-	    agoo_err_set(err, AGOO_ERR_MEMORY, "strdup of variable name failed. %s:%d", __FILE__, __LINE__);
+	    AGOO_ERR_MEM(err, "strdup()");
+	    AGOO_FREE(var);
 	    return NULL;
 	}
 	var->type = type;
@@ -893,7 +937,7 @@ make_op_var(agooErr err, agooDoc doc, gqlOp op) {
     bool	ignore;
     gqlValue	value = NULL;
     gqlVar	var;
-    
+
     agoo_doc_skip_white(doc);
     if ('$' != *doc->cur) {
 	return agoo_doc_err(doc, err, "Expected $");
@@ -907,7 +951,7 @@ make_op_var(agooErr err, agooDoc doc, gqlOp op) {
 	return agoo_doc_err(doc, err, "Expected :");
     }
     doc->cur++;
-    
+
     if (AGOO_ERR_OK != read_type(err, doc, &type, &ignore)) {
 	return err->code;
     }
@@ -939,14 +983,15 @@ sel_create(agooErr err, const char *alias, const char *name, const char *frag) {
     gqlSel	sel;
 
     if (NULL == (sel = (gqlSel)AGOO_MALLOC(sizeof(struct _gqlSel)))) {
-	agoo_err_set(err, AGOO_ERR_MEMORY, "Failed to allocation memory for a selection set.");
+	AGOO_ERR_MEM(err, "GraphQL Selection Set");
     } else {
 	sel->next = NULL;
 	if (NULL == name) {
 	    sel->name = NULL;
 	} else {
 	    if (NULL == (sel->name = AGOO_STRDUP(name))) {
-		agoo_err_set(err, AGOO_ERR_MEMORY, "strdup of selection name failed. %s:%d", __FILE__, __LINE__);
+		AGOO_ERR_MEM(err, "strdup()");
+		AGOO_FREE(sel);
 		return NULL;
 	    }
 	}
@@ -954,7 +999,8 @@ sel_create(agooErr err, const char *alias, const char *name, const char *frag) {
 	    sel->alias = NULL;
 	} else {
 	    if (NULL == (sel->alias = AGOO_STRDUP(alias))) {
-		agoo_err_set(err, AGOO_ERR_MEMORY, "strdup of selection alias failed. %s:%d", __FILE__, __LINE__);
+		AGOO_ERR_MEM(err, "strdup()");
+		AGOO_FREE(sel);
 		return NULL;
 	    }
 	}
@@ -962,7 +1008,8 @@ sel_create(agooErr err, const char *alias, const char *name, const char *frag) {
 	    sel->frag = NULL;
 	} else {
 	    if (NULL == (sel->frag = AGOO_STRDUP(frag))) {
-		agoo_err_set(err, AGOO_ERR_MEMORY, "strdup of selection fragment failed. %s:%d", __FILE__, __LINE__);
+		AGOO_ERR_MEM(err, "strdup()");
+		AGOO_FREE(sel);
 		return NULL;
 	    }
 	}
@@ -973,7 +1020,7 @@ sel_create(agooErr err, const char *alias, const char *name, const char *frag) {
 	sel->inline_frag = NULL;
     }
     return sel;
-}    
+}
 
 static gqlSel
 make_sel_inline(agooErr err, agooDoc doc, gqlDoc gdoc, gqlOp op) {
@@ -983,7 +1030,7 @@ make_sel_inline(agooErr err, agooDoc doc, gqlDoc gdoc, gqlOp op) {
     agoo_doc_skip_white(doc);
     if ('o' == *doc->cur && 'n' == doc->cur[1]) { // inline fragment
 	char	type_name[256];
-	    
+
 	doc->cur += 2;
 	agoo_doc_skip_white(doc);
 	if (0 == read_name(err, doc, type_name, sizeof(type_name))) {
@@ -1303,7 +1350,7 @@ make_fragment(agooErr err, agooDoc doc, gqlDoc gdoc) {
 static gqlType
 lookup_field_type(gqlType type, const char *field, bool qroot) {
     gqlType	ftype = NULL;
-    
+
     switch (type->kind) {
     case GQL_OBJECT:
     case GQL_INPUT:
@@ -1342,7 +1389,7 @@ lookup_field_type(gqlType type, const char *field, bool qroot) {
 static int
 sel_set_type(agooErr err, gqlType type, gqlSel sels, bool qroot) {
     gqlSel	sel;
-    
+
     for (sel = sels; NULL != sel; sel = sel->next) {
 	if (NULL == sel->name) { // inline or fragment
 	    sel->type = type;
@@ -1377,7 +1424,7 @@ validate_doc(agooErr err, gqlDoc doc) {
     gqlType	type = NULL;
     gqlFrag	frag;
     int		cnt;
-    
+
     if (NULL == (schema = gql_type_get("schema"))) {
 	return agoo_err_set(err, AGOO_ERR_EVAL, "No root (schema) type defined.");
     }
@@ -1395,7 +1442,7 @@ validate_doc(agooErr err, gqlDoc doc) {
 	    }
 	} else {
 	    gqlOp	o2 = op->next;
-	    
+
 	    for (; NULL != o2; o2 = o2->next) {
 		if (NULL == o2->name) {
 		    continue;

data/ext/agoo/sdl.h

@@ -5,13 +5,15 @@
 
 #include "err.h"
 
+struct _gqlType;
 struct _gqlVar;
+struct _gqlValue;
 
 extern int		sdl_parse(agooErr err, const char *str, int len);
 
 // Parse a execution definition.
 extern struct _gqlDoc*	sdl_parse_doc(agooErr err, const char *str, int len, struct _gqlVar *vars);
 
-extern gqlVar	gql_op_var_create(agooErr err, const char *name, gqlType type, gqlValue value);
+extern gqlVar	gql_op_var_create(agooErr err, const char *name, struct _gqlType *type, struct _gqlValue *value);
 
 #endif // AGOO_SDL_H

data/ext/agoo/server.c

@@ -24,17 +24,20 @@
 
 struct _agooServer	agoo_server = {false};
 
-void
-agoo_server_setup() {
+int
+agoo_server_setup(agooErr err) {
     long	i;
     
     memset(&agoo_server, 0, sizeof(struct _agooServer));
     pthread_mutex_init(&agoo_server.up_lock, 0);
     agoo_server.up_list = NULL;
     agoo_server.max_push_pending = 32;
-    agoo_pages_init();
-    agoo_queue_multi_init(&agoo_server.con_queue, 1024, false, true);
-    agoo_queue_multi_init(&agoo_server.eval_queue, 1024, true, true);
+    
+    if (AGOO_ERR_OK != agoo_pages_init(err) ||
+	AGOO_ERR_OK != agoo_queue_multi_init(err, &agoo_server.con_queue, 1024, false, true) ||
+	AGOO_ERR_OK != agoo_queue_multi_init(err, &agoo_server.eval_queue, 1024, true, true)) {
+	return err->code;
+    }
     agoo_server.loop_max = 4;
     if (0 < (i = sysconf(_SC_NPROCESSORS_ONLN))) {
 	i /= 2;
@@ -43,6 +46,7 @@ agoo_server_setup() {
 	}
 	agoo_server.loop_max = (int)i;
     }
+    return AGOO_ERR_OK;
 }
 
 static void
@@ -301,7 +305,7 @@ agoo_server_add_func_hook(agooErr	err,
     agooHook	hook = agoo_hook_func_create(method, pattern, func, queue);
 
     if (NULL == hook) {
-	return agoo_err_set(err, AGOO_ERR_MEMORY, "failed to allocate memory for HTTP server Hook.");
+	return AGOO_ERR_MEM(err, "HTTP Server Hook");
     }
     hook->no_queue = quick;
     for (h = agoo_server.hooks; NULL != h; h = h->next) {

data/ext/agoo/server.h

@@ -49,7 +49,8 @@ typedef struct _agooServer {
 } *agooServer;
 
 extern struct _agooServer	agoo_server;
-extern void	agoo_server_setup();
+
+extern int	agoo_server_setup(agooErr err);
 extern void	agoo_server_shutdown(const char *app_name, void (*stop)());
 extern void	agoo_server_bind(agooBind b);
 

data/ext/agoo/upgraded.c

@@ -55,7 +55,7 @@ agoo_upgraded_release_con(agooUpgraded up) {
 }
 
 // Called from the con_loop thread, no need to lock, this steals the subject
-// so the pub subject should set to NULL
+// so the pub subject should be set to NULL
 void
 agoo_upgraded_add_subject(agooUpgraded up, agooSubject subject) {
     agooSubject	s;
@@ -166,10 +166,9 @@ agoo_upgraded_pending(agooUpgraded up) {
 
 agooUpgraded
 agoo_upgraded_create(agooCon c, void * ctx, void *env) {
-    agooUpgraded	up = (agooUpgraded)AGOO_MALLOC(sizeof(struct _agooUpgraded));
+    agooUpgraded	up = (agooUpgraded)AGOO_CALLOC(1, sizeof(struct _agooUpgraded));
 
     if (NULL != up) {
-	memset(up, 0, sizeof(struct _agooUpgraded));
 	up->con = c;
 	up->ctx = ctx;
 	up->env = env;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.6.1'
+  VERSION = '2.7.0'
 end

data/test/static_test.rb

@@ -31,10 +31,13 @@ class StaticTest < Minitest::Test
 
     Agoo::Server.init(6469, 'root', thread_count: 1)
     Agoo::Server.add_mime('odd', 'text/odd')
+    #Agoo::Server.header_rule('odd.odd', 'text/odd', "Cookie", "fast=Agoo");
+    Agoo::Server.header_rule('odd.odd', '*', "Cookie", "fast=Agoo");
+    Agoo::Server.header_rule('**', 'odd', "Warning", "nothing wrong");
     Agoo::Server.start()
 
     @@server_started = true
-  end  
+  end
 
   def setup
     unless @@server_started
@@ -73,6 +76,8 @@ class StaticTest < Minitest::Test
       h.request(req)
     }
     assert_equal('text/odd', res['Content-Type'])
+    assert_equal('fast=Agoo', res['Cookie'])
+    assert_equal('nothing wrong', res['Warning'])
   end
 
   def test_fetch_auto_index