Reverting RSS changes; fixing unit tests

db4
Daniel Ehrenberg 2008-01-01 22:30:22 -05:00
parent d0046482cc
commit 81026a92bf
2 changed files with 19 additions and 15 deletions

View File

@ -10,7 +10,7 @@ USING: rss io kernel io.files tools.test ;
f f
"Meerkat" "Meerkat"
"http://meerkat.oreillynet.com" "http://meerkat.oreillynet.com"
V{ {
T{ T{
entry entry
f f
@ -26,7 +26,7 @@ USING: rss io kernel io.files tools.test ;
f f
"dive into mark" "dive into mark"
"http://example.org/" "http://example.org/"
V{ {
T{ T{
entry entry
f f

View File

@ -85,22 +85,26 @@ C: <entry> entry
] if ; ] if ;
! Atom generation ! Atom generation
: simple-tag, ( content name -- )
[ , ] tag, ;
: simple-tag*, ( content name attrs -- )
[ , ] tag*, ;
: entry, ( entry -- ) : entry, ( entry -- )
<< entry >> [ "entry" [
<< title >> [ dup entry-title , ] dup entry-title "title" { { "type" "html" } } simple-tag*,
<< link [ dup entry-link ] == href // >> "link" over entry-link "href" associate contained*,
<< published >> [ dup entry-pub-date , ] dup entry-pub-date "published" simple-tag,
<< content >> [ entry-description , ] entry-description [ "content" { { "type" "html" } } simple-tag*, ] when*
] ; ] tag, ;
: feed>xml ( feed -- xml ) : feed>xml ( feed -- xml )
<XML "feed" { { "xmlns" "http://www.w3.org/2005/Atom" } } [
<< feed [ "http://www.w3.org/2005/Atom" ] == xmlns >> [ dup feed-title "title" simple-tag,
<< title >> [ dup feed-title , ] "link" over feed-link "href" associate contained*,
<< link [ dup feed-link ] == href // >> feed-entries [ entry, ] each
feed-entries [ entry, ] each ] make-xml* ;
]
XML> ;
: write-feed ( feed -- ) : write-feed ( feed -- )
feed>xml write-xml ; feed>xml write-xml ;