Author: as
Date: Tue Nov 13 10:58:53 2007
New Revision: 6718
Log:
- Added support for 'subtitle' ATOM feed element.
- 'subtitle' is accessed as 'description' through ezcFeed.
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.in
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.out
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.in
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.in
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.out
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.in
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.out
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.in
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.out
Modified:
trunk/Feed/src/feed.php
trunk/Feed/src/processors/atom.php
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_empty.in
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_html.in
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_no_type.in
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_text.in
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_xhtml.in
Modified: trunk/Feed/src/feed.php
==============================================================================
--- trunk/Feed/src/feed.php [iso-8859-1] (original)
+++ trunk/Feed/src/feed.php [iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -173,10 +173,9 @@
case 'title': // required in RSS1, RSS2, ATOM
case 'category':
case 'categories':
- case 'subtitle': // ATOM only
case 'link': // required in RSS2, rdf:about AND link in RSS1
case 'links': // required in RSS2, rdf:about AND link in RSS1
- case 'description': // required in RSS1, RSS2
+ case 'description': // required in RSS1, RSS2, subtitle in ATOM
case 'language':
case 'copyright': // rights in ATOM
case 'author': // managingEditor in RSS2, required in ATOM
@@ -218,10 +217,9 @@
case 'title': // required in RSS1, RSS2, ATOM
case 'category':
case 'categories':
- case 'subtitle': // ATOM only
case 'link': // required in RSS2, rdf:about AND link in RSS1
case 'links': // required in RSS2, rdf:about AND link in RSS1
- case 'description': // required in RSS1, RSS2
+ case 'description': // required in RSS1, RSS2, subtitle in ATOM
case 'language':
case 'copyright': // rights in ATOM
case 'author': // managingEditor in RSS2, required in ATOM
Modified: trunk/Feed/src/processors/atom.php
==============================================================================
--- trunk/Feed/src/processors/atom.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/atom.php [iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -298,6 +298,7 @@
{
case 'title':
case 'copyright':
+ case 'description':
$type = ezcFeedTools::getAttribute( $channelChild,
'type' );
switch ( $type )
Modified:
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_empty.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_empty.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_empty.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -3,5 +3,5 @@
'title' => array( array( '#' => 'Feed title',
'type' => '' ) ),
'updated' => 'Feed updated',
- 'subtitle' => array( array() ) );
+ 'description' => array( array() ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_html.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_html.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_html.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -2,6 +2,6 @@
return array( 'id' => 'Feed id',
'title' => array( array( '#' => 'Feed title' ) ),
'updated' => 'Feed updated',
- 'subtitle' => array( array( '#' => 'Feed subtitle',
- 'type' => 'html' ) ) );
+ 'description' => array( array( '#' => 'Feed subtitle',
+ 'type' => 'html' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_no_type.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_no_type.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_no_type.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -3,5 +3,5 @@
'title' => array( array( '#' => 'Feed title',
'type' => '' ) ),
'updated' => 'Feed updated',
- 'subtitle' => array( array( '#' => 'Feed subtitle' ) ) );
+ 'description' => array( array( '#' => 'Feed subtitle' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_text.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_text.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_text.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -2,6 +2,6 @@
return array( 'id' => 'Feed id',
'title' => array( array( '#' => 'Feed title' ) ),
'updated' => 'Feed updated',
- 'subtitle' => array( array( '#' => 'Feed subtitle',
- 'type' => 'text' ) ) );
+ 'description' => array( array( '#' => 'Feed subtitle',
+ 'type' => 'text' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_xhtml.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_xhtml.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/optional/subtitle/subtitle_xhtml.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -2,6 +2,6 @@
return array( 'id' => 'Feed id',
'title' => array( array( '#' => 'Feed title' ) ),
'updated' => 'Feed updated',
- 'subtitle' => array( array( '#' => 'Feed subtitle',
- 'type' => 'xhtml' ) ) );
+ 'description' => array( array( '#' => 'Feed subtitle',
+ 'type' => 'xhtml' ) ) );
?>
Added: trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.in (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <subtitle>Feed subtitle</subtitle>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.out
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle.out
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,12 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->description = 'Feed subtitle';
+
+return $feed;
+?>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.in
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <subtitle/>
+</feed>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,12 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->description = null;
+
+return $feed;
+?>
Added: trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.in
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <subtitle type="html">Feed subtitle</subtitle>
+</feed>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.out
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_html.out
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,13 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->description = 'Feed subtitle';
+$feed->description->type = 'html';
+
+return $feed;
+?>
Added: trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.in
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <subtitle type="text">Feed subtitle</subtitle>
+</feed>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.out
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_text.out
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,13 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->description = 'Feed subtitle';
+$feed->description->type = 'text';
+
+return $feed;
+?>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.in
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.in
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <subtitle type="xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml";>
+ <xhtml:div>Feed subtitle</xhtml:div>
+ </subtitle>
+</feed>
Added:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.out
(added)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_xhtml.out
[iso-8859-1] Tue Nov 13 10:58:53 2007
@@ -1,0 +1,13 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->description = 'Feed subtitle';
+$feed->description->type = 'xhtml';
+
+return $feed;
+?>
--
svn-components mailing list
[EMAIL PROTECTED]
http://lists.ez.no/mailman/listinfo/svn-components
