agoo 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7919a52d201024eefc3480e4f64e28587b124b402d41dfd4cf9cc2108a01a6
-  data.tar.gz: a7d185258d848b7887b50dccac072eed8660817a099a210d279d52812ade3263
+  metadata.gz: df1bb00da0c9e4622be8beab3f1f6e1e72944ebd499c59be4708a406497398e5
+  data.tar.gz: 919371ceccd840f0bd281ae010f1478764e76ca4660d1160b3b1c324e5f862f9
 SHA512:
-  metadata.gz: 434a205f05f234cb2eec6212e33947cecbc8773c47c6c77e0e0c17aab87d22b6406cdfd3750fbb9388f1ca5972cb883a95b7b3c3565c5a50b09cb4cd6a314079
-  data.tar.gz: 9decdf78bb95013eaedd1b9ee594f7206fdaca20b1e9c9944fc87bbd61a4fcb376fa357d2b3c83f0c1d3f9eb38e7bd6661e58d7a790d2f8b7d57ad3cd566e2ca
+  metadata.gz: 6a964aaf5a16e046f245d4da7e13852e5b996628fcd293343ce8ac57bbf8ca38b658282681e7c8e38b33c19546516adf5e3c148a5a9000b942de90438742f752
+  data.tar.gz: b5334140835783165e52f716217079739ab1460e7bda78e3f0dd0925b86885583b9143222befde5d206543838b7cc8a1127e6a4915c1a04df08821b7b80a4def

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All changes to the Agoo gem are documented here. Releases follow semantic versio
 
 ## [Unreleased]
 
+## [2.11.2] - [2019-10-20]
+
+Coerce improvements
+
+### Fixed
+- Coerce of `nil` to anything returns GraphQL `null`.
+
+- Coerce String to defined scalar now succeeds.
+
+- Handle comments in all locations.
+
 ## [2.11.1] - [2019-09-22]
 
 Race fix

data/README.md

@@ -125,7 +125,7 @@ the develop branch. Pull requests should be made against the develop branch.
 
 ## Support
 
