Fix load errors

db4
Slava Pestov 2008-06-02 17:51:06 -05:00
parent 7003b66bab
commit d35f25f334
15 changed files with 43 additions and 54 deletions

View File

@ -1,9 +1,9 @@
! Copyright (c) 2007 Chris Double. ! Copyright (c) 2007 Chris Double.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors quotations assocs kernel splitting USING: accessors quotations assocs kernel splitting
base64 html.elements io combinators http.server base64 html.elements io combinators sequences
furnace.auth.providers furnace.auth.login http http.server.filters http.server.responses http.server
http sequences ; furnace.auth.providers furnace.auth.login ;
IN: furnace.auth.basic IN: furnace.auth.basic
TUPLE: basic-auth < filter-responder realm provider ; TUPLE: basic-auth < filter-responder realm provider ;

View File

@ -1,7 +1,7 @@
IN: html.components.tests IN: html.components.tests
USING: tools.test kernel io.streams.string USING: tools.test kernel io.streams.string
io.streams.null accessors inspector html.streams io.streams.null accessors inspector html.streams
html.components namespaces ; html.elements html.components namespaces ;
[ ] [ blank-values ] unit-test [ ] [ blank-values ] unit-test

View File

@ -1,6 +1,6 @@
USING: assocs html.parser kernel math sequences strings ascii USING: assocs html.parser kernel math sequences strings ascii
arrays shuffle unicode.case namespaces splitting http arrays shuffle unicode.case namespaces splitting http
sequences.lib accessors io combinators http.client ; sequences.lib accessors io combinators http.client urls ;
IN: html.parser.analyzer IN: html.parser.analyzer
TUPLE: link attributes clickable ; TUPLE: link attributes clickable ;

View File

@ -1,7 +1,7 @@
USING: html.templates html.templates.chloe USING: html.templates html.templates.chloe
tools.test io.streams.string kernel sequences ascii boxes tools.test io.streams.string kernel sequences ascii boxes
namespaces xml html.components namespaces xml html.components
splitting unicode.categories ; splitting unicode.categories furnace ;
IN: html.templates.chloe.tests IN: html.templates.chloe.tests
[ f ] [ f parse-query-attr ] unit-test [ f ] [ f parse-query-attr ] unit-test
@ -49,7 +49,7 @@ IN: html.templates.chloe.tests
[ [
[ [
"test2" test-template call-template "test2" test-template call-template
] [ "test3" test-template ] with-boilerplate ] "test3" test-template with-boilerplate
] run-template ] run-template
] unit-test ] unit-test
@ -137,7 +137,7 @@ TUPLE: person first-name last-name ;
[ "<table><tr><td>RBaxter</td><td>Unknown</td></tr><tr><td>Doug</td><td>Coleman</td></tr></table>" ] [ [ "<table><tr><td>RBaxter</td><td>Unknown</td></tr><tr><td>Doug</td><td>Coleman</td></tr></table>" ] [
[ [
"test9" test-template call-template "test8" test-template call-template
] run-template [ blank? not ] filter ] run-template [ blank? not ] filter
] unit-test ] unit-test
@ -145,6 +145,6 @@ TUPLE: person first-name last-name ;
[ "<a name=\"1\">Hello</a>" ] [ [ "<a name=\"1\">Hello</a>" ] [
[ [
"test10" test-template call-template "test9" test-template call-template
] run-template ] run-template
] unit-test ] unit-test

View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: namespaces kernel assocs io.files io.streams.duplex USING: namespaces kernel assocs io.files io.streams.duplex
combinators arrays io.launcher io http.server.static http.server combinators arrays io.launcher io http.server.static http.server
http accessors sequences strings math.parser fry ; http accessors sequences strings math.parser fry urls ;
IN: http.server.cgi IN: http.server.cgi
: post? request get method>> "POST" = ; : post? request get method>> "POST" = ;
@ -28,7 +28,7 @@ IN: http.server.cgi
"" "REMOTE_IDENT" set "" "REMOTE_IDENT" set
request get method>> "REQUEST_METHOD" set request get method>> "REQUEST_METHOD" set
request get query>> assoc>query "QUERY_STRING" set request get url>> query>> assoc>query "QUERY_STRING" set
request get "cookie" header "HTTP_COOKIE" set request get "cookie" header "HTTP_COOKIE" set
request get "user-agent" header "HTTP_USER_AGENT" set request get "user-agent" header "HTTP_USER_AGENT" set

View File

