agoo 2.11.7 → 2.13.0

data/ext/agoo/rserver.c

@@ -103,6 +103,7 @@ configure(agooErr err, int port, const char *root, VALUE options) {
     }
     agoo_server.thread_cnt = 0;
     the_rserver.worker_cnt = 1;
+    the_rserver.uses = NULL;
     atomic_init(&agoo_server.running, 0);
     agoo_server.listen_thread = 0;
     agoo_server.con_loops = NULL;
@@ -209,6 +210,7 @@ configure(agooErr err, int port, const char *root, VALUE options) {
 	    agooHook	dump_hook;
 	    agooHook	get_hook;
 	    agooHook	post_hook;
+	    agooHook	options_hook;
 	    char	schema_path[256];
 	    long	plen;
 
@@ -227,9 +229,11 @@ configure(agooErr err, int port, const char *root, VALUE options) {
 	    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;
 	    get_hook->next = post_hook;
-	    post_hook->next = agoo_server.hooks;
+	    post_hook->next = options_hook;
+	    options_hook->next = agoo_server.hooks;
 	    agoo_server.hooks = dump_hook;
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("quiet"))))) {
@@ -381,7 +385,7 @@ handle_base_inner(VALUE x) {
 
 static void*
 handle_base(void *x) {
-    rb_rescue2(handle_base_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_base_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
 
     return NULL;
 }
@@ -610,7 +614,7 @@ handle_rack_inner(VALUE x) {
 static void*
 handle_rack(void *x) {
     //rb_gc_disable();
-    rb_rescue2(handle_rack_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_rack_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
     //rb_gc_enable();
     //rb_gc();
 
@@ -635,7 +639,7 @@ handle_wab_inner(VALUE x) {
 
 static void*
 handle_wab(void *x) {
-    rb_rescue2(handle_wab_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_wab_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
 
     return NULL;
 }
@@ -693,7 +697,7 @@ handle_push_inner(VALUE x) {
 
 static void*
 handle_push(void *x) {
-    rb_rescue2(handle_push_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_push_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
     return NULL;
 }
 
@@ -1011,6 +1015,14 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
 	    }
 	}
     }
+    if (NULL != the_rserver.uses) {
+	RUse	u;
+
+	for (u = the_rserver.uses; NULL != u; u = u->next) {
+	    u->argv[0] = handler;
+	    handler = rb_funcall2(u->clas, rb_intern("new"), u->argc, u->argv);
+	}
+    }
     if (NULL == (hook = rhook_create(meth, pat, handler, &agoo_server.eval_queue))) {
 	rb_raise(rb_eStandardError, "out of memory.");
     } else {
@@ -1192,6 +1204,40 @@ rack_early_hints(VALUE self, VALUE on) {
     return on;
 }
 
+/* Document-method: use
+ *
+ * call-seq: use(middleware, *args)
+ *
+ * The use function must be called before the _handle_ functions. Any
+ * invocations of _use_ apply only to handlers called after the call to use.
+ */
+static VALUE
+use(int argc, VALUE *argv, VALUE self) {
+    VALUE	mc;
+    RUse	u;
+
+    if (argc < 1) { // at least the middleware class must be provided.
+	rb_raise(rb_eArgError, "no middleware class provided");
+    }
+    mc = argv[0];
+    if (T_CLASS != rb_type(mc)) {
+	rb_raise(rb_eArgError, "the first argument to use must be a class");
+    }
+    if (NULL == (u = (RUse)AGOO_MALLOC(sizeof(struct _rUse)))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for a middleware use.");
+    }
+    u->clas = mc;
+    u->argc = argc;
+    if (NULL == (u->argv = (VALUE*)AGOO_MALLOC(sizeof(VALUE) * u->argc))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for a middleware use.");
+    }
+    memcpy(u->argv, argv, argc * sizeof(VALUE));
+    u->next = the_rserver.uses;
+    the_rserver.uses = u;
+
+    return Qnil;
+}
+
 /* Document-class: Agoo::Server
  *
  * An HTTP server that support the rack API as well as some other optimized
@@ -1211,6 +1257,7 @@ server_init(VALUE mod) {
     rb_define_module_function(server_mod, "path_group", path_group, 2);
     rb_define_module_function(server_mod, "header_rule", header_rule, 4);
     rb_define_module_function(server_mod, "domain", domain, 2);
+    rb_define_module_function(server_mod, "use", use, -1);
 
     rb_define_module_function(server_mod, "rack_early_hints", rack_early_hints, 1);
 

data/ext/agoo/rserver.h

@@ -7,10 +7,18 @@
 
 #define MAX_WORKERS	32
 
+typedef struct _rUse {
+    struct _rUse	*next;
+    VALUE		clas;
+    VALUE		*argv;
+    int			argc;
+} *RUse;
+
 typedef struct _rServer {
     int		worker_cnt;
     int		worker_pids[MAX_WORKERS];
     VALUE	*eval_threads; // Qnil terminated
+    RUse	uses;
 } *RServer;
 
 extern struct _rServer	the_rserver;

data/ext/agoo/sdl.c

@@ -168,14 +168,13 @@ make_scalar(agooErr err, agooDoc doc, const char *desc, int len, bool x) {
 }
 
 static int
-read_type(agooErr err, agooDoc doc, gqlType *typep, bool *required) {
+read_type(agooErr err, agooDoc doc, gqlType *typep) {
     agoo_doc_skip_white(doc);
     if ('[' == *doc->cur) {
 	gqlType	base;
-	bool	not_empty = false;
 
 	doc->cur++;
-	if (AGOO_ERR_OK != read_type(err, doc, &base, &not_empty)) {
+	if (AGOO_ERR_OK != read_type(err, doc, &base)) {
 	    return err->code;
 	}
 	agoo_doc_skip_white(doc);
@@ -183,7 +182,7 @@ read_type(agooErr err, agooDoc doc, gqlType *typep, bool *required) {
 	    return agoo_doc_err(doc, err, "List type not terminated with a ]");
 	}
 	doc->cur++;
-	if (NULL == (*typep = gql_assure_list(err, base, not_empty))) {
+	if (NULL == (*typep = gql_assure_list(err, base))) {
 	    return err->code;
 	}
     } else {
@@ -196,10 +195,13 @@ read_type(agooErr err, agooDoc doc, gqlType *typep, bool *required) {
 	    return err->code;
 	}
     }
-    *required = false;
     agoo_doc_skip_white(doc);
     if ('!' == *doc->cur) {
-	*required = true;
+	gqlType	base = *typep;
+
+	if (NULL == (*typep = gql_assure_nonnull(err, base))) {
+	    return err->code;
+	}
 	doc->cur++;
     }
     return AGOO_ERR_OK;
@@ -272,7 +274,6 @@ make_union(agooErr err, agooDoc doc, const char *desc, int len, bool x) {
     char	name[256];
     gqlType	type;
     gqlType	member;
-    bool	required;
 
     if (AGOO_ERR_OK != extract_name(err, doc, union_str, sizeof(union_str) - 1, name, sizeof(name))) {
 	return err->code;
@@ -296,7 +297,7 @@ make_union(agooErr err, agooDoc doc, const char *desc, int len, bool x) {
     agoo_doc_skip_white(doc);
 
     while (doc->cur < doc->end) {
-	if (AGOO_ERR_OK != read_type(err, doc, &member, &required)) {
+	if (AGOO_ERR_OK != read_type(err, doc, &member)) {
 	    goto ERROR;
 	}
  	if (AGOO_ERR_OK != gql_union_add(err, type, member)) {
@@ -325,7 +326,6 @@ make_dir_arg(agooErr err, agooDoc doc, gqlDir dir) {
     const char	*desc = NULL;
     size_t	dlen;
     size_t	nlen;
-    bool	required = false;
     gqlValue	dv = NULL;
 
     if (AGOO_ERR_OK != extract_desc(err, doc, &desc, &dlen)) {
@@ -368,7 +368,9 @@ make_dir_arg(agooErr err, agooDoc doc, gqlDir dir) {
     }
     agoo_doc_skip_white(doc);
     if ('!' == *doc->cur) {
-	required = true;
+	if (NULL == (type = gql_assure_nonnull(err, type))) {
+	    return err->code;
+	}
 	doc->cur++;
     } else if ('=' == *doc->cur) {
 	if (NULL == (dv = agoo_doc_read_value(err, doc, type))) {
@@ -379,7 +381,7 @@ make_dir_arg(agooErr err, agooDoc doc, gqlDir dir) {
     if ('@' == *doc->cur) {
 	// TBD directive
     }
-    if (NULL == gql_dir_arg(err, dir, name, type, desc, dlen, dv, required)) {
+    if (NULL == gql_dir_arg(err, dir, name, type, desc, dlen, dv)) {
 	return err->code;
     }
     return AGOO_ERR_OK;
@@ -451,7 +453,6 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
     gqlType	type;
     const char	*desc = NULL;
     size_t	dlen;
-    bool 	required = false;
     gqlValue	dval = NULL;
 
     if (AGOO_ERR_OK != extract_desc(err, doc, &desc, &dlen)) {
@@ -467,7 +468,7 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
     }
     doc->cur++;
 
-    if (AGOO_ERR_OK != read_type(err, doc, &type, &required)) {
+    if (AGOO_ERR_OK != read_type(err, doc, &type)) {
 	return err->code;
     }
     agoo_doc_skip_white(doc);
@@ -484,7 +485,7 @@ make_field_arg(agooErr err, agooDoc doc, gqlField field) {
     default: // ) or next arg
 	break;
     }
-    if (NULL == gql_field_arg(err, field, name, type, desc, dlen, dval, required)) {
+    if (NULL == gql_field_arg(err, field, name, type, desc, dlen, dval)) {
 	return err->code;
     }
     return AGOO_ERR_OK;
@@ -500,7 +501,6 @@ make_field(agooErr err, agooDoc doc, gqlType type) {
     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;
@@ -531,7 +531,7 @@ make_field(agooErr err, agooDoc doc, gqlType type) {
     default:
 	return agoo_doc_err(doc, err, "Expected : or (");
     }
-    if (AGOO_ERR_OK != read_type(err, doc, &return_type, &required)) {
+    if (AGOO_ERR_OK != read_type(err, doc, &return_type)) {
 	return err->code;
     }
     if ('=' == *doc->cur) {
@@ -543,7 +543,7 @@ make_field(agooErr err, agooDoc doc, gqlType type) {
     if (AGOO_ERR_OK != extract_dir_use(err, doc, &uses)) {
 	return err->code;
     }
-    if (NULL == (field = gql_type_field(err, type, name, return_type, dval, desc, dlen, required))) {
+    if (NULL == (field = gql_type_field(err, type, name, return_type, dval, desc, dlen))) {
 	return err->code;
     }
     field->dir = uses;
@@ -574,7 +574,6 @@ make_input_arg(agooErr err, agooDoc doc, gqlType type) {
     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;
@@ -588,7 +587,7 @@ make_input_arg(agooErr err, agooDoc doc, gqlType type) {
 	return agoo_doc_err(doc, err, "Expected :");
     }
     doc->cur++;
-    if (AGOO_ERR_OK != read_type(err, doc, &return_type, &required)) {
+    if (AGOO_ERR_OK != read_type(err, doc, &return_type)) {
 	return err->code;
     }
     if ('=' == *doc->cur) {
@@ -600,7 +599,7 @@ make_input_arg(agooErr err, agooDoc doc, gqlType type) {
     if (AGOO_ERR_OK != extract_dir_use(err, doc, &uses)) {
 	return err->code;
     }
-    if (NULL == (arg = gql_input_arg(err, type, name, return_type, desc, dlen, dval, required))) {
+    if (NULL == (arg = gql_input_arg(err, type, name, return_type, desc, dlen, dval))) {
 	return err->code;
     }
     arg->dir = uses;
@@ -699,7 +698,6 @@ static int
 extract_interfaces(agooErr err, agooDoc doc, gqlTypeLink *interfacesp) {
     gqlType	type;
     gqlTypeLink	link;
-    bool	required;
     bool	first = true;
 
     agoo_doc_skip_white(doc);
@@ -722,9 +720,8 @@ extract_interfaces(agooErr err, agooDoc doc, gqlTypeLink *interfacesp) {
 	    return agoo_doc_err(doc, err, "Expected &");
 	}
 	first = false;
-	required = false;
 	type = NULL;
-    	if (AGOO_ERR_OK != read_type(err, doc, &type, &required)) {
+    	if (AGOO_ERR_OK != read_type(err, doc, &type)) {
 	    return err->code;
 	}
 	if (NULL == (link = (gqlTypeLink)AGOO_MALLOC(sizeof(struct _gqlTypeLink)))) {
@@ -1052,7 +1049,6 @@ static int
 make_op_var(agooErr err, agooDoc doc, gqlOp op) {
     char	name[256];
     gqlType	type;
-    bool	ignore;
     gqlValue	value = NULL;
     gqlVar	var;
 
@@ -1070,7 +1066,7 @@ make_op_var(agooErr err, agooDoc doc, gqlOp op) {
     }
     doc->cur++;
 
-    if (AGOO_ERR_OK != read_type(err, doc, &type, &ignore)) {
+    if (AGOO_ERR_OK != read_type(err, doc, &type)) {
 	return err->code;
     }
     agoo_doc_skip_white(doc);
@@ -1496,6 +1492,7 @@ lookup_field_type(gqlType type, const char *field, bool qroot) {
 	break;
     }
     case GQL_LIST:
+    case GQL_NON_NULL:
 	ftype = lookup_field_type(type->base, field, false);
 	break;
     case GQL_UNION: // Can not be used directly for query type determinations.
@@ -1524,7 +1521,7 @@ sel_set_type(agooErr err, gqlType type, gqlSel sels, bool qroot) {
 	    }
 	} else {
 	    if (NULL == (sel->type = lookup_field_type(type, sel->name, qroot))) {
-		return agoo_err_set(err, AGOO_ERR_EVAL, "Failed to determine the type for %s.", sel->name);
+		return agoo_err_set(err, AGOO_ERR_EVAL, "Failed to determine the type for %s in %s.", sel->name, type->name);
 	    }
 	}
 	if (NULL != sel->sels) {

data/ext/agoo/sdl.h

@@ -15,6 +15,6 @@ 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, gqlOpKind default_kind);
 
-extern gqlVar	gql_op_var_create(agooErr err, const char *name, struct _gqlType *type, struct _gqlValue *value);
+extern gqlVar		gql_op_var_create(agooErr err, const char *name, struct _gqlType *type, struct _gqlValue *value);
 
 #endif // AGOO_SDL_H

data/lib/agoo.rb

@@ -4,6 +4,7 @@ end
 
 require 'stringio' # needed for Ruby 2.7
 require 'agoo/version'
+require 'agoo/graphql'
 require 'rack/handler/agoo'
 require 'agoo/agoo' # C extension
 

data/lib/agoo/graphql.rb

@@ -0,0 +1,9 @@
+
+module Agoo
+  class GraphQL
+  end
+end
+
+require 'agoo/graphql/arg'
+require 'agoo/graphql/field'
+require 'agoo/graphql/type'

data/lib/agoo/graphql/arg.rb

@@ -0,0 +1,13 @@
+
+module Agoo
+  class GraphQL
+
+    class Arg
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :type_name
+      attr_accessor :default_value
+    end
+
+  end
+end

data/lib/agoo/graphql/field.rb

@@ -0,0 +1,14 @@
+
+module Agoo
+  class GraphQL
+
+    class Field
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :type_name
+      attr_accessor :args
+      attr_accessor :default_value
+    end
+
+  end
+end

data/lib/agoo/graphql/type.rb

@@ -0,0 +1,12 @@
+
+module Agoo
+  class GraphQL
+
+    class Type
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :fields
+    end
+
+  end
+end

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.11.7'
+  VERSION = '2.13.0'
 end

data/test/graphql_test.rb

@@ -26,7 +26,7 @@ class Artist
     @likes = 0
   end
 
-  def song(args={})
+  def song(args)
     @songs[args['name']]
   end
 
@@ -35,7 +35,7 @@ class Artist
     @songs << song
   end
 
-  def genre_songs(args={})
+  def genre_songs(args)
     g = args['genre']
     a = []
     @songs.each { |s|
@@ -126,7 +126,7 @@ class Query
     @artists = artists
   end
 
-  def artist(args={})
+  def artist(args)
     @artists[args['name']]
   end
 end
@@ -138,7 +138,7 @@ class Mutation
     @artists = artists
   end
 
-  def like(args={})
+  def like(args)
     artist = @artists[args['artist']]
     artist.like
     artist
@@ -227,6 +227,12 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
       Agoo::GraphQL.load($songs_sdl)
       Agoo::GraphQL.load($extend_sdl)
     }
+=begin
+      Agoo::GraphQL.build_headers = proc{ |req|
+	{ 'Set-Cookie' => 'UserID=Bozo; Max-Age=3600; Version=1' }
+      }
+=end
+    Agoo::GraphQL.headers({ 'Set-Cookie' => 'UserID=Bozo; Max-Age=3600; Version=1' })
     @@server_started = true
   end
 
@@ -283,6 +289,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
     }
     content = res.body
     assert_equal('application/json', res['Content-Type'])
+    assert_equal('UserID=Bozo; Max-Age=3600; Version=1', res['Set-Cookie'])
     assert_equal(expect, content)
   end
 
@@ -671,7 +678,7 @@ query skippy($boo: Boolean = true){
     "__type":{
       "name":"[__Type!]",
       "ofType":{
-        "name":"__Type"
+        "name":"__Type!"
       }
     }
   }
@@ -735,7 +742,7 @@ query skippy($boo: Boolean = true){
         {
           "name":"name",
           "type":{
-            "name":"String"
+            "name":"String!"
           },
           "args":[
           ]
@@ -837,9 +844,6 @@ query skippy($boo: Boolean = true){
         {
           "name":"Boolean"
         },
-        {
-          "name":"schema"
-        },
         {
           "name":"String"
         },
@@ -913,15 +917,14 @@ query skippy($boo: Boolean = true){
           ]
         },
         {
-          "name":"skip",
+          "name":"deprecated",
           "locations":[
-            "FIELD",
-            "FRAGMENT_SPREAD",
-            "INLINE_FRAGMENT"
+            "FIELD_DEFINITION",
+            "ENUM_VALUE"
           ],
           "args":[
             {
-              "name":"if"
+              "name":"reason"
             }
           ]
         },
@@ -939,14 +942,15 @@ query skippy($boo: Boolean = true){
           ]
         },
         {
-          "name":"deprecated",
+          "name":"skip",
           "locations":[
-            "FIELD_DEFINITION",
-            "ENUM_VALUE"
+            "FIELD",
+            "FRAGMENT_SPREAD",
+            "INLINE_FRAGMENT"
           ],
           "args":[
             {
-              "name":"reason"
+              "name":"if"
             }
           ]
         }