agoo 2.11.5 → 2.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce68645d5351caf6ee4ee9ed8a847664fe6c9e1334947f984783cc8f6d5c248b
-  data.tar.gz: 3466c51b026c045567b6534783bc490dfc9410a408dbdcb46bffd85728f145cf
+  metadata.gz: ec973e4fdcdde42dc7fa2109e4165f8b6aa7218562c8b650607b61e1eed66f20
+  data.tar.gz: fed893a8ecd3fd01db7ae5620e9f52a55a7c265355a9b0236d750d39d3ff801e
 SHA512:
-  metadata.gz: da955066a9c61a1cfd61d20e60e391f42f6308944914c01ead803ea0241ea4511a86a493dce1aa5d43ea465114a2db73d4225df85479530ba775ad0230a56d4a
-  data.tar.gz: 795e1b466ddbe193afba133355471c1b7ecf753199a696a89bb3733c791c90d900605333cade4fffc5694011f105622fc028c9bd3309d9bde2f35f979857af68
+  metadata.gz: 0e0b1e3ef863a137dc99e4377f34d2b0597bf6b29c26e778e18b2f626c4faeb991219228e2fbde41f6f6b7d2f8a2f0d80c5f5550c0a07cd7c1d9192365e2ab70
+  data.tar.gz: 294ac4028f17faca961d3f8e5fc26537fc8f2e8c9887ccabccc5e3b5ee8eafad4ab9755b9783c7def1757fdde689aae676820556e12202cece9f63bbc69e03d2

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All changes to the Agoo gem are documented here. Releases follow semantic versio
 
 ## [Unreleased]
 
+## [2.11.6] - [2019-12-??]
+
+Bug fixes
+
+### Fixed
+
+- Missing variable arguments no longer cause a crash.
+
+- Eliminated the type cast warnings introduced by the Ruby 2.6.5 which uses stricter makefile settings.
+
 ## [2.11.5] - [2019-11-11]
 
 Alpine

data/ext/agoo/con.c

