agoo 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 017722eeae76195c26f2282976788f75f4104499603f00c3644383ea366071a5
-  data.tar.gz: e89000afbdc9a9727a68461b493b729977475b1f497811f35aa44d6910d62064
+  metadata.gz: 8a18f59a226cbfe061c8b645fadeab626f7ba7eb7f8af017032192bf276db749
+  data.tar.gz: d10ec4a0c5ba7676e2298e14cee626db4794465f6b987e02b6a8c2f341eaedb5
 SHA512:
-  metadata.gz: cf56a6b3e9bcdc8f35093f7a7119b2f07bf5b673986e97710918f62d002ba4d02b5de1fc75b1725cb663d14bb85ae7b2d538ffe2d285579052620b2a754f42db
-  data.tar.gz: 1f49fe3e014610b5c77ac96edf500dbf68fa2bf9678051e74c227246e2c9f054431479f4d599aee72eb0d74749e1cc5519fb4060a380b452be7a5ed0e7dcdd12
+  metadata.gz: f8fa258e15e65f91ed6d9586c0cf951dca2038c13a52e4727a94bd79bb0794574f8cb306cd7f75188a435063f19016e7b32e754ee304fc53be75ff63ab045464
+  data.tar.gz: 14be184ac912ff59aaf1d097a612d8cf4228d00840b7e2410b76682909a776db5c4ce6e4f3769eb34410e42e9df8eba90d1d2b5275c6fbfe0eee6593ae2a77fb

data/README.md

@@ -14,17 +14,16 @@ require 'agoo'
 server = Agoo::Server.new(6464, 'root')
 
 class MyHandler
-  def initialize
-  end
-
   def call(req)
     [ 200, { }, [ "hello world" ] ]
   end
 end
 
-handler = TellMeHandler.new
+handler = MyHandler.new
 server.handle(:GET, "/hello", handler)
 server.start()
+# To run this example type the following then go to a browser and enter a URL of localhost:6464/hello.
+# ruby hello.rb
 ```
 
 ## Installation

data/ext/agoo/server.c

@@ -112,7 +112,7 @@ static int
 configure(Err err, Server s, int port, const char *root, VALUE options) {
     s->port = port;
     s->root = strdup(root);
-    s->thread_cnt = 1;
+    s->thread_cnt = 0;
     s->running = 0;
     s->listen_thread = 0;
     s->con_thread = 0;
@@ -165,7 +165,6 @@ configure(Err err, Server s, int port, const char *root, VALUE options) {
  *
  *   - *:log_dir* [_String_] directory to place log files in. If nil or empty then no log files are written.
  *
- 
  *   - *:log_console* [_true_|_false_] if true log entry are display on the console.
  *
  *   - *:log_classic* [_true_|_false_] if true log entry follow a classic format. If false log entries are JSON.

data/lib/agoo.rb

@@ -3,5 +3,5 @@ module Agoo
 end
 
 require 'agoo/version'
-
+require 'rack/handler/agoo'
 require 'agoo/agoo' # C extension

data/lib/agoo/version.rb

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

data/lib/rack/handler/agoo.rb

@@ -0,0 +1,50 @@
+
+require 'agoo'
+
+module Rack
+  module Handler
+
+    # The Rack::Handler::Agoo module is a handler for common rack config.rb files.
+    module Agoo
+
+      # Run the server. Options are the same as for Agoo::Server plus a :prot
+      # and :root option.
+      def self.run(handler, options={})
+	port = 9292
+	root = '.'
+	default_handler = nil
+	not_found_handler = nil
+	path_map = {}
+
+	default_handler = handler unless handler.nil?
+	options.each { |k,v|
+	  if :port == k
+	    port = v.to_i
+	    options.delete(k)
+	  elsif :root == k
+	    root = v
+	    options.delete(k)
+	  elsif k.is_a?(String) && k.start_with?('/')
+	    path_map[k] = v
+	    options.delete(k)
+	  elsif k.nil?
+	    not_found_handler = v
+	    options.delete(k)
+	  end
+	}
+	options[:thread_count] = 0
+	server = ::Agoo::Server.new(port, root, options)
+	path_map.each { |path,handler|
+	  server.handle(nil, path, handler)
+	}
+	unless default_handler.nil?
+	  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
+      end
+      
+    end
+  end
+end

data/test/static_test.rb

@@ -18,6 +18,7 @@ class StaticTest < Minitest::Test
   def test_static
     begin
       server = Agoo::Server.new(6466, 'root',
+				thread_count: 1,
 				log_dir: '',
 				log_console: true,
 				log_classic: true,

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
@@ -72,6 +78,7 @@ files:
 - ext/agoo/types.h
 - lib/agoo.rb
 - lib/agoo/version.rb
+- lib/rack/handler/agoo.rb
 - test/base_handler_test.rb
 - test/log_test.rb
 - test/rack_handler_test.rb