-[Get supported Agoo with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-agoo?utm_source=rubygems-agoo&utm_medium=referral&utm_campaign=readme)
+[Get supported Agoo with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-agoo?utm_source=rubygems-agoo&utm_medium=referral&utm_campaign=readme) Security updates are [supported](https://tidelift.com/security).
 
 ## Links
 

data/ext/agoo/con.c

@@ -487,19 +487,21 @@ check_upgrade(agooCon c) {
 
 #ifdef HAVE_OPENSSL_SSL_H
 static void
-con_ssl_error(agooCon c, const char *filename, int line) {
-    char		buf[224];
-    unsigned long	e = ERR_get_error();
+con_ssl_error(agooCon c, const char *what, unsigned long e, const char *filename, int line) {
+    char	buf[224];
 
+    if (0 == e) {
+	e = ERR_get_error();
+    }
     c->dead = true;
     ERR_error_string_n(e, buf, sizeof(buf));
-    agoo_log_cat(&agoo_error_cat, "%s at %s:%d", buf, filename, line);
+    agoo_log_cat(&agoo_error_cat, "%s %s at %s:%d", what, buf, filename, line);
 }
 #endif
 
 bool
 agoo_con_http_read(agooCon c) {
-    ssize_t	cnt;
+    ssize_t	cnt = 0;
 
     if (c->dead || 0 == c->sock || c->closing) {
 	return true;
@@ -512,13 +514,13 @@ agoo_con_http_read(agooCon c) {
 	    cnt = SSL_read(c->ssl, c->buf + c->bcnt, sizeof(c->buf) - c->bcnt - 1);
 	}
 	if (0 > cnt) {
-	    unsigned long	e = ERR_get_error();
+	    //unsigned long	e = ERR_get_error();
+	    int		e = ERR_get_error();
 
 	    if (0 == e) {
-		cnt = 0;
 		return false;
 	    } else {
-		con_ssl_error(c, __FILE__, __LINE__);
+		con_ssl_error(c, "read", (unsigned long)e, __FILE__, __LINE__);
 		c->dead = true;
 		return true;
 	    }
@@ -632,7 +634,7 @@ bool
 agoo_con_http_write(agooCon c) {
     agooRes	res = agoo_con_res_pop(c);
     agooText	message = agoo_res_message_peek(res);
-    ssize_t	cnt;
+    ssize_t	cnt = 0;
 
     if (NULL == message) {
 	return true;
@@ -665,7 +667,7 @@ agoo_con_http_write(agooCon c) {
 	    if (0 == e) {
 		return true;
 	    }
-	    con_ssl_error(c, __FILE__, __LINE__);
+	    con_ssl_error(c, "write", (unsigned long)e, __FILE__, __LINE__);
 	    c->dead = true;
 
 	    return false;
@@ -1246,13 +1248,13 @@ static void
 con_ssl_setup(agooCon c) {
 #ifdef HAVE_OPENSSL_SSL_H
     if (NULL == (c->ssl = SSL_new(agoo_server.ssl_ctx))) {
-	con_ssl_error(c, __FILE__, __LINE__);
+	con_ssl_error(c, "new SSL", 0, __FILE__, __LINE__);
     }
     if (!SSL_set_fd(c->ssl, c->sock)) {
-	con_ssl_error(c, __FILE__, __LINE__);
+	con_ssl_error(c, "SSL set fd", 0, __FILE__, __LINE__);
     }
     if (!SSL_accept(c->ssl)) {
-	con_ssl_error(c, __FILE__, __LINE__);
+	con_ssl_error(c, "SSL accept", 0, __FILE__, __LINE__);
     }
 #else
     agoo_log_cat(&agoo_error_cat, "SSL not included in the build.");

data/ext/agoo/doc.c

@@ -61,7 +61,14 @@ int
 agoo_doc_skip_white(agooDoc doc) {
     const char	*start = doc->cur;
 
-    for (; 'w' == char_map[*(uint8_t*)doc->cur]; doc->cur++) {
+    while (true) {
+	for (; 'w' == char_map[*(uint8_t*)doc->cur]; doc->cur++) {
+	}
+	if ('#' == *doc->cur) {
+	    agoo_doc_skip_comment(doc);
+	} else {
+	    break;
+	}
     }
     return (int)(doc->cur - start);
 }

data/ext/agoo/graphql.c

@@ -746,6 +746,7 @@ gql_scalar_create(agooErr err, const char *name, const char *desc, size_t dlen)
 	type->to_json = NULL;
 	type->to_sdl = NULL;
 	type->destroy = NULL;
+	type->scalar_kind = GQL_SCALAR_STRING;
     }
     return type;
 }

data/ext/agoo/rgraphql.c

@@ -222,6 +222,9 @@ coerce(agooErr err, gqlRef ref, gqlType type) {
     gqlValue		value = NULL;
     volatile VALUE	v;
 
+    if (Qnil == (VALUE)ref) {
+	return gql_null_create(err);
+    }
     if (NULL == type) {
 	// This is really an error but make a best effort anyway.
 	switch (rb_type((VALUE)ref)) {

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.11.1'
+  VERSION = '2.11.2'
 end

data/test/hijack_test.rb

@@ -14,7 +14,7 @@ require 'oj'
 
 require 'agoo'
 
-class RackHandlerTest < Minitest::Test
+class HijackHandlerTest < Minitest::Test
   class HijackHandler
     def call(env)
       io = env['rack.hijack'].call
@@ -27,34 +27,33 @@ hello world|)
     end
   end
 
+  Minitest.after_run {
+    GC.start
+    Agoo::shutdown
+  }
+
   def test_hijack
-    begin
-      Agoo::Log.configure(dir: '',
-			  console: true,
-			  classic: true,
-			  colorize: true,
-			  states: {
-			    INFO: false,
-			    DEBUG: false,
-			    connect: false,
-			    request: false,
-			    response: false,
-			    eval: true,
-			  })
-
-      Agoo::Server.init(6471, 'root', thread_count: 1)
-
-      handler = HijackHandler.new
-      Agoo::Server.handle(:GET, "/hijack", handler)
-
-      Agoo::Server.start()
-
-      jack
-
-    ensure
-      GC.start
-      Agoo.shutdown
-    end
+    Agoo::Log.configure(dir: '',
+		  console: true,
+		  classic: true,
+		  colorize: true,
+		  states: {
+		    INFO: false,
+		    DEBUG: false,
+		    connect: false,
+		    request: false,
+		    response: false,
+		    eval: true,
+		  })
+
+    Agoo::Server.init(6471, 'root', thread_count: 1)
+
+    handler = HijackHandler.new
+    Agoo::Server.handle(:GET, "/hijack", handler)
+
+    Agoo::Server.start()
+
+    jack
   end
 
   def jack
@@ -72,5 +71,5 @@ hello world|)
 
     assert_equal('hello world', content, 'content mismatch')
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj