agoo 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5771b6b916b39b35a7ddb198b3c80191b69cfd0f0d8d8fd792d1a1b90cc741c
-  data.tar.gz: 2503a29f723db8fa63b0a3bb6f64879046f4f31b2d15c594d4e22e5c2d745e44
+  metadata.gz: af291829d85f65bcbc9f124b1f63e470f78d2650c84bc78cba437b46cd994eac
+  data.tar.gz: 9b894a8bc473f26667617da0c47704a853afb97b6a04c3e5f4dd4c427879fbc2
 SHA512:
-  metadata.gz: 0deeaf2727b3c729229420953662854de902e8a173d7a0ccabbe9e42ea2d2d269c66275520e8950c73f4ef7a758b271456f753695aea0bc8492cf1fbb66fbde9
-  data.tar.gz: 4fe4ce7b04976e446f9f0f3c051e360041c70d6a65d2d6bb1f5ab30c9cec1955326ead8caed0a66bd5f403ada280d61c645eca3509e5568c73940a034258d51a
+  metadata.gz: e4eae332a464287827a3c4fd8a6f833cbf2a451e24df78c7f8e7424f428abcc8cce6983bb08e7ec73c1dcb6a1b4193213297ea163c2d769e65223043b1da31ba
+  data.tar.gz: cc930402da457aeecc9c6279278ea8ac89fd607d6b11add8512dec5c293d8738041d27f2f1c30ce1a98e2544bd6017c20f64b615c1f93f2b26e5fe7cf5a195bc

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+### 2.8.1 - 2019-03-01
+
+Add missing options.
+
+- Add missing options to `bin/agoo`.
+
+- Add missing options to `rack::Handler::Agoo`.
+
+- `bin/agoo` now picks up `config.ru` or `config.rb` if no other files are specified.
+
 ### 2.8.0 - 2019-02-19
 
 Extend GraphQL

data/README.md

@@ -91,11 +91,13 @@ Agoo is not available on Windows.
 - Agoo has a new GraphQL module with a simple, easy to use
   API. Checkout the [hello](example/graphql/hello.rb) or
   [song](example/graphql/song.rb) examples.
+  [An Instrumental Intro to GraphQL with Ruby](https://blog.appsignal.com/2019/01/29/graphql.html)
+  is a walk through.
 
 - Agoo takes first place as the highest throughput on [web-frameworks
   benchmarks](https://github.com/the-benchmarker/web-frameworks). Latency was
-  not at the top but release 2.5.2 improves that. Look for an Agoo-C benchmark
-  in the future.
+  not at the top but release 2.5.2 improves that. The Agoo-C benchmarks it at
+  the top. The fastest web server across all languages.
 
 - Clustered Agoo is ready. For slower application and a machine with multiple
   cores a significant improvement is performance is realized. The application

data/bin/agoo

@@ -18,7 +18,7 @@ require 'agoo'
 # Prepare the +usage+ string.
 # Basically a banner text and description passed on +OptionParser+.
 usage = %{
-Usage: agoo [options] [<handler_class>@<path>]...
+Usage: agoo [options] [<handler_class>@<path>]... [<file>.ru | <file>.rb]
 
 version #{Agoo::VERSION}
 
@@ -27,9 +27,13 @@ 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
+otherwise an instance of the class will be created. The new method must take no
 arguments and have either a call() method or a on_request() method.
 
+Files with a .rb or .ru can also be listed. If no files or path-class pairs are
+listed then Agoo will look for either a config.ru or a config.rb file to load.
+In that case a kernel level run method is defined to start the server.
+
 Example:
 
   agoo -I example -r simple /simple@Simple
@@ -37,7 +41,8 @@ Example:
 }
 
 @verbose = 1
-@port = 6464
+@port = 0
+@binds = []
 @root = '.'
 @log_dir = nil
 @classic = true
@@ -54,57 +59,137 @@ Example:
 @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('-b', '--bind URL', String, 'URL to receive connections on.')               { |b| @binds << b }
 @opts.on('-d', '--dir DIR', String, 'Directory to serve static assets from.')        { |d| @root = d }
 @opts.on('-g', '--graphql PATH', String, 'URL path for GraphQL requests.')           { |g| @graphql = g }
 @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 }
+@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)
 
 @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, graphql: @graphql)
-
-puts "Agoo #{Agoo::VERSION} is listening on port #{@port}. Path mappings are:" if 1 <= @verbose
-
-handler_paths.each { |hp|
-  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)
-  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
-}
+@ran = false
+@run_file = nil
 
 if handler_paths.empty?
