agoo 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44ba7a7229894d86dba33f2138fc300cf1885c20078709fda7ebe9264e4a6fe
-  data.tar.gz: 411a5541b7d47bd2dd5dc68a45401206787b026599c33eff3544a71757cf8072
+  metadata.gz: 9ec3fe82e8d4833d543ce7389dbf2c184fefed6ceee8b6ede337dd99588a69c4
+  data.tar.gz: 9b65a945479295f9b3663dd443e96d3f1b053536cf1062d10b6096d4b58cd333
 SHA512:
-  metadata.gz: 21ecc474d333acad22a54e781b135eb450273d0f6662c1566dd0b1949e9db3051db08264021b99fe01cd2fc819e7fab56abec3bbbb0dfd04b7fc6bc4a05f82e9
-  data.tar.gz: b7f92457d97efd991b2a8e54bc1c0ae488482dcde217f32a2a2ea6d4f07536cab3b97341aebf0eadeaa514c03251a97e85510e3bf7b185aa43007f52a130bacc
+  metadata.gz: 335d419d49420ae7c091a2c89ba46830520be29041cdf18967a588c9bcf63383efbbddced7d65cab96d3d97f835b23b4c1f2a1749c2cb5591d3b66c89bb4af55
+  data.tar.gz: a25b384fcec18a72635a03c2f87218939adebcb3f18f63f912ab9c1e1fdbb04653cbb03f5598dfb3786113ad4496ee213d57d0971eeac254ca354a34253b45e7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+### 2.2.2 - 2018-06-05
+
+- Fixed `bin/agoo` which had become out of date.
+
+- Added optimization description in `misc/optimize.md`.
+
+- Fixed static file asset page caching bug.
+
 ### 2.2.1 - 2018-05-31
 
 - Corrected header bug where a `:` in the value would cause an incorrect header key and value.

data/bin/agoo

@@ -22,10 +22,17 @@ Usage: agoo [options] [<handler_class>@<path>]...
 
 version #{Agoo::VERSION}
 
-Agoo is a Ruby web server. It can be run as a standalone application using this
-application. The handler/class arguments must have the form of <class>@<path>
-where the class is the Ruby class where the new method takes not arguments and
-has either a call() method or a on_request() method.
+Agoo is a Ruby web server. It can be run as a standalone application using
+this application. The handler/class arguments must have the form of
+<path>@<class> where the class is a Ruby class and the path is the URL path
+that will be directed to the class or an instance of the class provided. If
+the class implements a call() or on_request() method it will be used directly
+otherwise an instance of the class will be created. The new method mut take no
+arguments and have either a call() method or a on_request() method.
+
+Example:
+
+  agoo -I example -r simple /simple@Simple
 
 }
 
@@ -36,47 +43,66 @@ has either a call() method or a on_request() method.
 @classic = true
 @console = true
 @colorize = true
+@threads = 0
+@workers = 0
+@first = false
 
 @opts = OptionParser.new(usage)
