waitress-core 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5fa1729728798da3d7a4ec0949db1a3fe2deae3
-  data.tar.gz: 667594fb143c6d05c2ce4b158f3b35eb388aadf2
+  metadata.gz: d0a6a44766a6e5162cf5cccf453b6087490f597c
+  data.tar.gz: 7b1501a57e628d4ecbe5ab16ea2eb37f589f60f9
 SHA512:
-  metadata.gz: 83b1ecfba256a594a6e99b7610656257dfdb83445f889ab907e952c3757c7745e447da388e8be16335f62d483f1c88c013d2c306b23be2f1335b0b762654ed3a
-  data.tar.gz: 2fe5debcbbc9770416491d0a876d5190e7d6ab802858ed10654dac67b9f033d327d24fe32be8612e2954433a88704dc9cfee05e09e03acbb3c3259d136a9f52c
+  metadata.gz: ee66d99a6d9b14f19d94dfe9202271fd428edbf4affecc1471e73447bdfbac765926e8f0625e57bea7c8b3755ecd0c54013ca6201931730cdaeeaa0a032a7a85
+  data.tar.gz: 569f5985b4eed195b6588035bd5fa486b99d23ce8544fb6ea55253883b1b93e989d7a1bfe0b9b04ffb43ff0502606328cc777ffa7587494e8134737c7c97e72d

data/lib/waitress/restful/restbuilder.rb

@@ -6,6 +6,7 @@ module Waitress
     require 'yaml'
 
     attr_accessor :priority
+    attr_accessor :regex
 
     SUPPORTED_FORMATS = [:json, :scon, :yaml, :yml]
 
@@ -23,15 +24,16 @@ module Waitress
         else
           buildRe << enumerations.join("|")
         end
-        buildRe << ")"
-        buildRe << "?" if optional
-        buildRe << "/"
-        buildRe << "?" if optional
+        if optional
+          buildRe << "/)?"
+        else
+          buildRe << ")/"
+        end
 
         buildRe
       end
 
-      Waitress::REST.new(Regexp.new(a), &call)
+      Waitress::REST.new(Regexp.new("^#{a}$"), &call)
     end
 
     def initialize regex, &call
@@ -40,8 +42,14 @@ module Waitress
       @priority = 200
     end
 
+    def getpath request
+      path = request.path
+      path += "/" unless path.end_with? "/"
+      path
+    end
+
     def respond? request, vhost
-      (request.uri =~ @regex) != nil
+      (getpath(request) =~ @regex) != nil
     end
 
     def encode_format content_hash, request, response, type
@@ -61,7 +69,7 @@ module Waitress
     end
 
     def serve request, response, client, vhost
-      match = request.uri.match @regex
+      match = getpath(request).match @regex
 
       form = :json
       if (request.get_query.include? "format")

data/lib/waitress/server.rb

@@ -76,17 +76,8 @@ module Waitress
       @processes.times do
         processes << gofork {
           while true
-            begin
-              client = serv.accept
-              gofork do               # Makes sure requires etc don't get triggered across requests
-                handle_client client
-              end.wait
-              client.close rescue nil
-            rescue => e
-              puts "Server Error: #{e} (Fix This!)"
-              puts e.backtrace
-              client.close rescue nil
-            end
+            client = serv.accept
+            connect_client(client)
           end
         }
       end
@@ -97,8 +88,20 @@ module Waitress
       processes
     end
 
+    def connect_client client
+      begin
+        gofork do               # Makes sure requires etc don't get triggered across requests
+          handle_client client
+        end.wait
+        client.close rescue nil
+      rescue => e
+        puts "Server Error: #{e} (Fix This!)"
+        puts e.backtrace
+        client.close rescue nil
+      end
+    end
+
     def handle_client client_socket
-      # pro = gofork do
       begin
         data = client_socket.readpartial(8192)
         nparsed = 0
@@ -123,9 +126,7 @@ module Waitress
         puts "Client Error: #{e}"
         puts e.backtrace
       end
-      # end
       client_socket.close rescue nil
-      # pro.wait
     end
 
     def build_request headers, client_socket

data/lib/waitress/version.rb

@@ -1,3 +1,3 @@
 module Waitress
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waitress-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jaci Brunning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler