Zend_Feed_Reader: Add test fixtures for feed level category testing

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19165 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Feed/Reader/Extension/Atom/Feed.php

@@ -416,6 +416,47 @@ class Zend_Feed_Reader_Extension_Atom_Feed
 
         return $this->_data['title'];
     }
+    
+    /**
+     * Get all categories
+     *
+     * @return Zend_Feed_Reader_Collection_Category
+     */
+    public function getCategories()
+    {
+        if (array_key_exists('categories', $this->_data)) {
+            return $this->_data['categories'];
+        }
+
+        if ($this->_getAtomType() == Zend_Feed_Reader::TYPE_ATOM_10) {
+            $list = $this->_xpath->query($this->getXpathPrefix() . '//atom:category');
+        } else {
+            /**
+             * Since Atom 0.3 did not support categories, it would have used the
+             * Dublin Core extension. However there is a small possibility Atom 0.3
+             * may have been retrofittied to use Atom 1.0 instead.
+             */
+            $this->_xpath->registerNamespace('atom10', Zend_Feed_Reader::NAMESPACE_ATOM_10);
+            $list = $this->_xpath->query($this->getXpathPrefix() . '//atom10:category');
+        }
+
+        if ($list->length) {
+            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
+            foreach ($list as $category) {
+                $categoryCollection[] = array(
+                    'term' => $category->getAttribute('term'),
+                    'scheme' => $category->getAttribute('scheme'),
+                    'label' => html_entity_decode($category->getAttribute('label'))
+                );
+            }
+        } else {
+            return new Zend_Feed_Reader_Collection_Category;
+        }
+
+        $this->_data['categories'] = $categoryCollection;
+
+        return $this->_data['categories'];
+    }
 
     /**
      * Get an author entry in RSS format

library/Zend/Feed/Reader/Extension/DublinCore/Feed.php

@@ -251,6 +251,40 @@ class Zend_Feed_Reader_Extension_DublinCore_Feed
 
         return $this->_data['date'];
     }
+    
+    /**
+     * Get categories (subjects under DC)
+     *
+     * @return Zend_Feed_Reader_Collection_Category
+     */
+    public function getCategories()
+    {
+        if (array_key_exists('categories', $this->_data)) {
+            return $this->_data['categories'];
+        }
+        
+        $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:subject');
+
+        if (!$list->length) {
+            $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:subject');
+        }
+        
+        if ($list->length) {
+            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
+            foreach ($list as $category) {
+                $categoryCollection[] = array(
+                    'term' => $category->nodeValue,
+                    'scheme' => null,
+                    'label' => $category->nodeValue,
+                );
+            }
+        } else {
+            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
+        }
+        
+        $this->_data['categories'] = $categoryCollection;
+        return $this->_data['categories'];  
+    }
 
     /**
      * Register the default namespaces for the current feed format

library/Zend/Feed/Reader/Feed/Atom.php

@@ -49,6 +49,8 @@ class Zend_Feed_Reader_Feed_Atom extends Zend_Feed_Reader_FeedAbstract
         parent::__construct($dom, $type);
         $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Feed');
         $this->_extensions['Atom_Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
+        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed');
+        $this->_extensions['DublinCore_Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
         foreach ($this->_extensions as $extension) {
             $extension->setXpathPrefix('/atom:feed');
         }
@@ -328,6 +330,28 @@ class Zend_Feed_Reader_Feed_Atom extends Zend_Feed_Reader_FeedAbstract
 
         return $this->_data['hubs'];
     }
+    
+    /**
+     * Get all categories
+     *
+     * @return Zend_Feed_Reader_Collection_Category
+     */
+    public function getCategories()
+    {
+        if (array_key_exists('categories', $this->_data)) {
+            return $this->_data['categories'];
+        }
+
+        $categoryCollection = $this->getExtension('Atom')->getCategories();
+        
+        if (count($categoryCollection) == 0) {
+            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
+        }
+
+        $this->_data['categories'] = $categoryCollection;
+
+        return $this->_data['categories'];
+    }
 
     /**
      * Read all entries to the internal entries array

library/Zend/Feed/Reader/Feed/Rss.php

@@ -515,6 +515,46 @@ class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_FeedAbstract
 
         return $this->_data['hubs'];
     }
+    
+    /**
+     * Get all categories
+     *
+     * @return Zend_Feed_Reader_Collection_Category
+     */
+    public function getCategories()
+    {
+        if (array_key_exists('categories', $this->_data)) {
+            return $this->_data['categories'];
+        }
+
+        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
+            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
+            $list = $this->_xpath->query('/rss/channel//category');
+        } else {
+            $list = $this->_xpath->query('/rdf:RDF/rss:channel//rss:category');
+        }
+
+        if ($list->length) {
+            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
+            foreach ($list as $category) {
+                $categoryCollection[] = array(
+                    'term' => $category->nodeValue,
+                    'scheme' => $category->getAttribute('domain'),
+                    'label' => $category->nodeValue,
+                );
+            }
+        } else {
+            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
+        }
+        
+        if (count($categoryCollection) == 0) {
+            $categoryCollection = $this->getExtension('Atom')->getCategories();
+        }
+
+        $this->_data['categories'] = $categoryCollection;
+
+        return $this->_data['categories'];
+    }
 
     /**
      * Read all entries to the internal entries array

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/atom03.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#"
+    xmlns:atom10="http://www.w3.org/2005/Atom">
+    <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+    <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+    <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    <entry>
+    
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/atom10.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+    <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+    <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    <entry>
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/dc10/atom03.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.0/">
+    <dc:subject><![CDATA[topic1]]></dc:subject>
+    <dc:subject><![CDATA[topic2]]></dc:subject>
+    <entry>
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/dc11/atom03.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <dc:subject><![CDATA[topic1]]></dc:subject>
+    <dc:subject><![CDATA[topic2]]></dc:subject>
+    <entry>
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/none/atom03.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+    <entry>
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Atom/category/plain/none/atom10.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <entry>
+    </entry>
+</feed>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss090.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:atom10="http://www.w3.org/2005/Atom"
+    xmlns="http://my.netscape.com/rdf/simple/0.9/">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss091.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.91" xmlns:atom10="http://www.w3.org/2005/Atom">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss092.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.92" xmlns:atom10="http://www.w3.org/2005/Atom">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss093.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.93" xmlns:atom10="http://www.w3.org/2005/Atom">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss094.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.94" xmlns:atom10="http://www.w3.org/2005/Atom">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/atom10/rss10.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:atom10="http://www.w3.org/2005/Atom"
+    xmlns="http://purl.org/rss/1.0/">
+    <channel>
+        <atom10:category scheme="http://example.com/schema1" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema2" term="topic1" label="topic1"/>
+        <atom10:category scheme="http://example.com/schema1" term="cat_dog" label="Cat &amp; Dog"/>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss090.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.0/"
+    xmlns="http://my.netscape.com/rdf/simple/0.9/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss091.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.91" xmlns:dc="http://purl.org/dc/elements/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss092.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.92" xmlns:dc="http://purl.org/dc/elements/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss093.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.93" xmlns:dc="http://purl.org/dc/elements/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss094.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.94" xmlns:dc="http://purl.org/dc/elements/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc10/rss10.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.0/"
+    xmlns="http://purl.org/rss/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss090.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns="http://my.netscape.com/rdf/simple/0.9/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss091.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.91" xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss092.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.92" xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss093.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.93" xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss094.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.94" xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/dc11/rss10.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns="http://purl.org/rss/1.0/">
+    <channel>
+        <dc:subject><![CDATA[topic1]]></dc:subject>
+        <dc:subject><![CDATA[topic2]]></dc:subject>
+        <item>
+        </item>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss090.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://my.netscape.com/rdf/simple/0.9/">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss091.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.91">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss092.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.92">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss093.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.93">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss094.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="0.94">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss10.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://purl.org/rss/1.0/">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rdf:RDF>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/none/rss20.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="2.0">
+    <channel>
+        <item>
+        </item>
+    </channel>
+</rss>

tests/Zend/Feed/Reader/Feed/_files/Rss/category/plain/rss20.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="2.0">
+    <channel>
+        <category domain="http://example.com/schema1">topic1</category>
+        <category domain="http://example.com/schema2">topic1</category>
+        <category domain="http://example.com/schema1">topic2</category>
+        <item>
+        </item>
+    </channel>
+</rss>