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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Joe Groff 2010-03-13 00:45:31 -08:00
parent b28f7c97f4 efe5e22483
commit cb0e99a962
9 changed files with 52 additions and 39 deletions

8
basis/furnace/syndication/syndication.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2008 Slava Pestov.
! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel sequences fry combinators syndication
http.server.responses http.server.redirection furnace.actions
furnace.utilities ;
furnace.utilities io.encodings.utf8 ;
IN: furnace.syndication
GENERIC: feed-entry-title ( object -- string )
@ -35,7 +35,9 @@ M: object >entry
] map ;
: <feed-content> ( body -- response )
feed>xml "application/atom+xml" <content> ;
feed>xml "application/atom+xml" <content>
"UTF-8" >>content-charset
utf8 >>content-encoding ;
TUPLE: feed-action < action title url entries ;

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

@ -1,11 +1,11 @@
! Copyright (C) 2005, 2009 Slava Pestov.
! Copyright (C) 2005, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: assocs kernel math math.parser namespaces make
sequences strings splitting calendar continuations accessors vectors
math.order hashtables byte-arrays destructors
io io.sockets io.streams.string io.files io.timeouts
io.pathnames io.encodings io.encodings.string io.encodings.ascii
io.encodings.utf8 io.encodings.binary io.crlf
io.encodings.utf8 io.encodings.binary io.encodings.iana io.crlf
io.streams.duplex fry ascii urls urls.encoding present locals
http http.parsers http.client.post-data ;
IN: http.client
@ -56,8 +56,8 @@ ERROR: too-many-redirects ;
dup "set-cookie" header parse-set-cookie >>cookies
dup "content-type" header [
parse-content-type
[ >>content-type ]
[ >>content-charset ] bi*
[ >>content-type ] [ >>content-charset ] bi*
dup content-charset>> name>encoding >>content-encoding
] when* ;
: read-response ( -- response )
@ -149,7 +149,7 @@ ERROR: download-failed response ;
: http-request ( request -- response data )
[ [ % ] with-http-request ] B{ } make
over content-charset>> decode check-response-with-body ;
over content-encoding>> decode check-response-with-body ;
: <get-request> ( url -- request )
"GET" <client-request> ;

11
basis/http/http-tests.factor
View File