@ -63,7 +63,8 @@ LOG: httpd-hit NOTICE
url>> path>> split-path main-responder get call-responder ; url>> path>> split-path main-responder get call-responder ;
: do-request ( request -- response ) : do-request ( request -- response )
[ '[
,
[ init-request ] [ init-request ]
[ log-request ] [ log-request ]
[ dispatch-request ] tri [ dispatch-request ] tri

View File

@ -1,5 +1,5 @@
USING: math kernel accessors http.server http.server.dispatchers USING: math kernel accessors http.server http.server.dispatchers
furnace.actions furnace.sessions furnace furnace.actions furnace.sessions
html.components html.templates.chloe html.components html.templates.chloe
fry urls ; fry urls ;
IN: webapps.counter IN: webapps.counter

View File

@ -2,9 +2,7 @@
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0"> <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<t:bind t:name="old"> <t:title>Diff: <t:label t:name="title" /></t:title>
<t:title>Diff: <t:label t:name="title" /></t:title>
</t:bind>
<table> <table>
<tr> <tr>
@ -23,11 +21,4 @@
<t:comparison t:name="diff" /> <t:comparison t:name="diff" />
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div>
</t:chloe> </t:chloe>

View File

@ -16,10 +16,4 @@
</t:form> </t:form>
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div>
</t:chloe> </t:chloe>

View File

@ -0,0 +1,14 @@
<?xml version='1.0' ?>
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<t:call-next-template />
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div>
</t:chloe>

View File

@ -53,13 +53,4 @@
<input type="submit" value="View" /> <input type="submit" value="View" />
</form> </form>
<br/>
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div>
</t:chloe> </t:chloe>

View File

@ -10,11 +10,4 @@
<p><em>This revision created on <t:label t:name="date" /> by <t:a t:href="user-edits" t:query="author"><t:label t:name="author" /></t:a>.</em></p> <p><em>This revision created on <t:label t:name="date" /> by <t:a t:href="user-edits" t:query="author"><t:label t:name="author" /></t:a>.</em></p>
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div>
</t:chloe> </t:chloe>

View File

@ -216,16 +216,20 @@ revision "REVISIONS" {
: <wiki> ( -- dispatcher ) : <wiki> ( -- dispatcher )
wiki new-dispatcher wiki new-dispatcher
<main-article-action> "" add-responder <dispatcher>
<view-article-action> "view" add-responder <main-article-action> "" add-responder
<view-revision-action> "revision" add-responder <view-article-action> "view" add-responder
<list-revisions-action> "revisions" add-responder <view-revision-action> "revision" add-responder
<list-revisions-action> "revisions" add-responder
<diff-action> "diff" add-responder
<edit-article-action> { } <protected> "edit" add-responder
<boilerplate>
{ wiki "page-common" } >>template
>>default
<rollback-action> "rollback" add-responder <rollback-action> "rollback" add-responder
<user-edits-action> "user-edits" add-responder <user-edits-action> "user-edits" add-responder
<diff-action> "diff" add-responder
<list-articles-action> "articles" add-responder <list-articles-action> "articles" add-responder
<list-changes-action> "changes" add-responder <list-changes-action> "changes" add-responder
<edit-article-action> { } <protected> "edit" add-responder
<delete-action> { } <protected> "delete" add-responder <delete-action> { } <protected> "delete" add-responder
<boilerplate> <boilerplate>
{ wiki "wiki-common" } >>template ; { wiki "wiki-common" } >>template ;

View File

@ -1,8 +1,8 @@
! Copyright (C) 2007, 2008 Slava Pestov. ! Copyright (C) 2007, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: io io.files io.encodings.utf8 namespaces http.server USING: io io.files io.encodings.utf8 namespaces http.server
http.server.static http xmode.code2html kernel sequences http.server.responses http.server.static http xmode.code2html
accessors fry ; kernel sequences accessors fry ;
IN: xmode.code2html.responder IN: xmode.code2html.responder
: <sources> ( root -- responder ) : <sources> ( root -- responder )

View File

@ -1,7 +1,8 @@
! Copyright (C) 2006 Daniel Ehrenberg, Walton Chan ! Copyright (C) 2006 Daniel Ehrenberg, Walton Chan
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: http.client xml xml.utilities kernel sequences USING: http.client xml xml.utilities kernel sequences
namespaces http math.parser help math.order locals accessors ; namespaces http math.parser help math.order locals
urls accessors ;
IN: yahoo IN: yahoo
TUPLE: result title url summary ; TUPLE: result title url summary ;