anatomy 0.2.16 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e27adc27d4ce9b9e27255abbfc61595a64dfaa
-  data.tar.gz: d79a01d68b3b69f84ff9e485bb18ffec9ee7f43d
+  metadata.gz: 47f62f1faa26500750a8f1f6f0527b4be80ffae5
+  data.tar.gz: 932e0b655fa5ab2b23c8500ece2b3cd12907e9f2
 SHA512:
-  metadata.gz: 336103723169c1c4e832b7bd840f7585baae69b7085305c40d11bd9eecba71bde1856b2bdd7d157c3003801796d5058007f7232326d58e5927428ff6af829d10
-  data.tar.gz: 350aa961918fb5886cb70b46760ae73b7ffd5df83f077bb83b390a924173092e3097de3ae1c28cd1bd3c4e375432a63d57bdc137014d13a21b4c93c3960fb830
+  metadata.gz: 0edd0cec8340c5fcf51aabf9ad53670ce1df40c1c120b4a1b9744c935e89fa2e2d1a92d19430fc0a6c554d2b43beb7668f6fa903f8b45e32dc27ded34d7a5eea
+  data.tar.gz: 81ebee66c67b1448522854f5553b058109ad51c74a6ee8966c00a491a2f40254a741fb98328cc64e1ca1ba2821d4006c8cdeb8e0e539537514893120838aa5f4

data/lib/anatomy/server.ay

@@ -1,6 +1,7 @@
 use(require("atomy"))
 
 require("webrick")
+require("puma")
 
 -- shim in svg content-type support
 WEBrick HTTPUtils DefaultMimeTypes["svg"] = "image/svg+xml"
@@ -10,43 +11,47 @@ class(Server):
     @mutex = Mutex new
 
 def(Server serve(port)):
-  server = WEBrick HTTPServer new(#{.Port -> port})
+  server = Puma Server new(
+    [env]:
+      relative-path = env["REQUEST_PATH"] sub(r"^\/", "")
+      local-abs-path = File absolute-path(relative-path, @destination)
 
-  server mount-proc("/") [req, res]:
-    relative-path = req path sub(r"^\/", "")
-    local-abs-path = File absolute-path(relative-path, @destination)
+      if(relative-path == "favicon.ico")
+        then: respond-to-favicon
+        else: respond-to-path(relative-path, local-abs-path)
+  )
 
-    if(relative-path == "favicon.ico")
-      then: respond-to-favicon(res)
-      else: respond-to-path(res, relative-path, local-abs-path)
+  server add-tcp-listener("0.0.0.0", port)
 
-  trap("INT"): server shutdown
+  -- server mount-proc("/") [req, res]:
 
-  server start
+  trap("INT"):
+    server stop
 
-def(Server respond-to-favicon(res)):
-  res status = 404
+  puts(i"serving on port #{port}")
+  server run(false)
 
-def(Server respond-to-path(res, relative-path, local-abs-path)):
+def(Server respond-to-favicon()):
+  [404, #{}, []]
+
+def(Server respond-to-path(relative-path, local-abs-path)):
   do {
-    rebuild-if-needed 
+    rebuild-if-needed
 
     if(File directory?(local-abs-path))
-      then: respond-to-file(res, File join(local-abs-path, "index.html"))
-      else: respond-to-file(res, local-abs-path)
+      then: respond-to-file(File join(local-abs-path, "index.html"))
+      else: respond-to-file(local-abs-path)
   } rescue:
     e:
       message = i"#{e to-s}\n#{Rubinius Backtrace backtrace(e locations) show}"
       puts(message)
-      respond-with-error(res, message)
+      respond-with-error(message)
 
-def(Server respond-with-error(res, message)):
-  res content-type = "text/html"
-  res body = i"<pre>#{message}</pre>"
+def(Server respond-with-error(message)):
+  [500, #{"Content-Type" -> "text/html"}, [i"<pre>#{message}</pre>"]]
 
-def(Server respond-to-file(res, local-abs-path)):
-  res body = File read(local-abs-path)
-  res content-type = guess-content-type(local-abs-path)
+def(Server respond-to-file(local-abs-path)):
+  [200, #{"Content-Type" -> guess-content-type(local-abs-path)}, [File read(local-abs-path)]]
 
 def(Server guess-content-type(path)):
   extension = File extname(path) sub(r"^\.", "")
@@ -54,7 +59,6 @@ def(Server guess-content-type(path)):
     "application/octet-stream"
 
 def(Server rebuild-if-needed):
-  -- Webrick is multi-threaded; guard against concurrent builds
   @mutex synchronize:
     when(@last-disk-state == disk-state):
       return

data/lib/anatomy/version.rb

@@ -1,3 +1,3 @@
 module Anatomy
-  VERSION = "0.2.16"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,67 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: anatomy
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: atomy
+  prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
+  name: puma
   prerelease: false
-  name: broomhlda
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: broomhlda
+  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: json_pure
+  prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rake
+  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version