agoo 2.15.7 → 2.15.9

data/ext/agoo/req.h

@@ -31,6 +31,7 @@ typedef struct _agooReq {
     struct _agooUpgraded	*up;
     struct _agooStr		path;
     struct _agooStr		query;
+    struct _agooStr		protocol;
     struct _agooStr		header;
     struct _agooStr		body;
     char			remote[INET6_ADDRSTRLEN];
@@ -43,6 +44,7 @@ typedef struct _agooReq {
 extern agooReq		agoo_req_create(size_t mlen);
 extern void		agoo_req_destroy(agooReq req);
 extern const char*	agoo_req_host(agooReq r, int *lenp);
+extern const char*	agoo_req_protocol(agooReq r, int *lenp);
 extern int		agoo_req_port(agooReq r);
 extern const char*	agoo_req_query_value(agooReq r, const char *key, int klen, int *vlenp);
 extern int		agoo_req_query_decode(char *s, int len);

data/ext/agoo/request.c

@@ -48,6 +48,7 @@ static VALUE	request_method_val = Qundef;
 static VALUE	script_name_val = Qundef;
 static VALUE	server_name_val = Qundef;
 static VALUE	server_port_val = Qundef;
+static VALUE	server_protocol_val = Qundef;
 static VALUE	slash_val = Qundef;
 
 static VALUE	sse_sym;
@@ -218,6 +219,31 @@ server_name(VALUE self) {
     return req_server_name((agooReq)DATA_PTR(self));
 }
 
+static VALUE
+req_server_protocol(agooReq r) {
+    int		len;
+    const char	*protocol;
+
+    if (NULL == r) {
+	rb_raise(rb_eArgError, "Request is no longer valid.");
+    }
+    if (NULL == (protocol = agoo_req_protocol(r, &len))) {
+	return rb_str_new2("HTTP/1.1");
+    }
+    return rb_str_new(protocol, len);
+}
+
+/* Document-method: server_protocol
+ *
+ * call-seq: server_protocol()
+ *
+ * Returns the server or host protocol.
+ */
+static VALUE
+server_protocol(VALUE self) {
+    return req_server_protocol((agooReq)DATA_PTR(self));
+}
+
 static VALUE
 req_server_port(agooReq r) {
     int		len;
@@ -594,6 +620,7 @@ request_env(agooReq req, VALUE self) {
 	rb_hash_aset(env, remote_addr_val, req_remote_addr(req));
 	rb_hash_aset(env, server_port_val, req_server_port(req));
 	rb_hash_aset(env, server_name_val, req_server_name(req));
+	rb_hash_aset(env, server_protocol_val, req_server_protocol(req));
 	fill_headers(req, env);
 	rb_hash_aset(env, rack_version_val, rack_version_val_val);
 	rb_hash_aset(env, rack_url_scheme_val, req_rack_url_scheme(req));
@@ -739,6 +766,7 @@ request_init(VALUE mod) {
     rb_define_method(req_class, "query_string", query_string, 0);
     rb_define_method(req_class, "server_name", server_name, 0);
     rb_define_method(req_class, "server_port", server_port, 0);
+    rb_define_method(req_class, "server_protocol", server_protocol, 0);
     rb_define_method(req_class, "remote_addr", remote_addr, 0);
     rb_define_method(req_class, "rack_version", rack_version, 0);
     rb_define_method(req_class, "rack_url_scheme", rack_url_scheme, 0);
@@ -796,6 +824,7 @@ request_init(VALUE mod) {
     script_name_val = rb_str_new_cstr("SCRIPT_NAME");		rb_gc_register_address(&script_name_val);
     server_name_val = rb_str_new_cstr("SERVER_NAME");		rb_gc_register_address(&server_name_val);
     server_port_val = rb_str_new_cstr("SERVER_PORT");		rb_gc_register_address(&server_port_val);
+    server_protocol_val = rb_str_new_cstr("SERVER_PROTOCOL");		rb_gc_register_address(&server_protocol_val);
     slash_val = rb_str_new_cstr("/");				rb_gc_register_address(&slash_val);
 
     sse_sym = ID2SYM(rb_intern("sse"));				rb_gc_register_address(&sse_sym);

data/ext/agoo/rgraphql.c

@@ -406,6 +406,9 @@ ref_type(gqlRef ref) {
 	TypeClass	tc;
 	const char	*classname = rb_obj_classname((VALUE)ref);
 
+	if (RUBY_T_ARRAY == rb_type((VALUE)ref) && 0 < RARRAY_LEN((VALUE)ref)) {
+	    classname = rb_obj_classname(RARRAY_AREF((VALUE)ref, 0));
+	}
 	for (tc = type_class_map; NULL != tc->type; tc++) {
 	    if (0 == strcmp(classname, tc->classname)) {
 		type = tc->type;
@@ -436,8 +439,8 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
     ID			method;
     int			arity;
 
-    if ('_' == *sel->name && '_' == sel->name[1]) {
-	if (0 == strcmp("__typename", sel->name)) {
+    if ('_' == *key && '_' == key[1]) {
+	if (0 == strcmp("__typename", key)) {
 	    if (AGOO_ERR_OK != gql_set_typename(err, ref_type(target), key, result)) {
 		return err->code;
 	    }
@@ -447,9 +450,9 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
 	case GQL_QUERY:
 	    return gql_intro_eval(err, doc, sel, result, depth);
 	case GQL_MUTATION:
-	    return agoo_err_set(err, AGOO_ERR_EVAL, "%s can not be called on a mutation.", sel->name);
+	    return agoo_err_set(err, AGOO_ERR_EVAL, "%s can not be called on a mutation.", key);
 	case GQL_SUBSCRIPTION:
-	    return agoo_err_set(err, AGOO_ERR_EVAL, "%s can not be called on a subscription.", sel->name);
+	    return agoo_err_set(err, AGOO_ERR_EVAL, "%s can not be called on a subscription.", key);
 	default:
 	    return agoo_err_set(err, AGOO_ERR_EVAL, "Not a valid operation on the root object.");
 	}