agoo 2.7.0 → 2.8.0

data/ext/agoo/server.c

@@ -27,12 +27,12 @@ struct _agooServer	agoo_server = {false};
 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;
-    
+
     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)) {
@@ -150,7 +150,7 @@ agoo_server_start(agooErr err, const char *app_name, const char *version) {
     double	giveup;
     int		xcnt = 0;
     int		stat;
-    
+
     if (0 != (stat = pthread_create(&agoo_server.listen_thread, NULL, listen_loop, NULL))) {
 	return agoo_err_set(err, stat, "Failed to create server listener thread. %s", strerror(stat));
     }
@@ -177,7 +177,7 @@ agoo_server_start(agooErr err, const char *app_name, const char *version) {
     }
     if (agoo_info_cat.on) {
 	agooBind	b;
-	
+
 	for (b = agoo_server.binds; NULL != b; b = b->next) {
 	    agoo_log_cat(&agoo_info_cat, "%s %s with pid %d is listening on %s.", app_name, version, getpid(), b->id);
 	}
@@ -208,7 +208,7 @@ agoo_server_shutdown(const char *app_name, void (*stop)()) {
 	agoo_server.inited = false;
 	if (agoo_server.active) {
 	    double	giveup = dtime() + 1.0;
-	    
+
 	    agoo_server.active = false;
 	    pthread_detach(agoo_server.listen_thread);
 	    for (loop = agoo_server.con_loops; NULL != loop; loop = loop->next) {

data/ext/agoo/text.c

@@ -59,14 +59,16 @@ agoo_text_create(const char *str, int len) {
 
 agooText
 agoo_text_dup(agooText t0) {
-    agooText	t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) - AGOO_TEXT_MIN_SIZE + t0->alen + 1);
-
-    if (NULL != t) {
-	t->len = t0->len;
-	t->alen = t0->alen;
-	t->bin = false;
-	atomic_init(&t->ref_cnt, 0);
-	memcpy(t->text, t0->text, t0->len + 1);
+    agooText	t = NULL;
+
+    if (NULL != t0) {
+	if (NULL != (t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) - AGOO_TEXT_MIN_SIZE + t0->alen + 1))) {
+	    t->len = t0->len;
+	    t->alen = t0->alen;
+	    t->bin = false;
+	    atomic_init(&t->ref_cnt, 0);
+	    memcpy(t->text, t0->text, t0->len + 1);
+	}
     }
     return t;
 }
@@ -99,6 +101,9 @@ agoo_text_release(agooText t) {
 
 agooText
 agoo_text_append(agooText t, const char *s, int len) {
+    if (NULL == t) {
+	return NULL;
+    }
     if (0 >= len) {
 	len = (int)strlen(s);
     }
@@ -120,6 +125,9 @@ agoo_text_append(agooText t, const char *s, int len) {
 
 agooText
 agoo_text_append_char(agooText t, const char c) {
+    if (NULL == t) {
+	return NULL;
+    }
     if (t->alen <= t->len + 1) {
 	long	new_len = t->alen + 1 + t->alen / 2;
 	size_t	size = sizeof(struct _agooText) - AGOO_TEXT_MIN_SIZE + new_len + 1;
@@ -138,6 +146,9 @@ agoo_text_append_char(agooText t, const char c) {
 
 agooText
 agoo_text_prepend(agooText t, const char *s, int len) {
+    if (NULL == t) {
+	return NULL;
+    }
     if (0 >= len) {
 	len = (int)strlen(s);
     }
@@ -160,7 +171,10 @@ agoo_text_prepend(agooText t, const char *s, int len) {
 agooText
 agoo_text_append_json(agooText t, const char *s, int len) {
     size_t	jlen;
-    
+
+    if (NULL == t) {
+	return NULL;
+    }
     if (0 >= len) {
 	len = (int)strlen(s);
     }

data/lib/agoo/version.rb

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

data/test/graphql_test.rb

@@ -18,7 +18,7 @@ class Artist
   attr_reader :songs
   attr_reader :origin
   attr_reader :likes
-  
+
   def initialize(name, origin)
     @name = name
     @songs = []
@@ -65,7 +65,7 @@ class Song
   attr_reader :duration # integer
   attr_reader :release  # time
   attr_reader :genre    # string
-  
+
   def initialize(name, artist, duration, release)
     @name = name
     @artist = artist
@@ -99,7 +99,6 @@ type Song @ruby(class: "Song") {
   artist: Artist
   duration: Int
   genre: Genre
-  release: Time
 }
 
 enum Genre {
@@ -109,6 +108,16 @@ enum Genre {
 }
 ^
 
+$extend_sdl = %^
+extend enum Genre {
+  JAZZ
+}
+
+type Song {
+  release: Time
+}
+^
+
 class Query
   attr_reader :artists
 
@@ -139,7 +148,7 @@ class Schema
   attr_reader :query
   attr_reader :mutation
   attr_reader :subscription
- 
+
   def initialize()
     # Set up some data for testing.
     artist = Artist.new('Fazerdaze', ['Morningside', 'Auckland', 'New Zealand'])
@@ -156,11 +165,10 @@ end
 
 class GraphQLTest < Minitest::Test
   @@server_started = false
-  
-  SCHEMA_EXPECT = %^type schema @ruby(class: "Schema") {
+
+  SCHEMA_EXPECT = %^schema @ruby(class: "Schema") {
   query: Query
   mutation: Mutation
-  subscription: Subscription
 }
 
 type Artist @ruby(class: "Artist") {
@@ -172,7 +180,7 @@ type Artist @ruby(class: "Artist") {
   likes: Int
 }
 
-type Mutation {
+type Mutation @ruby(class: "Mutation") {
   like(artist: String!): Artist
 }
 
@@ -188,13 +196,11 @@ type Song @ruby(class: "Song") {
   release: Time
 }
 
-type Subscription {
-}
-
 enum Genre {
   POP
   ROCK
   INDIE
+  JAZZ
 }
 
 directive @ruby(class: String!) on SCHEMA | OBJECT
@@ -218,11 +224,11 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
 
     Agoo::GraphQL.schema(Schema.new) {
       Agoo::GraphQL.load($songs_sdl)
+      Agoo::GraphQL.load($extend_sdl)
     }
-
     @@server_started = true
   end
-  
+
   def setup
     if @@server_started == false
       start_server
@@ -239,7 +245,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
   # TBD introspection
 
   ##################################
-  
+
   def test_load
     content = Agoo::GraphQL.sdl_dump(with_descriptions: false, all: false)
     content.force_encoding('UTF-8')
@@ -278,7 +284,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
     assert_equal('application/json', res['Content-Type'])
     assert_equal(expect, content)
   end
-  
+
   def test_variable_query
     uri = URI('http://localhost:6472/graphql?query={artist(name:"Fazerdaze"){name}}&indent=2')
     expect = %^{
@@ -290,7 +296,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
 }^
     req_test(uri, expect)
   end
-  
+
   def test_alias_query
     uri = URI('http://localhost:6472/graphql?query=query withVar($name:String="Fazerdaze"){artist(name:$name){name}}&indent=2')
     expect = %^{
@@ -302,7 +308,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
 }^
     req_test(uri, expect)
   end
-  
+
   def test_parse_error
     uri = URI('http://localhost:6472/graphql?query=nonsense')
     expect = %^{
@@ -316,7 +322,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
 ^
     req_test(uri, expect, 'errors.0.timestamp')
   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"}')
@@ -329,7 +335,7 @@ directive @ruby(class: String!) on SCHEMA | OBJECT
 }^
     req_test(uri, expect)
   end
-  
+
   def test_list_query
     uri = URI('http://localhost:6472/graphql?query=query withVar($name:String="Fazerdaze"){artist(name:$name){name,songs{name}}}&indent=2')
     expect = %^{
@@ -656,7 +662,7 @@ query skippy($boo: Boolean = true){
 }^
     req_test(uri, expect)
   end
-  
+
   def test_intro_of_type
     uri = URI('http://localhost:6472/graphql?query={__type(name:"[__Type!]"){name,ofType{name}}}&indent=2')
     expect = %^{
@@ -793,7 +799,7 @@ query skippy($boo: Boolean = true){
 }^
     req_test(uri, expect)
   end
-  
+
   def test_intro_schema_types
     uri = URI('http://localhost:6472/graphql?query={__schema{types{name}}}&indent=2')
     expect = %^{
@@ -806,9 +812,6 @@ query skippy($boo: Boolean = true){
         {
           "name":"Int"
         },
-        {
-          "name":"Subscription"
-        },
         {
           "name":"I64"
         },
@@ -842,6 +845,9 @@ query skippy($boo: Boolean = true){
         {
           "name":"Song"
         },
+        {
+          "name":"ID"
+        },
         {
           "name":"Artist"
         },
@@ -886,7 +892,7 @@ query skippy($boo: Boolean = true){
 }^
     req_test(uri, expect)
   end
-  
+
   def test_intro_schema_directives
     uri = URI('http://localhost:6472/graphql?query={__schema{directives{name,locations,args{name}}}}&indent=2')
     expect = %^{
@@ -949,7 +955,7 @@ query skippy($boo: Boolean = true){
 }^
     req_test(uri, expect)
   end
-  
+
   def test_mutation
     uri = URI('http://localhost:6472/graphql?indent=2')
     body = %^
@@ -988,7 +994,7 @@ mutation {
       end
     end
   end
-  
+
   def req_test(uri, expect, ignore=nil)
     req = Net::HTTP::Get.new(uri)
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj