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

db4
Bruno Deferrari 2008-09-05 02:17:57 -03:00
commit 174826e18f
366 changed files with 276 additions and 108 deletions

View File

@ -88,6 +88,8 @@ IN: farkup.tests
[ ] [ "[{}]" convert-farkup drop ] unit-test
[ "<pre>hello\n</pre>" ] [ "[{hello}]" convert-farkup ] unit-test
[
"<p>Feature comparison:\n<table><tr><td>a</td><td>Factor</td><td>Java</td><td>Lisp</td></tr><tr><td>Coolness</td><td>Yes</td><td>No</td><td>No</td></tr><tr><td>Badass</td><td>Yes</td><td>No</td><td>No</td></tr><tr><td>Enterprise</td><td>Yes</td><td>Yes</td><td>No</td></tr><tr><td>Kosher</td><td>Yes</td><td>No</td><td>Yes</td></tr></table></p>"
] [ "Feature comparison:\n|a|Factor|Java|Lisp|\n|Coolness|Yes|No|No|\n|Badass|Yes|No|No|\n|Enterprise|Yes|Yes|No|\n|Kosher|Yes|No|Yes|\n" convert-farkup ] unit-test

View File

@ -1,7 +1,7 @@
! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: kernel accessors math.intervals
calendar alarms fry
system calendar alarms fry
random db db.tuples db.types
http.server.filters ;
IN: furnace.cache
@ -14,7 +14,7 @@ TUPLE: server-state id expires ;
server-state f
{
{ "id" "ID" +random-id+ system-random-generator }
{ "expires" "EXPIRES" TIMESTAMP +not-null+ }
{ "expires" "EXPIRES" BIG-INTEGER +not-null+ }
} define-persistent
: get-state ( id class -- state )
@ -22,7 +22,7 @@ server-state f
: expire-state ( class -- )
new
-1.0/0.0 now [a,b] >>expires
-1.0/0.0 millis [a,b] >>expires
delete-tuples ;
TUPLE: server-state-manager < filter-responder timeout ;
@ -33,4 +33,4 @@ TUPLE: server-state-manager < filter-responder timeout ;
20 minutes >>timeout ; inline
: touch-state ( state manager -- )
timeout>> hence >>expires drop ;
timeout>> hence timestamp>millis >>expires drop ;

View File

@ -1,6 +1,7 @@
USING: accessors kernel
http.server http.server.filters http.server.responses
furnace ;
! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel http.server http.server.filters
http.server.responses furnace ;
IN: furnace.referrer
TUPLE: referrer-check < filter-responder quot ;

View File

@ -26,7 +26,7 @@ IN: html.templates.chloe.tests
"?>" split1 nip ; inline
: test-template ( name -- template )
"resource:extra/html/templates/chloe/test/"
"resource:basis/html/templates/chloe/test/"
prepend <chloe> ;
[ "Hello world" ] [

View File

@ -4,7 +4,7 @@ tools.test sequences parser ;
IN: html.templates.fhtml.tests
: test-template ( path -- ? )
"resource:extra/html/templates/fhtml/test/"
"resource:basis/html/templates/fhtml/test/"
prepend
[
".fhtml" append <fhtml> [ call-template ] with-string-writer

Some files were not shown because too many files have changed in this diff Show More