agoo 2.12.1 → 2.14.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/server.c

@@ -160,8 +160,8 @@ listen_loop(void *x) {
 		    //fcntl(client_sock, F_SETFL, FNDELAY);
 		    setsockopt(client_sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval));
 		    setsockopt(client_sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(optval));
-		    agoo_log_cat(&agoo_con_cat, "Server with pid %d accepted connection %llu on %s [%d]",
-				 getpid(), (unsigned long long)cnt, b->id, con->sock);
+		    agoo_log_cat(&agoo_con_cat, "Server with pid %d accepted connection %llu on %s [%d] from %s",
+				 getpid(), (unsigned long long)cnt, b->id, con->sock, con->remote);
 
 		    con_cnt = atomic_fetch_add(&agoo_server.con_cnt, 1);
 		    if (agoo_server.loop_max > agoo_server.loop_cnt && agoo_server.loop_cnt * LOOP_UP < con_cnt) {

data/ext/agoo/websocket.c

@@ -189,6 +189,7 @@ agoo_ws_create_req(agooCon c, long mlen) {
     c->req->method = (AGOO_WS_OP_BIN == op) ? AGOO_ON_BIN : AGOO_ON_MSG;
     c->req->upgrade = AGOO_UP_NONE;
     c->req->up = c->up;
+    memcpy(c->req->remote, c->remote, sizeof(c->remote));
     c->req->res = NULL;
     if (c->up->on_msg) {
 	c->req->hook = agoo_hook_create(AGOO_NONE, NULL, c->up->ctx, PUSH_HOOK, &agoo_server.eval_queue);

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.12.1'
+  VERSION = '2.14.1'
 end

data/test/base_handler_test.rb

@@ -82,7 +82,7 @@ class BaseHandlerTest < Minitest::Test
     GC.start
     Agoo::shutdown
   }
-  
+
   def test_eval
     uri = URI('http://localhost:6470/tellme?a=1')
     req = Net::HTTP::Get.new(uri)
@@ -132,13 +132,13 @@ class BaseHandlerTest < Minitest::Test
     req['Accept-Encoding'] = '*'
     req['Accept'] = 'application/json'
     req['User-Agent'] = 'Ruby'
-    
+
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }
     assert_equal(Net::HTTPNoContent, res.class)
   end
-  
+
   def test_put
     uri = URI('http://localhost:6470/makeme')
     req = Net::HTTP::Put.new(uri)
@@ -147,7 +147,7 @@ class BaseHandlerTest < Minitest::Test
     req['Accept'] = 'application/json'
     req['User-Agent'] = 'Ruby'
     req.body = 'hello'
-    
+
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }

data/test/graphql_test.rb

@@ -79,6 +79,7 @@ end
 $songs_sdl = %^
 type Query @ruby(class: "Query") {
   artist(name: String!): Artist
+  artists: [Artist!]
 }
 
 type Mutation {
@@ -120,26 +121,30 @@ type Song {
 ^
 
 class Query
-  attr_reader :artists
+  attr_reader :artistHash
 
   def initialize(artists)
-    @artists = artists
+    @artistHash = artists
   end
 
   def artist(args)
-    @artists[args['name']]
+    @artistHash[args['name']]
+  end
+
+  def artists(args)
+    @artistHash.values
   end
 end
 
 class Mutation
-  attr_reader :artists
+  attr_reader :artistHash
 
   def initialize(artists)
-    @artists = artists
+    @artistHash = artists
   end
 
   def like(args)
-    artist = @artists[args['artist']]
+    artist = @artistHash[args['artist']]
     artist.like
     artist
   end
@@ -187,6 +192,7 @@ type Mutation @ruby(class: "Mutation") {
 
 type Query @ruby(class: "Query") {
   artist(name: String!): Artist
+  artists: [Artist!]
 }
 
 type Song @ruby(class: "Song") {
@@ -452,6 +458,30 @@ fragment basic on Artist {
     post_test(uri, body, 'application/graphql', expect)
   end
 
+  def test_post_json_fragment
+    uri = URI('http://localhost:6472/graphql?indent=2')
+    body = %^{
+  "query": "fragment basic on Artist {name origin} query list($filter: String) {artists {...basic}}",
+  "operationName": "list",
+  "variables": {"filters": {}}
+}^
+    expect = %^{
+  "data":{
+    "artists":[
+      {
+        "name":"Fazerdaze",
+        "origin":[
+          "Morningside",
+          "Auckland",
+          "New Zealand"
+        ]
+      }
+    ]
+  }
+}^
+    post_test(uri, body, 'application/json', expect)
+  end
+
   def test_post_inline
     uri = URI('http://localhost:6472/graphql?indent=2')
     body = %^

data/test/rack_handler_test.rb

@@ -105,6 +105,7 @@ size=big
       "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",
+      "REMOTE_ADDR" => "127.0.0.1",
       "SCRIPT_NAME" => "",
       "SERVER_NAME" => "localhost",
       "SERVER_PORT" => "6467",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.14.1
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -34,6 +34,7 @@ description: A fast HTTP server supporting rack.
 email: peter@ohler.com
 executables:
 - agoo
+- agoo_stubs
 extensions:
 - ext/agoo/extconf.rb
 extra_rdoc_files:
@@ -45,6 +46,7 @@ files:
 - LICENSE
 - README.md
 - bin/agoo
+- bin/agoo_stubs
 - ext/agoo/agoo.c
 - ext/agoo/atomic.h
 - ext/agoo/base64.c
@@ -142,6 +144,10 @@ files:
 - ext/agoo/websocket.c
 - ext/agoo/websocket.h
 - lib/agoo.rb
+- lib/agoo/graphql.rb
+- lib/agoo/graphql/arg.rb
+- lib/agoo/graphql/field.rb
+- lib/agoo/graphql/type.rb
 - lib/agoo/version.rb
 - lib/rack/handler/agoo.rb
 - test/base_handler_test.rb
@@ -157,7 +163,7 @@ homepage: https://github.com/ohler55/agoo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-t"
 - Agoo
@@ -183,17 +189,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Linux or macOS
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: An HTTP server
 test_files:
-- test/graphql_test.rb
-- test/hijack_test.rb
-- test/rack_handler_test.rb
 - test/base_handler_test.rb
-- test/log_test.rb
+- test/bind_test.rb
 - test/domain_test.rb
 - test/early_hints_test.rb
-- test/bind_test.rb
+- test/graphql_test.rb
+- test/hijack_test.rb
+- test/log_test.rb
+- test/rack_handler_test.rb
 - test/static_test.rb