-  puts "Agoo is only serving static files in '#{@root}'."
+  if File.exist?('config.ru')
+    @run_file = 'config.ru'
+  elsif File.exist?('config.rb')
+    @run_file = 'config.rb'
+  end
+else
+  handler_paths.each { |hp|
+    unless hp.include?('@')
+      @run_file = hp
+      break
+    end
+  }
 end
 
-Agoo::Server.start()
+if @run_file.nil?
+  @port = 6464 if 0 == @port
+  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,
+		    bind: @binds,
+		    thread_count: @threads,
+		    worker_count: @workers,
+		    root_first: @first,
+		    graphql: @graphql)
+
+  puts "Agoo #{Agoo::VERSION} is listening on port #{@port}. Path mappings are:" if 1 <= @verbose
+
+  handler_paths.each { |hp|
+    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)
+    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
+    puts "  #{path} => #{classname}" if 1 <= @verbose
+  }
+
+  puts "Agoo is only serving static files in '#{@root}'." if handler_paths.empty?
+  Agoo::Server.start() unless @ran
+
+else
+  @port = 9292 if 0 == @port
+  def run(handler, options={})
+    options[:port] = @port unless options.has_key?(:port) || options.has_key?(:p)
+    options[:root] = @root unless options.has_key?(:root) || options.has_key?(:dir) || options.has_key?(:d)
+    options[:workers] = @workers unless options.has_key?(:workers) || options.has_key?(:wc)
+    options[:root_first] = @first unless options.has_key?(:root_first) || options.has_key?(:f) || options.has_key?(:rmux)
+    options[:graphql] = @graphql unless options.has_key?(:graphql) || options.has_key?(:g)
+    unless @binds.empty?
+      if options.has_key?(:b)
+	b2 = options[:b]
+	b2 = b2.split(',') if b2.is_a?(String)
+	@binds = @binds + b2
+	options.delete(:b)
+      elsif options.has_key?(:bind)
+	b2 = options[:bind]
+	b2 = b2.split(',') if b2.is_a?(String)
+	@binds = @binds + b2
+	options.delete(:bind)
+      end
+      options[:bind] = @binds
+    end
+    unless options.has_key?(:silent) || options.has_key?(:verbose) || options.has_key?(:debug)
+      if 0 == @verbose
+	options[:silent] = true
+      elsif 2 == @verbose
+	options[:verbose] = true
+      elsif 3 <= @verbose
+	options[:debug] = true
+      end
+    end
+    options[:log_dir] = @log_dir unless options.has_key?(:log_dir)
+    unless options.has_key?(:log_classic) || options.has_key?(:no_log_classic)
+      if @classic
+	options[:log_classic] = true
+      else
+	options[:no_log_classic] = true
+      end
+    end
+    unless options.has_key?(:log_console) || options.has_key?(:no_log_console)
+      if @console
+	options[:log_console] = true
+      else
+	options[:no_log_console] = true
+      end
+    end
+    unless options.has_key?(:log_colorize) || options.has_key?(:no_log_colorize)
+      if @colorize
+	options[:log_colorize] = true
+      else
+	options[:no_log_colorize] = true
+      end
+    end
+    ::Rack::Handler::Agoo.run(handler, options)
+  end
+  puts "  Running #{@run_file}" if 1 <= @verbose
+  load(@run_file)
+end

data/ext/agoo/doc.c

@@ -33,6 +33,16 @@ pttttttttttttttttttttttttttp.p.t\
 ................................\
 ................................";
 
