steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add <delete-request> and http-delete

db4
Alex Chapman 2009-04-15 10:52:00 +10:00
parent ec62badca6
commit 9e4adede5f
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
basis/http/client/client.factor
View File

@ -1,6 +1,6 @@
! Copyright (C) 2005, 2009 Slava Pestov. ! Copyright (C) 2005, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs debugger kernel math math.parser namespaces make USING: accessors assocs kernel math math.parser namespaces make
sequences strings splitting calendar continuations accessors vectors sequences strings splitting calendar continuations accessors vectors
math.order hashtables byte-arrays destructors math.order hashtables byte-arrays destructors
io io.sockets io.streams.string io.files io.timeouts io io.sockets io.streams.string io.files io.timeouts
@ -128,26 +128,19 @@ SYMBOL: redirects
[ do-redirect ] [ nip ] if [ do-redirect ] [ nip ] if
] with-variable ; inline recursive ] with-variable ; inline recursive
PRIVATE>
: <client-request> ( url method -- request ) : <client-request> ( url method -- request )
<request> <request>
swap >>method swap >>method
swap >url ensure-port >>url ; inline swap >url ensure-port >>url ; inline
PRIVATE>
: success? ( code -- ? ) 200 299 between? ; : success? ( code -- ? ) 200 299 between? ;
! ERROR: download-failed response data ;
! M: download-failed error.
! "HTTP request failed:" print nl
! [ response>> . ] [ data>> . ] bi ;
ERROR: download-failed response ; ERROR: download-failed response ;
: check-response ( response -- response ) : check-response ( response -- response )
dup code>> success? [ download-failed ] unless ; dup code>> success? [ download-failed ] unless ;
! : check-response ( response data -- response data )
! over code>> success? [ download-failed ] unless ;
: check-response-with-body ( response body -- response body ) : check-response-with-body ( response body -- response body )
[ >>body check-response ] keep ; [ >>body check-response ] keep ;
@ -166,19 +159,7 @@ ERROR: download-failed response ;
<get-request> http-request ; <get-request> http-request ;
: with-http-get ( url quot -- response ) : with-http-get ( url quot -- response )
[ <get-request> ] dip with-http-request check-response ; inline [ <get-request> ] dip with-http-request ; inline
! : <delete-request> ( url -- request )
! "DELETE" <client-request> ;
! : http-delete ( url -- response )
! <delete-request> http-request ;
! : <trace-request> ( url -- request )
! <client-request> "TRACE" >>method ;
! : http-trace ( url -- response )
! <trace-request> http-request ;
: download-name ( url -- name ) : download-name ( url -- name )
present file-name "?" split1 drop "/" ?tail drop ; present file-name "?" split1 drop "/" ?tail drop ;
@ -203,6 +184,12 @@ ERROR: download-failed response ;
: http-put ( post-data url -- response data ) : http-put ( post-data url -- response data )
<put-request> http-request ; <put-request> http-request ;
: <delete-request> ( url -- request )
"DELETE" <client-request> ;
: http-delete ( url -- response data )
<delete-request> http-request ;
USING: vocabs vocabs.loader ; USING: vocabs vocabs.loader ;
"debugger" vocab [ "http.client.debugger" require ] when "debugger" vocab [ "http.client.debugger" require ] when