added parser for byte-ranges, added trace facility work flow state-ma…

…chine

machine/data/data.factor

@@ -1,6 +1,7 @@
-USING: accessors arrays assocs byte-arrays calendar uuid
+USING: accessors arrays assocs byte-arrays calendar
 calendar.format combinators combinators.short-circuit
-io.encodings.utf8 kernel math namespaces quotations ;
+io.encodings.utf8 kernel linked-assocs math namespaces
+quotations uuid ;
 IN: http.machine.data
 
 TUPLE: stream-body chunk next ;
@@ -35,12 +36,12 @@ TUPLE: machine-response
     content-type
     content-charset
     content-encoding
-    body ;
+    body
+    size ;
 
 : <machine-response> ( -- response )
     machine-response new
     "1.1" >>version
-    500 >>code
     H{ } clone >>headers
     V{ } clone >>cookies
     utf8 >>content-encoding ;
@@ -74,6 +75,9 @@ TUPLE: machine-response
 : set-response-header ( value key -- )
     response headers>> set-at ; inline
 
+: append-response-header ( value key -- )
+    response headers>> push-at ; inline
+
 : get-response-header ( header -- value )
     response headers>> at ; inline
 

machine/dispatch/dispatch.factor

@@ -66,7 +66,7 @@ TUPLE: dispatch-tree value children ;
     hosts>> { [ [ host>> ] [ ] bi* at ] [ [ drop "*" ] [ ] bi* at ] } 2|| ;
 
 : create-bindings ( rest bindings assoc -- rest' assoc )
-    2over { [ nip empty? not ] [ drop empty? not ] } 2&&
+    2over { [ nip { [ empty? not ] [ "*" = not ] } 1&& ] [ drop empty? not ] } 2&&
     [
         [ 2unclip-slice ] dip [ set-at ] keep create-bindings
     ] [ nip ] if ;

machine/example/example.factor

@@ -1,10 +1,12 @@
 USING: accessors fry http.machine http.machine.data
 http.machine.dispatch http.machine.resource
-io.servers.connection kernel namespaces threads ;
+http.machine.resource.static io io.servers.connection kernel
+math.parser namespaces threads ;
 IN: http.machine.example
 
 SINGLETON: example-resource
 
+
 <PRIVATE
 
 : produce-text-content ( -- content )
@@ -23,10 +25,17 @@ M: example-resource content-types-provided
 ! M: example-resource allowed-methods
 !    drop { "POST" "PUT" "OPTIONS" } ;
 
+M: example-resource process-post drop
+    "content-length" get-request-header [
+        string>number request body>> stream-read drop 
+    ] when* t ;
+
+M: example-resource resource-exists? drop t ;
 
 : start-machine-example ( -- )
     <machine-dispatcher>
         #{ "*" "example" "*" } example-resource add-rule
+        #{ "*" "files" "*" } "/Users/sascha/Temp/" <static-file-resource> add-rule
     <machine> 8080 >>insecure
     [ machine-server set-global ]
     [ '[ _ start-server ] in-thread ] bi ;