+static char	value_map[256] = "\
+.........ww..w..................\
+wpq.....pp..ctt.ttttttttttt..p..\
+pttttttttttttttttttttttttttp.p.t\
+.ttttttttttttttttttttttttttppp..\
+................................\
+................................\
+................................\
+................................";
+
 void
 agoo_doc_init(agooDoc doc, const char *str, int len) {
     if (0 >= len) {
@@ -50,7 +60,7 @@ agoo_doc_init(agooDoc doc, const char *str, int len) {
 int
 agoo_doc_skip_white(agooDoc doc) {
     const char	*start = doc->cur;
-    
+
     for (; 'w' == char_map[*(uint8_t*)doc->cur]; doc->cur++) {
     }
     return (int)(doc->cur - start);
@@ -59,7 +69,7 @@ agoo_doc_skip_white(agooDoc doc) {
 int
 agoo_doc_skip_jwhite(agooDoc doc) {
     const char	*start = doc->cur;
-    
+
     for (; 'w' == json_map[*(uint8_t*)doc->cur]; doc->cur++) {
     }
     return (int)(doc->cur - start);
@@ -82,7 +92,7 @@ agoo_doc_skip_comment(agooDoc doc) {
 bool
 agoo_doc_skip_to(agooDoc doc, char c) {
     const char	*orig = doc->cur;
-    
+
     for (; doc->cur < doc->end; doc->cur++) {
 	if (c == *doc->cur) {
 	    return true;
@@ -114,6 +124,12 @@ agoo_doc_next_token(agooDoc doc) {
     }
 }
 
+void
+agoo_doc_read_value_token(agooDoc doc) {
+    for (; 't' == value_map[*(uint8_t*)doc->cur]; doc->cur++) {
+    }
+}
+
 // Just find end.
 int
 agoo_doc_read_string(agooErr err, agooDoc doc) {
@@ -146,6 +162,26 @@ agoo_doc_read_string(agooErr err, agooDoc doc) {
     return AGOO_ERR_OK;
 }
 
+// string delimited by a single quote
+int
+agoo_doc_read_quote(agooErr err, agooDoc doc) {
+    doc->cur++; // skip first '
+    if ('\'' == *doc->cur) { // an empty string
+	doc->cur++;
+	return AGOO_ERR_OK; // empty string
+    }
+    for (; doc->cur < doc->end; doc->cur++) {
+	if ('\'' == *doc->cur) {
+	    doc->cur++;
+	    break;
+	}
+    }
+    if (doc->end <= doc->cur) {
+	return agoo_doc_err(doc, err, "String not terminated");
+    }
+    return AGOO_ERR_OK;
+}
+
 int
 agoo_doc_err(agooDoc doc, agooErr err, const char *fmt, ...) {
     va_list	ap;
@@ -200,7 +236,7 @@ read_number(agooErr err, agooDoc doc) {
     int		hasExp = false;
     int		dec_cnt = 0;
     int		d;
-    
+
     if ('-' == *doc->cur) {
 	doc->cur++;
 	neg = true;
@@ -292,7 +328,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
     const char	*start;
 
     agoo_doc_skip_white(doc);
-    start = doc->cur;    
+    start = doc->cur;
     switch (*doc->cur) {
     case '$':
 	doc->cur++;
@@ -368,7 +404,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	doc->cur++;
 	while (doc->cur < doc->end) {
 	    gqlValue	member;
-	    
+
 	    agoo_doc_skip_white(doc);
 	    if (']' == *doc->cur) {
 		doc->cur++;
@@ -391,7 +427,7 @@ agoo_doc_read_value(agooErr err, agooDoc doc, gqlType type) {
 	while (doc->cur < doc->end) {
 	    char	key[256];
 	    gqlValue	member;
-	    
+
 	    agoo_doc_skip_white(doc);
 	    if ('}' == *doc->cur) {
 		doc->cur++;

data/ext/agoo/doc.h

@@ -28,8 +28,10 @@ extern int	agoo_doc_skip_jwhite(agooDoc doc);
 
 extern void	agoo_doc_next_token(agooDoc doc);
 extern void	agoo_doc_read_token(agooDoc doc);
+extern void	agoo_doc_read_value_token(agooDoc doc);
 
 extern int	agoo_doc_read_string(agooErr err, agooDoc doc);
+extern int	agoo_doc_read_quote(agooErr err, agooDoc doc);
 
 extern int	agoo_doc_err(agooDoc doc, agooErr err, const char *fmt, ...);
 extern void	agoo_doc_location(agooDoc doc, int *linep, int *colp);

data/ext/agoo/gqlvalue.c

@@ -1555,7 +1555,7 @@ convert_to_uuid(agooErr err, gqlValue value) {
 }
 
 int
-gql_value_convert(agooErr err, gqlValue value, struct _gqlType *type) {
+gql_value_convert(agooErr err, gqlValue value, gqlType type) {
     int	code = AGOO_ERR_OK;
 
     if (type != value->type) {

data/lib/agoo/version.rb

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

data/lib/rack/handler/agoo.rb

@@ -12,20 +12,21 @@ module Rack
 
       # Run the server. Options are the same as for Agoo::Server plus a :port,
       # :root, :rmux, and :wc option.
-      #
-      #   - *:port [_Integer_] port to listen on
-      #   - *:root [_String_] root or public directory for static assets
-      #   - *: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={})
-	port = 9292
+	port = 0
 	root = './public'
         root_set = false
 	worker_count = 1;
 	default_handler = nil
 	not_found_handler = nil
 	path_map = {}
+	verbose = 1
+	log_dir = nil
+	classic = true
+	console = true
+	colorize = true
+	binds = nil
+	graphql = nil
         options[:root_first] = true # the default for rack
 
 	default_handler = handler unless handler.nil?
@@ -33,11 +34,11 @@ module Rack
 	  if :port == k || :p == k
 	    port = v.to_i
 	    options.delete(k)
-	  elsif :root == k
+	  elsif :root == k || :dir == k || :d == k
 	    root = v
             root_set = true
 	    options.delete(k)
-	  elsif :wc == k
+	  elsif :wc == k || :workers == k
 	    worker_count = v.to_i
 	    options.delete(k)
 	  elsif :rmux == k || :root_first == k || :f == k
@@ -45,8 +46,76 @@ module Rack
 	  elsif k.nil?
 	    not_found_handler = v
 	    options.delete(k)
-	  elsif :graphql == k
-	    # leave as is
+	  elsif :graphql == k || :g == k
+	    graphql = v
+	    options.delete(k)
+	  elsif :s == k || :silent == k
+	    verbose = 0
+	    options.delete(k)
+	  elsif :v == k || :verbose == k
+	    verbose = 2
+	    options.delete(k)
+	  elsif :debug == k
+	    verbose = 3
+	    options.delete(k)
+	  elsif :b == k || :bind == k
+	    if v.is_a?(String)
+	      binds = v.split(',')
+	    else
+	      binds = v
+	    end
+	    options.delete(k)
+	  elsif :log_dir == k
+	    log_dir = v
+	    options.delete(k)
+	  elsif :log_classic == k
+	    classic = true
+	    options.delete(k)
+	  elsif :no_log_classic == k
+	    classic = false
+	    options.delete(k)
+	  elsif :log_console == k
+	    console = true
+	    options.delete(k)
+	  elsif :no_log_console == k
+	    console = false
+	    options.delete(k)
+	  elsif :log_colorize == k
+	    colorize = true
+	    options.delete(k)
+	  elsif :no_log_colorize == k
+	    colorize = false
+	    options.delete(k)
+	  elsif :help == k || :h == k
+	    puts %|
+Agoo is a Ruby web server that supports Rack. The follwing options are available
+using the -O NAME[=VALUE] option of rackup. Note that if binds are provided the
+-p PORT option will be ignored but -Op=PORT can be used.
+
+  -O h, help                 Show this display.
+  -O s, silent               Silent.
+  -O v, verbose              Verbose.
+  -O debug                   Very verbose.
+  -O f, rmux, root_first     Check the root directory before the handle paths.
+  -O p, port=PORT            Port to listen on.
+  -O b, bind=URL             URLs to receive connections on, comma separated.
+                             Examples:
+                               "http ://127.0.0.1:6464"
+                               "unix:///tmp/agoo.socket"
+                               "http ://[::1]:6464
+                               "http ://:6464"
+  -O d, dir, root=DIR        Directory to serve static assets from.
+  -O g, graphql=PATH         URL path for GraphQL requests.
+  -O t, threads=COUNT        Number of threads to use.
+  -O w, workers=COUNT        Number of workers to use.
+     -O log_dir=DIR          Log file directory.
+     -O [no_]log_classic     Classic log entries instead of JSON.
+     -O [no_]log_console     Display log entries on the console.
+     -O [no_]log_colorize    Display log entries in color.
+  -O /path=MyHandler path and class name to handle requests on that path
+
+|
+	    exit(true)
 	  else
             k = k.to_s
             if k.start_with?('/')
@@ -57,14 +126,37 @@ module Rack
 	}
 	options[:thread_count] = 0
 	options[:worker_count] = worker_count
+	if binds.nil?
+	  options[:Port] = port unless port == 0
+	else
+	  options[:bind] = binds
+	  options[:Port] = port
+	end
+	options[:graphql] = graphql unless graphql.nil?
+
+	::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, options)
 	path_map.each { |path,h|
-			::Agoo::Server.handle(nil, path, h)
+	  ::Agoo::Server.handle(nil, path, h)
 	}
         begin
           # If Rails is loaded this should work else just ignore.
-          ::Agoo::Server.path_group('/assets', Rails.configuration.assets.paths)
-          root = Rails.public_path unless root_set
+	  if const_defined?(:Rails)
+            ::Agoo::Server.path_group('/assets', ::Rails.configuration.assets.paths)
+            root = Rails.public_path unless root_set
+	  end
         rescue Exception
         end
 	unless default_handler.nil?

metadata

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