-@opts.on('-h', '--help', 'Show this display.')                                 { puts @opts.help; Process.exit!(0) }
-@opts.on('-s', '--silent', 'Silent.')                                          { @verbose = 0 }
-@opts.on('-v', '--verbose', 'Increase verbosity.')                             { @verbose += 1 }
-@opts.on('-p', '--port PORT', Integer, 'Port to listen on.')                   { |p| @port = p }
-@opts.on('-d', '--dir DIR', String, 'Directory to serve static assets from.')  { |d| @root = d }
-@opts.on('-r', '--require FILE', String, 'Ruby require.')                      { |r| require r }
-@opts.on('--log.dir DIR', String, 'Log file directory.')                       { |d| @log_dir = d }
-@opts.on('--[no-]log.classic', 'Classic log entries instead of JSON.')         { |b| @classic = b }
-@opts.on('--[no-]log.console', 'Display log entries on the console.')          { |b| @console = b }
-@opts.on('--[no-]log.colorize', 'Display log entries in color.')               { |b| @colorize = b }
+@opts.on('-h', '--help', 'Show this display.')                                       { puts @opts.help; Process.exit!(0) }
+@opts.on('-s', '--silent', 'Silent.')                                                { @verbose = 0 }
+@opts.on('-v', '--verbose', 'Increase verbosity.')                                   { @verbose += 1 }
+@opts.on('-f', '--root_first', 'Check the root directory before the handle paths.')  { @first = true }
+@opts.on('-p', '--port PORT', Integer, 'Port to listen on.')                         { |p| @port = p }
+@opts.on('-d', '--dir DIR', String, 'Directory to serve static assets from.')        { |d| @root = d }
+@opts.on('-r', '--require FILE', String, 'Ruby require.')                            { |r| require r }
+@opts.on('-t', '--threads COUNT', Integer, 'Number of threads to use.')              { |t| @threads = t }
+@opts.on('-w', '--workers COUNT', Integer, 'Number of workers to use.')              { |w| @workers = w }
+@opts.on('--log.dir DIR', String, 'Log file directory.')                             { |d| @log_dir = d }
+@opts.on('--[no-]log.classic', 'Classic log entries instead of JSON.')               { |b| @classic = b }
+@opts.on('--[no-]log.console', 'Display log entries on the console.')                { |b| @console = b }
+@opts.on('--[no-]log.colorize', 'Display log entries in color.')                     { |b| @colorize = b }
 
 handler_paths = @opts.parse(ARGV)
 
-server = Agoo::Server.new(@port, @root,
-			  log_dir: @log_dir,
-			  thread_count: 0,
-			  log_console: @console,
-			  log_classic: @classic,
-			  log_colorize: @colorize,
-			  log_states: {
-			    INFO: 1 <= @verbose,
-			    DEBUG: 3 <= @verbose,
-			    connect: 2 <= @verbose,
-			    request: 2 <= @verbose,
-			    response: 2 <= @verbose,
-			    eval: 2 <= @verbose,
-			  })
+@threads = 0 if @threads < 0
+@workers = 1 if @workers < 1
+  
+Agoo::Log.configure(dir: @log_dir,
+		    console: @console,
+		    classic: @classic,
+		    colorize: @colorize,
+		    states: {
+		      INFO: 1 <= @verbose,
+		      DEBUG: 3 <= @verbose,
+		      connect: 2 <= @verbose,
+		      request: 2 <= @verbose,
+		      response: 2 <= @verbose,
+		      eval: 2 <= @verbose,
+		      push: 2 <= @verbose,
+		    })
+
+Agoo::Server.init(@port, @root, thread_count: @threads, worker_count: @workers, root_first: @first)
+
 puts "Agoo #{Agoo::VERSION} is listening on port #{@port}. Path mappings are:" if 1 <= @verbose
 
 handler_paths.each { |hp|
-  classname, path = hp.split('@')
+  path, classname = hp.split('@')
   if classname.nil? || path.nil? || classname.empty? || path.empty?
     raise "Invalid handler/path specification. Both a class and path must be present."
   end
   c = Object.const_get(classname)
-  server.handle(nil, path, c.new)
+  if c.respond_to?(:call) || c.respond_to?(:on_request)
+    Agoo::Server.handle(nil, path, c)
+  else
+    Agoo::Server.handle(nil, path, c.new)
+  end
   if 1 <= @verbose
     puts "  #{path} => #{classname}"
   end
 }
 
-server.start()
+if handler_paths.empty?
+  puts "Agoo is only serving static files in '#{@root}'."
+end
+
+Agoo::Server.start()

data/ext/agoo/con.c

@@ -272,15 +272,9 @@ con_header_read(Con c) {
 	    return bad_request(c, 500, __LINE__);
 	}
 	return -mlen;
-
-	// TBD int hook_or_page(method, path, pend, &hook)
-	//  return http status
-	//  0 is not handled
-	//  200 means taken care of
-	//  default (over 200) call bad_request
     }
     if (GET == method && the_server.root_first &&
-	       NULL != (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
+	NULL != (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
 	if (page_response(c, p, hend)) {
 	    return bad_request(c, 500, __LINE__);
 	}

data/ext/agoo/hook.c

@@ -62,6 +62,8 @@ hook_create(Method method, const char *pattern, VALUE handler) {
 	hook->next = NULL;
 	if (T_STRING == rb_type(handler)) {
 	    handler = resolve_classpath(StringValuePtr(handler), RSTRING_LEN(handler));
+	    // TBD does class handle it or should an instance be made?
+	    //  
 	}
 	hook->handler = handler;
 	rb_gc_register_address(&handler);

data/ext/agoo/page.c

@@ -157,9 +157,9 @@ mime_set(Cache cache, const char *key, const char *value) {
     }
     for (s = *bucket; NULL != s; s = s->next) {
 	if (h == (int64_t)s->hash && len == s->klen &&
-	    ((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
+	    ((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strncmp(s->key, key, len))) {
 	    if (h == (int64_t)s->hash && len == s->klen &&
-		((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
+		((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strncmp(s->key, key, len))) {
 		DEBUG_FREE(mem_mime_slot, s->value)
 		free(s->value);
 		s->value = strdup(value);
@@ -196,9 +196,9 @@ cache_set(Cache cache, const char *key, int klen, Page value) {
     }
     for (s = *bucket; NULL != s; s = s->next) {
 	if (h == (int64_t)s->hash && len == s->klen &&
-	    ((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
+	    ((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strncmp(s->key, key, len))) {
 	    if (h == (int64_t)s->hash && len == s->klen &&
-		((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
+		((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strncmp(s->key, key, len))) {
 		old = s->value;
 		// replace
 		s->value = value;
@@ -216,7 +216,8 @@ cache_set(Cache cache, const char *key, int klen, Page value) {
     if (NULL == key) {
 	*s->key = '\0';
     } else {
-	strcpy(s->key, key);
+	strncpy(s->key, key, len);
+	s->key[len] = '\0';
     }
     s->value = value;
     s->next = *bucket;
@@ -318,6 +319,9 @@ update_contents(Cache cache, Page p) {
 	    break;
 	}
     }
+    if (suffix <= p->path) {
+	suffix = NULL;
+    }
     if (NULL != suffix) {
 	suffix++;
 	if (NULL == (mime = mime_get(cache, suffix))) {
@@ -369,6 +373,7 @@ update_contents(Cache cache, Page p) {
 	return false;
     }
     rewind(f);
+
     // Format size plus space for the length, the mime type, and some
     // padding. Then add the content length.
     msize = sizeof(page_fmt) + 60 + size;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/lib/rack/handler/agoo.rb

@@ -1,5 +1,5 @@
 
-require 'agoo'
+require 'agoo' unless defined?(Agoo)
 
 # Grand parent for the Agoo rack handler.
 module Rack
@@ -15,7 +15,7 @@ module Rack
       #
       #   - *:port [_Integer_] port to listen on
       #   - *:root [_String_] root or public directory for static assets
-      #   - *:rmux [_true_|_false_] if true look in the root directory first before calling Ruby hooks
+      #   - *:root_first [_true_|_false_] if true look in the root directory first before calling Ruby hooks
       #   - *:wc* [_Integer_] number of workers to fork. Defaults to one which is not to fork.
       #   - */path=MyHandler* path and class name to handle requests on that path
       def self.run(handler, options={})
@@ -40,7 +40,7 @@ module Rack
 	  elsif :wc == k
 	    worker_count = v.to_i
 	    options.delete(k)
-	  elsif :rmux == k
+	  elsif :rmux == k || :root_first == k || :f == k
             options[:root_first] = false
 	  elsif k.nil?
 	    not_found_handler = v
@@ -56,8 +56,8 @@ module Rack
 	options[:thread_count] = 0
 	options[:worker_count] = worker_count
 	::Agoo::Server.init(port, root, options)
-	path_map.each { |path,handler|
-			::Agoo::Server.handle(nil, path, handler)
+	path_map.each { |path,h|
+			::Agoo::Server.handle(nil, path, h)
 	}
         begin
           # If Rails is loaded this should work else just ignore.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj