agoo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a18f59a226cbfe061c8b645fadeab626f7ba7eb7f8af017032192bf276db749
-  data.tar.gz: d10ec4a0c5ba7676e2298e14cee626db4794465f6b987e02b6a8c2f341eaedb5
+  metadata.gz: 1210b704838b2b955043a6898f84de5314c807c2557310f4e1eb2049c4b92dc6
+  data.tar.gz: cb5d9a00fd52a2bad258e3ec946597ae2ebb76a6c8ee1a1f13f33fadd06bd200
 SHA512:
-  metadata.gz: f8fa258e15e65f91ed6d9586c0cf951dca2038c13a52e4727a94bd79bb0794574f8cb306cd7f75188a435063f19016e7b32e754ee304fc53be75ff63ab045464
-  data.tar.gz: 14be184ac912ff59aaf1d097a612d8cf4228d00840b7e2410b76682909a776db5c4ce6e4f3769eb34410e42e9df8eba90d1d2b5275c6fbfe0eee6593ae2a77fb
+  metadata.gz: 6139683e96c96440854aad33d252036942e020a0a38cd619802033c5ee3523306ee2ce356af4c0abf294b510bf2320dfb3544aa87b5d449d5a0b14ece8ea9b37
+  data.tar.gz: e1d8735be9d8036b6274dcd18baeb5e678ae47a9118d35ee4aca1b3b5ee9145d7836f51e72d82643a8a409a0164acfa5be2d4da8fa04563eb9378626c8be5356

data/ext/agoo/con.c

@@ -328,7 +328,11 @@ con_read(Con c) {
 	    // Terminate with \0 for debug and strstr() check
 	    c->buf[c->bcnt] = '\0';
 	    if (0 > (mlen = con_header_read(c))) {
-		if (-mlen < (long)c->bcnt) {
+		if (-1 == mlen) {
+		    c->bcnt = 0;
+		    *c->buf = '\0';
+		    return false;
+		} else if (-mlen < (long)c->bcnt) {
 		    mlen = -mlen;
 		    memmove(c->buf, c->buf + mlen, c->bcnt - mlen);
 		    c->bcnt -= mlen;

data/ext/agoo/request.c

@@ -555,6 +555,11 @@ request_init(VALUE mod) {
 
     new_id = rb_intern("new");
     
+    rack_version_val_val = rb_ary_new();
+    rb_ary_push(rack_version_val_val, INT2NUM(1));
+    rb_ary_push(rack_version_val_val, INT2NUM(3));
+    rb_gc_register_address(&rack_version_val_val);
+    
     stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
 
     connect_val = rb_str_new_cstr("CONNECT");			rb_gc_register_address(&connect_val);
@@ -578,7 +583,6 @@ request_init(VALUE mod) {
     rack_run_once_val = rb_str_new_cstr("rack.run_once");	rb_gc_register_address(&rack_run_once_val);
     rack_url_scheme_val = rb_str_new_cstr("rack.url_scheme");	rb_gc_register_address(&rack_url_scheme_val);
     rack_version_val = rb_str_new_cstr("rack.version");		rb_gc_register_address(&rack_version_val);
-    rack_version_val_val = rb_str_new_cstr("1.3");		rb_gc_register_address(&rack_version_val_val);
     request_method_val = rb_str_new_cstr("REQUEST_METHOD");	rb_gc_register_address(&request_method_val);
     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);

data/ext/agoo/server.c

@@ -119,7 +119,7 @@ configure(Err err, Server s, int port, const char *root, VALUE options) {
     s->log.cats = NULL;
     log_cat_reg(&s->log, &s->error_cat, "ERROR",    ERROR, RED, true);
     log_cat_reg(&s->log, &s->warn_cat,  "WARN",     WARN,  YELLOW, true);
-    log_cat_reg(&s->log, &s->info_cat,  "INFO",     INFO,  GREEN, false);
+    log_cat_reg(&s->log, &s->info_cat,  "INFO",     INFO,  GREEN, true);
     log_cat_reg(&s->log, &s->debug_cat, "DEBUG",    DEBUG, GRAY, false);
     log_cat_reg(&s->log, &s->con_cat,   "connect",  INFO,  GREEN, false);
     log_cat_reg(&s->log, &s->req_cat,   "request",  INFO,  CYAN, false);
@@ -144,6 +144,39 @@ configure(Err err, Server s, int port, const char *root, VALUE options) {
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("pedantic"))))) {
 	    s->pedantic = (Qtrue == v);
 	}
+	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("Port"))))) {
+	    if (rb_cInteger == rb_obj_class(v)) {
+		s->port = NUM2INT(v);
+	    } else {
+		switch (rb_type(v)) {
+		case T_STRING:
+		    s->port = atoi(StringValuePtr(v));
+		    break;
+		case T_FIXNUM:
+		    s->port = NUM2INT(v);
+		    break;
+		default:
+		    break;
+		}
+	    }
+	}
+	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("quiet"))))) {
+	    if (Qtrue == v) {
+		s->info_cat.on = false;
+	    }
+	}
+	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("debug"))))) {
+	    if (Qtrue == v) {
+		s->error_cat.on = true;
+		s->warn_cat.on = true;
+		s->info_cat.on = true;
+		s->debug_cat.on = true;
+		s->con_cat.on = true;
+		s->req_cat.on = true;
+		s->resp_cat.on = true;
+		s->eval_cat.on = true;
+	    }
+	}
     }
     return ERR_OK;
 }
