Revert "interpolate: allow format directives to be used"

[factor.git] / basis / syndication / syndication.factor

diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor
index 63f40473ce326b27d5299438d476cc8cd781900a..8e6010fbca2a393075b2938646584527d9a655fc 100644 (file)
--- a/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor
@@ -1,17 +1,16 @@
 ! Copyright (C) 2006 Chris Double, Daniel Ehrenberg.
 ! Portions copyright (C) 2008, 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: xml.traversal kernel assocs math.order strings sequences
-xml.data xml.writer io.streams.string combinators xml
-xml.entities.html io.files io http.client namespaces make
-xml.syntax hashtables calendar.format accessors continuations
-urls present byte-arrays fry arrays ;
+! See https://factorcode.org/license.txt for BSD license.
+USING: accessors byte-arrays calendar.format calendar.parser
+combinators combinators.short-circuit continuations http.client
+kernel present sequences strings urls xml xml.data
+xml.entities.html xml.syntax xml.traversal xml.writer ;
 IN: syndication
 
 : any-tag-named ( tag names -- tag-inside )
     [ f ] 2dip [ tag-named nip dup ] with find 2drop ;
 
-TUPLE: feed title url entries hubs ;
+TUPLE: feed title url entries ;
 
 : <feed> ( -- feed ) feed new ;
 
@@ -27,13 +26,16 @@ TUPLE: entry title url description date ;
 : try-parsing-timestamp ( string -- timestamp )
     [ rfc822>timestamp ] [ drop rfc3339>timestamp ] recover ;
 
+: ?children>string ( tag -- str/f )
+    dup [ children>string ] when ; inline
+
 : rss1.0-entry ( tag -- entry )
     <entry> swap {
         [ "title" tag-named children>string >>title ]
         [ "link" tag-named children>string >url >>url ]
         [ "description" tag-named children>string >>description ]
         [
-            f "date" "http://purl.org/dc/elements/1.1/" <name>
+            f "date" "https://purl.org/dc/elements/1.1/" <name>
             tag-named dup [ children>string try-parsing-timestamp ] when
             >>date
         ]
@@ -48,12 +50,12 @@ TUPLE: entry title url description date ;
 
 : rss2.0-entry ( tag -- entry )
     <entry> swap {
-        [ "title" tag-named children>string >>title ]
-        [ { "link" "guid" } any-tag-named children>string >url >>url ]
-        [ { "description" "encoded" } any-tag-named children>string >>description ]
+        [ "title" tag-named ?children>string >>title ]
+        [ { "link" "guid" } any-tag-named ?children>string >url >>url ]
+        [ { "description" "encoded" } any-tag-named ?children>string >>description ]
         [
             { "date" "pubDate" } any-tag-named
-            children>string try-parsing-timestamp >>date
+            ?children>string try-parsing-timestamp >>date
         ]
     } cleave ;
 
@@ -65,19 +67,18 @@ TUPLE: entry title url description date ;
     [ "item" tags-named [ rss2.0-entry ] map set-entries ]
     tri ;
 
-: atom-links ( tag rel -- seq )
-    [ "links" tags-named ] dip
-    dup "alternate" = [ f 2array ] [ 1array ] if
-    '[ "rel" attr _ member? ] filter
-    [ "href" attr >url ] map ;
-
-: atom-link ( tag rel -- url/f )
-    atom-links [ f ] [ first ] if-empty ;
+: atom-link ( tag -- url/f )
+    {
+        [ "link" "alternate" "rel" tag-named-with-attr ]
+        [ "link" "self" "rel" tag-named-with-attr ]
+        [ "link" tag-named ]
+    } 1||
+    [ "href" attr >url ] [ f ] if* ;
 
 : atom1.0-entry ( tag -- entry )
     <entry> swap {
         [ "title" tag-named children>string >>title ]
-        [ "alternate" atom-link >>url ]
+        [ atom-link >>url ]
         [
             { "content" "summary" } any-tag-named
             dup children>> [ string? not ] any?
@@ -85,19 +86,18 @@ TUPLE: entry title url description date ;
             [ children>string ] if >>description
         ]
         [
-            { "published" "updated" "issued" "modified" } 
+            { "published" "updated" "issued" "modified" }
             any-tag-named children>string try-parsing-timestamp
             >>date
         ]
     } cleave ;
 
 : atom1.0 ( xml -- feed )
-    <feed> swap {
-        [ "title" tag-named children>string >>title ]
-        [ "alternate" atom-link >>url ]
-        [ "hub" atom-links >>hubs ]
-        [ "entry" tags-named [ atom1.0-entry ] map set-entries ]
-    } cleave ;
+    <feed> swap
+    [ "title" tag-named children>string >>title ]
+    [ atom-link >>url ]
+    [ "entry" tags-named [ atom1.0-entry ] map set-entries ]
+    tri ;
 
 : xml>feed ( xml -- feed )
     dup main>> {
@@ -113,7 +113,7 @@ M: string parse-feed [ string>xml xml>feed ] with-html-entities ;
 M: byte-array parse-feed [ bytes>xml xml>feed ] with-html-entities ;
 
 : download-feed ( url -- feed )
-    #! Retrieve an news syndication file, return as a feed tuple.
+    ! Retrieve an news syndication file, return as a feed tuple.
     http-get nip parse-feed ;
 
 ! Atom generation
@@ -128,27 +128,20 @@ M: byte-array parse-feed [ bytes>xml xml>feed ] with-html-entities ;
     [XML
         <entry>
             <title type="html"><-></title>
-            <link href=<-> />
+            <link rel="alternate" href=<-> />
             <published><-></published>
             <content type="html"><-></content>
         </entry>
     XML] ;
 
-: hub>xml ( hub -- xml )
-    present [XML <link rel="hub" href=<-> /> XML] ;
-
 : feed>xml ( feed -- xml )
-    {
-        [ title>> ]
-        [ url>> present ]
-        [ hubs>> [ hub>xml ] map ]
-        [ entries>> [ entry>xml ] map ]
-    } cleave
+    [ title>> ]
+    [ url>> present ]
+    [ entries>> [ entry>xml ] map ] tri
     <XML
         <feed xmlns="http://www.w3.org/2005/Atom">
             <title><-></title>
-            <link href=<-> />
-            <->
+            <link rel="alternate" href=<-> />
             <->
         </feed>
     XML> ;