@@ -509,13 +509,13 @@ agoo_con_http_read(agooCon c) {
     if (AGOO_CON_HTTPS == c->bind->kind) {
 #ifdef HAVE_OPENSSL_SSL_H
 	if (NULL != c->req) {
-	    cnt = SSL_read(c->ssl, c->req->msg + c->bcnt, c->req->mlen - c->bcnt);
+	    cnt = SSL_read(c->ssl, c->req->msg + c->bcnt, (int)(c->req->mlen - c->bcnt));
 	} else {
-	    cnt = SSL_read(c->ssl, c->buf + c->bcnt, sizeof(c->buf) - c->bcnt - 1);
+	    cnt = SSL_read(c->ssl, c->buf + c->bcnt, (int)(sizeof(c->buf) - c->bcnt - 1));
 	}
 	if (0 > cnt) {
 	    //unsigned long	e = ERR_get_error();
-	    int		e = ERR_get_error();
+	    int		e = (int)ERR_get_error();
 
 	    if (0 == e) {
 		return false;
@@ -661,7 +661,7 @@ agoo_con_http_write(agooCon c) {
     }
     if (AGOO_CON_HTTPS == c->bind->kind) {
 #ifdef HAVE_OPENSSL_SSL_H
-	if (0 >= (cnt = SSL_write(c->ssl, message->text + c->wcnt, message->len - c->wcnt))) {
+	if (0 >= (cnt = SSL_write(c->ssl, message->text + c->wcnt, (int)(message->len - c->wcnt)))) {
 	    unsigned long	e = ERR_get_error();
 
 	    if (0 == e) {

data/ext/agoo/doc.c

@@ -340,7 +340,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	doc->cur++;
 	start++;
 	agoo_doc_read_token(doc);
-	value = gql_var_create(err, start, doc->cur - start);
+	value = gql_var_create(err, start, (int)(doc->cur - start));
 	break;
     case '"': {
 	const char	*end;
@@ -355,7 +355,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	} else {
 	    end = doc->cur - 1;
 	}
-	value = gql_string_create(err, start, end - start);
+	value = gql_string_create(err, start, (int)(end - start));
 	break;
     }
     case '-':
@@ -377,7 +377,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	if (doc->cur - start == 4 && 0 == strncmp("null", start, 4)) {
 	    value = gql_null_create(err);
 	} else {
-	    value = gql_token_create(err, start, doc->cur - start, type);
+	    value = gql_token_create(err, start, (int)(doc->cur - start), type);
 	}
 	break;
     case 't':
@@ -385,7 +385,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	if (doc->cur - start == 4 && 0 == strncmp("true", start, 4)) {
 	    value = gql_bool_create(err, true);
 	} else {
-	    value = gql_token_create(err, start, doc->cur - start, type);
+	    value = gql_token_create(err, start, (int)(doc->cur - start), type);
 	}
 	break;
     case 'f':
@@ -393,7 +393,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	if (doc->cur - start == 5 && 0 == strncmp("false", start, 5)) {
 	    value = gql_bool_create(err, false);
 	} else {
-	    value = gql_token_create(err, start, doc->cur - start, type);
+	    value = gql_token_create(err, start, (int)(doc->cur - start), type);
 	}
 	break;
     case '[':
@@ -467,7 +467,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	break;
     default: // Enum value
 	agoo_doc_read_token(doc);
-	value = gql_token_create(err, start, doc->cur - start, type);
+	value = gql_token_create(err, start, (int)(doc->cur - start), type);
 	break;
     }
     return value;

data/ext/agoo/gqleval.c

@@ -48,7 +48,7 @@ err_resp(agooRes res, agooErr err, int status) {
     long long		frac = (long long)now % 1000000000LL;
     struct _agooTime	at;
     const char		*code = agoo_err_str(err->code);
-    int			clen = strlen(code);
+    int			clen = (int)strlen(code);
 
     agoo_sectime(t, &at);
     cnt = snprintf(buf, sizeof(buf),
@@ -488,7 +488,7 @@ eval_post(agooErr err, agooReq req) {
     gqlValue		result = NULL;
     gqlValue		j = NULL;
 
-    // TBD handle query parameter and concatenate with body query if present
+    // TBD handle query parameter and concatenate with JSON body variables if present
 
     op_name = agoo_req_query_value(req, operation_name_str, sizeof(operation_name_str) - 1, &oplen);
     var_json = agoo_req_query_value(req, variables_str, sizeof(variables_str) - 1, &vlen);
@@ -521,14 +521,14 @@ eval_post(agooErr err, agooReq req) {
 			goto DONE;
 		    }
 		    query = s;
-		    qlen = strlen(s);
+		    qlen = (int)strlen(s);
 		} else if (0 == strcmp("operationName", m->key)) {
 		    if (NULL == (s = gql_string_get(m->value))) {
 			agoo_err_set(err, AGOO_ERR_TYPE, "operationName must be an string");
 			goto DONE;
 		    }
 		    op_name = s;
-		    oplen = strlen(s);
+		    oplen = (int)strlen(s);
 		} else if (0 == strcmp("variables", m->key)) {
 		    gqlLink	link;
 

data/ext/agoo/gqljson.c

@@ -116,7 +116,7 @@ parse_num(agooErr err, agooDoc doc) {
 	if (INT32_MAX < i) {
 	    value = gql_i64_create(err, si);
 	} else {
-	    value = gql_int_create(err, si);
+	    value = gql_int_create(err, (int)si);
 	}
     } else { // decimal
 	double	d = (double)i + (double)num / (double)div;
@@ -256,7 +256,7 @@ parse_escaped(agooErr err, agooDoc doc) {
 	    return NULL;
 	}
     }
-    value = gql_string_create(err, t->text, t->len);
+    value = gql_string_create(err, t->text, (int)(t->len));
     doc->cur++; // past trailing "
 DONE:
     agoo_text_release(t);
@@ -458,7 +458,7 @@ gqlValue
 gql_json_parse(agooErr err, const char *json, size_t len) {
     struct _agooDoc	doc;
 
-    agoo_doc_init(&doc, json, len);
+    agoo_doc_init(&doc, json, (int)(len));
 
     return parse_value(err, &doc);
 }

data/ext/agoo/graphql.h

@@ -54,7 +54,6 @@ struct _agooReq;
 struct _gqlDirUse;
 struct _gqlField;
 struct _gqlLink;
-struct _gqlLink;
 struct _gqlType;
 struct _gqlValue;
 

data/ext/agoo/page.c

@@ -523,7 +523,7 @@ agoo_page_immutable(agooErr err, const char *path, const char *content, int clen
 	}
 	plen = (int)strlen(path);
 	if (NULL != cache.root) {
-	    int	rlen = strlen(cache.root);
+	    int	rlen = (int)strlen(cache.root);
 
 	    if (0 == strncmp(cache.root, p->path, rlen) && '/' == p->path[rlen]) {
 		rel_path = p->path + rlen + 1;
@@ -657,7 +657,7 @@ update_contents(agooPage p) {
     rewind(f);
 
     if (NULL != cache.root) {
-	int	rlen = strlen(cache.root);
+	int	rlen = (int)strlen(cache.root);
 
 	if (0 == strncmp(cache.root, path, rlen) && '/' == path[rlen]) {
 	    rel_path = path + rlen + 1;
@@ -972,7 +972,7 @@ agoo_header_rule(agooErr err, const char *path, const char *mime, const char *ke
     } else if (NULL == (hr->mime = AGOO_STRDUP(mime))) {
 	goto ERROR;
     }
-    hr->len = strlen(hr->key) + strlen(hr->value) + 4;
+    hr->len = (int)strlen(hr->key) + (int)strlen(hr->value) + 4;
     hr->next = cache.head_rules;
     cache.head_rules = hr;
 

data/ext/agoo/pub.c

@@ -105,7 +105,7 @@ agoo_pub_dup(agooPub src) {
 	if (NULL == src->subject) {
 	    p->subject = NULL;
 	} else {
-	    p->subject = agoo_subject_create(src->subject->pattern, strlen(src->subject->pattern));
+	    p->subject = agoo_subject_create(src->subject->pattern, (int)strlen(src->subject->pattern));
 	}
 	p->msg = src->msg;
 	if (NULL != p->msg) {

data/ext/agoo/rgraphql.c

@@ -233,7 +233,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	    break;
 	case RUBY_T_STRING:
 	    v = ref_to_string(ref);
-	    value = gql_string_create(err, rb_string_value_ptr(&v), RSTRING_LEN(v));
+	    value = gql_string_create(err, rb_string_value_ptr(&v), (int)RSTRING_LEN(v));
 	    break;
 	case RUBY_T_ARRAY: {
 	    gqlValue	v;
@@ -265,7 +265,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	    if (i < INT32_MIN || INT32_MAX < i) {
 		value = gql_i64_create(err, i);
 	    } else {
-		value = gql_int_create(err, i);
+		value = gql_int_create(err, (int)i);
 	    }
 	    break;
 	}
@@ -282,7 +282,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	}
 	default:
 	    v = ref_to_string(ref);
-	    value = gql_string_create(err, rb_string_value_ptr(&v), RSTRING_LEN(v));
+	    value = gql_string_create(err, rb_string_value_ptr(&v), (int)RSTRING_LEN(v));
 	    break;
 	}
     } else if (GQL_SCALAR == type->kind) {
@@ -307,7 +307,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	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));
+	    value = gql_string_create(err, rb_string_value_ptr(&v), (int)RSTRING_LEN(v));
 	    break;
 	case GQL_SCALAR_TIME: {
 	    VALUE	clas = rb_obj_class((VALUE)ref);
@@ -319,7 +319,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	}
 	case GQL_SCALAR_UUID:
 	    v = ref_to_string(ref);
-	    value = gql_uuid_str_create(err, rb_string_value_ptr(&v), RSTRING_LEN(v));
+	    value = gql_uuid_str_create(err, rb_string_value_ptr(&v), (int)RSTRING_LEN(v));
 	    break;
 	case GQL_SCALAR_LIST: {
 	    gqlValue	v;
@@ -347,7 +347,7 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
 	}
     } else if (GQL_ENUM == type->kind) {
 	v = ref_to_string(ref);
-	value = gql_string_create(err, rb_string_value_ptr(&v), RSTRING_LEN(v));
+	value = gql_string_create(err, rb_string_value_ptr(&v), (int)RSTRING_LEN(v));
     } else {
 	rb_raise(rb_eStandardError, "Can not coerce a non-scalar into a %s.", type->name);
     }
@@ -410,6 +410,9 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
 	    } else {
 		v = sa->value;
 	    }
+	    if (NULL == v) {
+		v = gql_null_create(err);
+	    }
 	    if (NULL != field) {
 		gqlArg	fa;
 
@@ -431,7 +434,7 @@ resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlV
     if (GQL_SUBSCRIPTION == doc->op->kind && RUBY_T_STRING == rb_type(child)) {
 	gqlValue	c;
 
-	if (NULL == (c = gql_string_create(err, rb_string_value_ptr(&child), RSTRING_LEN(child))) ||
+	if (NULL == (c = gql_string_create(err, rb_string_value_ptr(&child), (int)RSTRING_LEN(child))) ||
 	    AGOO_ERR_OK != gql_object_set(err, result, "subject", c)) {
 	    return err->code;
 	}
@@ -669,7 +672,7 @@ graphql_load(VALUE self, VALUE sdl) {
 	rb_raise(rb_eStandardError, "GraphQL root not set. Use Agoo::GraphQL.schema.");
     }
     rb_check_type(sdl, T_STRING);
-    if (AGOO_ERR_OK != sdl_parse(&err, StringValuePtr(sdl), RSTRING_LEN(sdl))) {
+    if (AGOO_ERR_OK != sdl_parse(&err, StringValuePtr(sdl), (int)RSTRING_LEN(sdl))) {
 	rb_raise(rb_eStandardError, "%s", err.msg);
     }
     return Qnil;
@@ -712,7 +715,7 @@ graphql_load_file(VALUE self, VALUE path) {
 	sdl[len] = '\0';
     }
     fclose(f);
-    if (AGOO_ERR_OK != sdl_parse(&err, sdl, len)) {
+    if (AGOO_ERR_OK != sdl_parse(&err, sdl, (int)len)) {
 	xfree(sdl);
 	rb_raise(rb_eStandardError, "%s", err.msg);
     }

data/ext/agoo/rserver.c

@@ -412,7 +412,7 @@ header_cb(VALUE key, VALUE value, agooText *tp) {
 		}
 	    } else {
 		if (vs < end) {
-		    *tp = agoo_text_append(*tp, vs, end - vs);
+		    *tp = agoo_text_append(*tp, vs, (int)(end - vs));
 		}
 		vlen -= end - vs + 1;
 		vs = end + 1;
@@ -995,7 +995,7 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
 		if (NULL == t) {
 		    rb_raise(rb_eNoMemError, "Failed to allocate memory for a response.");
 		}
-		if (NULL == agoo_page_immutable(&err, pat, t->text, t->len)) {
+		if (NULL == agoo_page_immutable(&err, pat, t->text, (int)t->len)) {
 		    rb_raise(rb_eArgError, "%s", err.msg);
 		}
 		agoo_text_release(t);

data/ext/agoo/sdl.c

@@ -867,14 +867,14 @@ sdl_parse(agooErr err, const char *str, int len) {
 	case 's': // schema or scalar
 	    if (6 < (doc.end - doc.cur) && 'c' == doc.cur[1]) {
 		if ('a' == doc.cur[2]) {
-		    if (AGOO_ERR_OK != make_scalar(err, &doc, desc, dlen, extend_next)) {
+		    if (AGOO_ERR_OK != make_scalar(err, &doc, desc, (int)dlen, extend_next)) {
 			return err->code;
 		    }
 		    desc = NULL;
 		    dlen = 0;
 		    break;
 		} else {
-		    if (AGOO_ERR_OK != make_schema(err, &doc, desc, dlen, extend_next)) {
+		    if (AGOO_ERR_OK != make_schema(err, &doc, desc, (int)dlen, extend_next)) {
 			return err->code;
 		    }
 		    desc = NULL;
@@ -886,7 +886,7 @@ sdl_parse(agooErr err, const char *str, int len) {
 	case 'e': // enum or extend
 	    if (4 < (doc.end - doc.cur)) {
 		if ('n' == doc.cur[1]) {
-		    if (AGOO_ERR_OK != make_enum(err, &doc, desc, dlen, extend_next)) {
+		    if (AGOO_ERR_OK != make_enum(err, &doc, desc, (int)dlen, extend_next)) {
 			return err->code;
 		    }
 		    desc = NULL;
@@ -904,21 +904,21 @@ sdl_parse(agooErr err, const char *str, int len) {
 	    }
 	    return agoo_doc_err(&doc, err, "Unknown directive");
 	case 'u': // union
-	    if (AGOO_ERR_OK != make_union(err, &doc, desc, dlen, extend_next)) {
+	    if (AGOO_ERR_OK != make_union(err, &doc, desc, (int)dlen, extend_next)) {
 		return err->code;
 	    }
 	    desc = NULL;
 	    dlen = 0;
 	    break;
 	case 'd': // directive
-	    if (AGOO_ERR_OK != make_directive(err, &doc, desc, dlen)) {
+	    if (AGOO_ERR_OK != make_directive(err, &doc, desc, (int)dlen)) {
 		return err->code;
 	    }
 	    desc = NULL;
 	    dlen = 0;
 	    break;
 	case 't': // type
-	    if (AGOO_ERR_OK != make_type(err, &doc, desc, dlen, extend_next)) {
+	    if (AGOO_ERR_OK != make_type(err, &doc, desc, (int)dlen, extend_next)) {
 		return err->code;
 	    }
 	    desc = NULL;
@@ -927,14 +927,14 @@ sdl_parse(agooErr err, const char *str, int len) {
 	case 'i': // interface, input
 	    if (5 < (doc.end - doc.cur) && 'n' == doc.cur[1]) {
 		if ('p' == doc.cur[2]) {
-		    if (AGOO_ERR_OK != make_input(err, &doc, desc, dlen, extend_next)) {
+		    if (AGOO_ERR_OK != make_input(err, &doc, desc, (int)dlen, extend_next)) {
 			return err->code;
 		    }
 		    desc = NULL;
 		    dlen = 0;
 		    break;
 		} else {
-		    if (AGOO_ERR_OK != make_interface(err, &doc, desc, dlen, extend_next)) {
+		    if (AGOO_ERR_OK != make_interface(err, &doc, desc, (int)dlen, extend_next)) {
 			return err->code;
 		    }
 		    desc = NULL;
@@ -1001,7 +1001,7 @@ make_sel_arg(agooErr err, agooDoc doc, gqlDoc gdoc, gqlOp op, gqlSel sel) {
 		break;
 	    }
 	}
-	if (NULL == var) {
+	if (NULL == var || NULL == var->value) {
 	    for (var = gdoc->vars; NULL != var; var = var->next) {
 		if (0 == strcmp(var_name, var->name)) {
 		    break;
@@ -1602,6 +1602,7 @@ sdl_parse_doc(agooErr err, const char *str, int len, gqlVar vars, gqlOpKind defa
     gqlDoc		gdoc = NULL;
 
     agoo_doc_init(&doc, str, len);
+
     if (NULL == (gdoc = gql_doc_create(err))) {
 	return NULL;
     }

data/ext/agoo/sectime.c

@@ -110,7 +110,7 @@ agoo_sectime(int64_t secs, agooTime at) {
 	    }
 	}
     }
-    at->year = (qc - shift) * 400 + c * 100 + qy * 4 + y;
+    at->year = (int)((qc - shift) * 400 + c * 100 + qy * 4 + y);
     if (leap) {
 	ms = eom_leap_secs;
     } else {
@@ -125,12 +125,12 @@ agoo_sectime(int64_t secs, agooTime at) {
 	    break;
 	}
     }
-    at->day = secs / 86400LL;
+    at->day = (int)(secs / 86400LL);
     secs = secs - (int64_t)at->day * 86400LL;
     at->day++;
-    at->hour = secs / 3600LL;
+    at->hour = (int)(secs / 3600LL);
     secs = secs - (int64_t)at->hour * 3600LL;
-    at->min = secs / 60LL;
+    at->min = (int)(secs / 60LL);
     secs = secs - (int64_t)at->min * 60LL;
-    at->sec = secs;
+    at->sec = (int)secs;
 }

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.11.5'
+  VERSION = '2.11.6'
 end

data/test/graphql_test.rb

@@ -325,8 +325,8 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
   end
 
   def test_json_vars_query
-    #uri = URI('http://localhost:6472/graphql?query={artist(name:$name){name}}&indent=2&variables={"name":"Fazerdaze"}')
-    uri = URI('http://localhost:6472/graphql?query={artist(name:"Fazerdaze"){name}}&indent=2&variables={"name":"Fazerdaze"}')
+    uri = URI('http://localhost:6472/graphql?query={artist(name:$name){name}}&indent=2&variables={"name":"Fazerdaze"}')
+    #uri = URI('http://localhost:6472/graphql?query={artist(name:"Fazerdaze"){name}}&indent=2&variables={"name":"Fazerdaze"}')
     expect = %^{
   "data":{
     "artist":{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.11.5
+  version: 2.11.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -188,12 +188,12 @@ signing_key:
 specification_version: 4
 summary: An HTTP server
 test_files:
-- test/base_handler_test.rb
-- test/bind_test.rb
+- test/graphql_test.rb
 - test/hijack_test.rb
-- test/early_hints_test.rb
 - test/rack_handler_test.rb
-- test/static_test.rb
+- test/base_handler_test.rb
 - test/log_test.rb
-- test/graphql_test.rb
 - test/domain_test.rb
+- test/early_hints_test.rb
+- test/bind_test.rb
+- test/static_test.rb