@@ -400,7 +433,7 @@ handle_rack_inner(void *x) {
     int			code;
     const char		*status_msg;
     int			bsize = 0;
-    
+
     rb_check_type(res, T_ARRAY);
     if (3 != RARRAY_LEN(res)) {
 	rb_raise(rb_eArgError, "a rack call() response must be an array of 3 members.");
@@ -426,15 +459,38 @@ handle_rack_inner(void *x) {
     if (NULL == (t = text_allocate(1024))) {
 	rb_raise(rb_eArgError, "failed to allocate response.");
     }
-    if (T_ARRAY != rb_type(bv)) {
+    if (T_ARRAY == rb_type(bv)) {
 	int	i;
 	int	bcnt = (int)RARRAY_LEN(bv);
-	
+
 	for (i = 0; i < bcnt; i++) {
 	    bsize += (int)RSTRING_LEN(rb_ary_entry(bv, i));
 	}
     } else {
-	rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
+	if (HEAD == req->method) {
+	    // Rack wraps the response in two layers, Rack::Lint and
+	    // Rack::BodyProxy. It each is called on either with the HEAD
+	    // method an exception is raised so the length can not be
+	    // determined. This digs down to get the actual response so the
+	    // length can be calculated. A very special case.
+	    if (0 == strcmp("Rack::BodyProxy", rb_obj_classname(bv))) {
+		volatile VALUE	body = rb_ivar_get(bv, rb_intern("@body"));
+
+		if (Qnil != body) {
+		    body = rb_ivar_get(body, rb_intern("@body"));
+		}
+		if (Qnil != body) {
+		    body = rb_ivar_get(body, rb_intern("@body"));
+		}
+		if (rb_respond_to(body, rb_intern("each"))) {
+		    rb_iterate(rb_each, body, body_len_cb, (VALUE)&bsize);
+		}
+	    } else {
+		rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
+	    }
+	} else {
+	    rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
+	}
     }
     switch (code) {
     case 100:
@@ -443,7 +499,7 @@ handle_rack_inner(void *x) {
     case 204:
     case 205:
     case 304:
-	// TBD Content-Type and Content-Length can not be present
+	// Content-Type and Content-Length can not be present
 	t->len = snprintf(t->text, 1024, "HTTP/1.1 %d %s\r\n", code, status_msg);
 	break;
     default:
@@ -451,10 +507,14 @@ handle_rack_inner(void *x) {
 	t->len = snprintf(t->text, 1024, "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", code, status_msg, bsize);
 	break;
     }
-    if (T_HASH == rb_type(hv)) {
-	rb_hash_foreach(hv, header_cb, (VALUE)&t);
+    if (HEAD == req->method) {
+	bsize = 0;
     } else {
-	rb_iterate (rb_each, hv, header_each_cb, (VALUE)&t);
+	if (T_HASH == rb_type(hv)) {
+	    rb_hash_foreach(hv, header_cb, (VALUE)&t);
+	} else {
+	    rb_iterate (rb_each, hv, header_each_cb, (VALUE)&t);
+	}
     }
     t = text_append(t, "\r\n", 2);
     if (0 < bsize) {

data/lib/agoo.rb

@@ -5,3 +5,5 @@ end
 require 'agoo/version'
 require 'rack/handler/agoo'
 require 'agoo/agoo' # C extension
+
+ENV['RACK_HANDLER'] = 'Agoo'

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/rack/handler/agoo.rb

@@ -38,8 +38,7 @@ module Rack
 	  server.handle(nil, path, handler)
 	}
 	unless default_handler.nil?
-	  server.handle(nil, '/', default_handler) 
-	  server.handle(nil, '/**', default_handler)
+	  server.handle(nil, '**', default_handler)
 	end
 	server.handle_not_found(not_found_handler) unless not_found_handler.nil?
 	server.start

data/test/base_handler_test.rb

@@ -108,7 +108,7 @@ class BaseHandlerTest < Minitest::Test
       "rack.multithread" => false,
       "rack.run_once" => false,
       "rack.url_scheme" => "http",
-      "rack.version" => "1.3",
+      "rack.version" => [1, 3],
       "rack.logger" => nil,
     }
     expect.each_pair { |k,v|

data/test/log_test.rb

@@ -44,9 +44,10 @@ class LogStateTest < Minitest::Test
   end
 
   def info_state_test(server)
+    assert(server.info?)
+    server.set_log_state('INFO', false)
     refute(server.info?)
     server.set_log_state('INFO', true)
-    assert(server.info?)
   end
 
   def debug_state_test(server)

data/test/rack_handler_test.rb

@@ -103,7 +103,7 @@ class RackHandlerTest < Minitest::Test
       "rack.multithread" => false,
       "rack.run_once" => false,
       "rack.url_scheme" => "http",
-      "rack.version" => "1.3",
+      "rack.version" => [1, 3],
     }
     expect.each_pair { |k,v|
       if v.nil?

data/test/rrr/test.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require "agoo"
+
+server = Agoo::Server.new(6464, "root", thread_count: 0)
+
+class MyHandler
+  def call(_req)
+    [200, {}, ["hello world"]]
+  end
+end
+
+handler = MyHandler.new
+#server.handle(:GET, "/hello", handler)
+server.handle(nil, "**", handler)
+server.start
+
+# $ bundle exec ruby test.rb
+# waits for connections, nothing is logged.
+
+# on a separated shell:
+# ➜ curl -I http://localhost:6464
+# HTTP/1.1 500 Internal Error
+# Connection: Close
+# Content-Length: 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -82,6 +82,7 @@ files:
 - test/base_handler_test.rb
 - test/log_test.rb
 - test/rack_handler_test.rb
+- test/rrr/test.rb
 - test/static_test.rb
 - test/tests.rb
 homepage: https://github.com/ohler55/agoo
@@ -121,5 +122,6 @@ test_files:
 - test/tests.rb
 - test/rack_handler_test.rb
 - test/base_handler_test.rb
+- test/rrr/test.rb
 - test/static_test.rb
 - test/log_test.rb