@ -6,13 +6,13 @@ continuations urls hashtables accessors namespaces xml.data
io.encodings.8-bit.latin1 ;
IN: http.tests
[ "text/plain" latin1 ] [ "text/plain" parse-content-type ] unit-test
[ "text/plain" "UTF-8" ] [ "text/plain" parse-content-type ] unit-test
[ "text/html" utf8 ] [ "text/html; charset=UTF-8" parse-content-type ] unit-test
[ "text/html" "ASCII" ] [ "text/html; charset=ASCII" parse-content-type ] unit-test
[ "text/html" utf8 ] [ "text/html; charset=\"utf-8\"" parse-content-type ] unit-test
[ "text/html" "utf-8" ] [ "text/html; charset=\"utf-8\"" parse-content-type ] unit-test
[ "application/octet-stream" binary ] [ "application/octet-stream" parse-content-type ] unit-test
[ "application/octet-stream" f ] [ "application/octet-stream" parse-content-type ] unit-test
: lf>crlf ( string -- string' ) "\n" split "\r\n" join ;
@ -115,7 +115,8 @@ blah
{ header H{ { "content-type" "text/html; charset=UTF-8" } } }
{ cookies { } }
{ content-type "text/html" }
{ content-charset utf8 }
{ content-charset "UTF-8" }
{ content-encoding utf8 }
}
] [
read-response-test-1 lf>crlf

15
basis/http/http.factor
View File

@ -1,11 +1,11 @@
! Copyright (C) 2003, 2008 Slava Pestov.
! Copyright (C) 2003, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel combinators math namespaces make assocs
sequences splitting sorting sets strings vectors hashtables
quotations arrays byte-arrays math.parser calendar
calendar.format present urls fry
io io.encodings io.encodings.iana io.encodings.binary
io.crlf ascii io.encodings.8-bit.latin1 http.parsers base64 ;
calendar.format present urls fry io io.encodings
io.encodings.iana io.encodings.binary io.encodings.utf8 io.crlf
ascii io.encodings.8-bit.latin1 http.parsers base64 ;
IN: http
CONSTANT: max-redirects 10
@ -170,6 +170,7 @@ header
cookies
content-type
content-charset
content-encoding
body ;
: <response> ( -- response )
@ -179,7 +180,7 @@ body ;
"close" "connection" set-header
now timestamp>http-string "date" set-header
"Factor http.server" "server" set-header
latin1 >>content-charset
utf8 >>content-encoding
V{ } clone >>cookies ;
M: response clone
@ -221,5 +222,5 @@ TUPLE: post-data data params content-type content-encoding ;
: parse-content-type ( content-type -- type encoding )
";" split1
parse-content-type-attributes "charset" swap at name>encoding
[ dup "text/" head? latin1 binary ? ] unless* ;
parse-content-type-attributes "charset" swap at
[ dup "text/" head? "UTF-8" and ] unless* ;

4
basis/http/server/responses/responses.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2008 Slava Pestov.
! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: math.parser http accessors kernel xml.syntax xml.writer
io io.streams.string io.encodings.utf8 ;
@ -8,7 +8,7 @@ IN: http.server.responses
<response>
200 >>code
"Document follows" >>message
utf8 >>content-charset
utf8 >>content-encoding
swap >>content-type
swap >>body ;

18
basis/http/server/server-tests.factor
View File

@ -4,16 +4,26 @@ IN: http.server.tests
[ t ] [ [ \ + first ] [ <500> ] recover response? ] unit-test
[ "text/plain; charset=UTF-8" ] [
[ "text/plain; charset=ASCII" ] [
<response>
"text/plain" >>content-type
utf8 >>content-charset
"ASCII" >>content-charset
unparse-content-type
] unit-test
[ "text/xml" ] [
[ "text/xml; charset=UTF-8" ] [
<response>
"text/xml" >>content-type
binary >>content-charset
unparse-content-type
] unit-test
[ "image/jpeg" ] [
<response>
"image/jpeg" >>content-type
unparse-content-type
] unit-test
[ "application/octet-stream" ] [
<response>
unparse-content-type
] unit-test

10
basis/http/server/server.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2003, 2009 Slava Pestov.
! Copyright (C) 2003, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: kernel accessors sequences arrays namespaces splitting
vocabs.loader destructors assocs debugger continuations
@ -101,8 +101,10 @@ GENERIC: write-full-response ( request response -- )
tri ;
: unparse-content-type ( request -- content-type )
[ content-type>> "application/octet-stream" or ] [ content-charset>> ] bi
dup binary eq? [ drop ] [ encoding>name "; charset=" glue ] if ;
[ content-type>> ] [ content-charset>> ] bi
over "text/" head? [ "UTF-8" or ] when
[ "application/octet-stream" or ] dip
[ "; charset=" glue ] when* ;
: ensure-domain ( cookie -- cookie )
[
@ -133,7 +135,7 @@ M: response write-response ( respose -- )
M: response write-full-response ( request response -- )
dup write-response
swap method>> "HEAD" = [
[ content-charset>> encode-output ]
[ content-encoding>> encode-output ]
[ write-response-body ]
bi
] unless drop ;

13
basis/http/server/static/static.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2004, 2009 Slava Pestov.
! Copyright (C) 2004, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: calendar kernel math math.order math.parser namespaces
parser sequences strings assocs hashtables debugger mime.types
@ -16,11 +16,8 @@ TUPLE: file-responder root hook special allow-listings ;
dup [ rfc822>timestamp ] when ;
: modified-since? ( filename -- ? )
request get modified-since dup [
[ file-info modified>> ] dip after?
] [
2drop t
] if ;
request get modified-since dup
[ [ file-info modified>> ] dip after? ] [ 2drop t ] if ;
: <file-responder> ( root hook -- responder )
file-responder new
@ -30,8 +27,8 @@ TUPLE: file-responder root hook special allow-listings ;
: (serve-static) ( path mime-type -- response )
[
[ binary <file-reader> &dispose ] dip
<content> binary >>content-charset
[ binary <file-reader> &dispose ] dip <content>
binary >>content-encoding
]
[ drop file-info [ size>> ] [ modified>> ] bi ] 2bi
[ "content-length" set-header ]

2
basis/prettyprint/config/config.factor
View File

@ -28,7 +28,7 @@ string-limit? on
2 nesting-limit set
string-limit? on
boa-tuples? on
c-object-pointers? on
c-object-pointers? off
call
] with-scope ; inline