Move templates into html directory. Add directory for rss templates. …

…Get RSS feed of latest packages working.
gauthierm · Mar 30, 2010 · ff75a77 · ff75a77
1 parent dd85bec
commit ff75a77
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 10 deletions.
diff --git a/package.xml b/package.xml
@@ -29,8 +29,8 @@ a fully customized PEAR channel.
   <email>saltybeagle@php.net</email>
   <active>yes</active>
  </lead>
- <date>2009-12-20</date>
- <time>12:21:21</time>
+ <date>2010-03-29</date>
+ <time>16:13:46</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -61,6 +61,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
      <file role="php" name="Package.php"/>
      <file role="php" name="PackageList.php"/>
      <file role="php" name="PackageRelease.php"/>
+     <file role="php" name="Search.php"/>
      <file role="php" name="Support.php"/>
      <file role="php" name="TemplateMapper.php"/>
      <file role="php" name="UnregisteredViewException.php"/>
@@ -85,6 +86,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
      <file role="www" name="Package.tpl.php"/>
      <file role="www" name="PackageList.tpl.php"/>
      <file role="www" name="PackageRelease.tpl.php"/>
+     <file role="www" name="Search.tpl.php"/>
      <file role="www" name="Support.tpl.php"/>
      <file role="www" name="UnregisteredViewException.tpl.php"/>
     </dir>

diff --git a/package_compatible.xml b/package_compatible.xml
@@ -29,8 +29,8 @@ a fully customized PEAR channel.
   <email>saltybeagle@php.net</email>
   <active>yes</active>
  </lead>
- <date>2009-12-20</date>
- <time>12:21:21</time>
+ <date>2010-03-29</date>
+ <time>16:13:46</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -53,6 +53,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
   <dir name="/">
    <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/UnregisteredViewException.tpl.php"/>
    <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Support.tpl.php"/>
+   <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Search.tpl.php"/>
    <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/PackageRelease.tpl.php"/>
    <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/PackageList.tpl.php"/>
    <file role="www" name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Package.tpl.php"/>
@@ -72,6 +73,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
    <file role="php" name="php/pear2/SimpleChannelFrontend/UnregisteredViewException.php"/>
    <file role="php" name="php/pear2/SimpleChannelFrontend/TemplateMapper.php"/>
    <file role="php" name="php/pear2/SimpleChannelFrontend/Support.php"/>
+   <file role="php" name="php/pear2/SimpleChannelFrontend/Search.php"/>
    <file role="php" name="php/pear2/SimpleChannelFrontend/PackageRelease.php"/>
    <file role="php" name="php/pear2/SimpleChannelFrontend/PackageList.php"/>
    <file role="php" name="php/pear2/SimpleChannelFrontend/Package.php"/>
@@ -102,6 +104,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
    <install name="php/pear2/SimpleChannelFrontend/Package.php" as="pear2/SimpleChannelFrontend/Package.php"/>
    <install name="php/pear2/SimpleChannelFrontend/PackageList.php" as="pear2/SimpleChannelFrontend/PackageList.php"/>
    <install name="php/pear2/SimpleChannelFrontend/PackageRelease.php" as="pear2/SimpleChannelFrontend/PackageRelease.php"/>
+   <install name="php/pear2/SimpleChannelFrontend/Search.php" as="pear2/SimpleChannelFrontend/Search.php"/>
    <install name="php/pear2/SimpleChannelFrontend/Support.php" as="pear2/SimpleChannelFrontend/Support.php"/>
    <install name="php/pear2/SimpleChannelFrontend/TemplateMapper.php" as="pear2/SimpleChannelFrontend/TemplateMapper.php"/>
    <install name="php/pear2/SimpleChannelFrontend/UnregisteredViewException.php" as="pear2/SimpleChannelFrontend/UnregisteredViewException.php"/>
@@ -121,6 +124,7 @@ Package PEAR2_SimpleChannelFrontend API release notes for version 0.1.0.</notes>
    <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Package.tpl.php" as="pear2.php.net/templates/templates/Package.tpl.php"/>
    <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/PackageList.tpl.php" as="pear2.php.net/templates/templates/PackageList.tpl.php"/>
    <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/PackageRelease.tpl.php" as="pear2.php.net/templates/templates/PackageRelease.tpl.php"/>
+   <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Search.tpl.php" as="pear2.php.net/templates/templates/Search.tpl.php"/>
    <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/Support.tpl.php" as="pear2.php.net/templates/templates/Support.tpl.php"/>
    <install name="www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/templates/UnregisteredViewException.tpl.php" as="pear2.php.net/templates/templates/UnregisteredViewException.tpl.php"/>
   </filelist>

diff --git a/src/SimpleChannelFrontend/Main.php b/src/SimpleChannelFrontend/Main.php
@@ -36,7 +36,8 @@ class Main
 
     public $page_content;
 
-    protected $options = array('view' => 'news');
+    public $options = array('view'   => 'news',
+                               'format' => 'html');
 
     protected static $view_map = array('news'       => 'pear2\SimpleChannelFrontend\News',
                                        'packages'   => 'pear2\SimpleChannelFrontend\PackageList',
@@ -59,13 +60,27 @@ function __construct(\pear2\Pyrus\ChannelFileInterface $channel, $options = arra
     {
         static::setChannel($channel);
         $this->options = array_merge($this->options, $options);
+        $this->preRun();
         try {
             $this->run();
         } catch(Exception $e) {
             $this->page_content = $e;
         }
     }
-
+
+    function preRun()
+    {
+        switch ($this->options['format']) {
+        case 'rss':
+            header('Content-type:text/xml');
+            break;
+        case 'html':
+        default:
+            header('Content-Type:text/html; charset=UTF-8');
+            break;
+        }
+    }
+
     /**
      * Set the channel file for this frontend.
      * 

diff --git a/src/SimpleChannelFrontend/TemplateMapper.php b/src/SimpleChannelFrontend/TemplateMapper.php
@@ -10,10 +10,10 @@ function __construct()
             // running from svn, or extracted from archive
             if (strpos(__FILE__, 'trunk/src/SimpleChannelFrontend')) {
                 // running from svn
-                self::$templatePath = __DIR__ . '/../../www/templates/';
+                self::$templatePath = __DIR__ . '/../../www/templates/html';
             } else {
                 // running from extracted archive
-                self::$templatePath = __DIR__ . '/../../../www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/';
+                self::$templatePath = __DIR__ . '/../../../www/PEAR2_SimpleChannelFrontend/pear2.php.net/templates/html';
             }
         }
         static::$classname_replacement = 'pear2\\SimpleChannelFrontend\\';

diff --git a/www/index.php b/www/index.php
@@ -27,7 +27,15 @@
 
 $savant = new pear2\Templates\Savant\Main();
 $savant->setClassToTemplateMapper(new pear2\SimpleChannelFrontend\TemplateMapper);
-$savant->setTemplatePath(array(__DIR__ . '/templates'));
+$savant->setTemplatePath(array(__DIR__ . '/templates/html'));
+
+switch($frontend->options['format']) {
+case 'rss':
+    $savant->addTemplatePath(__DIR__.'/templates/'.$frontend->options['format']);
+    break;
+}
+
+
 $savant->setEscape('htmlspecialchars');
 $savant->addFilters(array($frontend, 'postRender'));
 echo $savant->render($frontend);

diff --git a/www/templates/Categories.tpl.php → www/templates/html/Categories.tpl.php b/www/templates/Categories.tpl.php → www/templates/html/Categories.tpl.php
diff --git a/www/templates/InstallInstructions.tpl.php → ...emplates/html/InstallInstructions.tpl.php b/www/templates/InstallInstructions.tpl.php → ...emplates/html/InstallInstructions.tpl.php
diff --git a/www/templates/LatestReleases.tpl.php → www/templates/html/LatestReleases.tpl.php b/www/templates/LatestReleases.tpl.php → www/templates/html/LatestReleases.tpl.php
diff --git a/www/templates/Main.tpl.php → www/templates/html/Main.tpl.php b/www/templates/Main.tpl.php → www/templates/html/Main.tpl.php
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <link rel="search" title="search packages" type="application/opensearchdescription+xml" href="?view=searchdefinition">
-    <link rel="alternate" title="My Channel Latest Releases" type="application/atom+xml" href="?view=latest" />
+    <link rel="alternate" title="My Channel Latest Releases" type="application/rss+xml" href="?view=latest&amp;format=rss" />
     <link rel="stylesheet" href="<?php echo pear2\SimpleChannelFrontend\Main::getURL(); ?>css/all.css" />
     <title><?php echo $context->page_title; ?></title>
   </head>

diff --git a/www/templates/News.tpl.php → www/templates/html/News.tpl.php b/www/templates/News.tpl.php → www/templates/html/News.tpl.php
diff --git a/www/templates/Package.tpl.php → www/templates/html/Package.tpl.php b/www/templates/Package.tpl.php → www/templates/html/Package.tpl.php
diff --git a/www/templates/PackageList.tpl.php → www/templates/html/PackageList.tpl.php b/www/templates/PackageList.tpl.php → www/templates/html/PackageList.tpl.php
diff --git a/www/templates/PackageRelease.tpl.php → www/templates/html/PackageRelease.tpl.php b/www/templates/PackageRelease.tpl.php → www/templates/html/PackageRelease.tpl.php
diff --git a/www/templates/Search.tpl.php → www/templates/html/Search.tpl.php b/www/templates/Search.tpl.php → www/templates/html/Search.tpl.php
diff --git a/www/templates/Support.tpl.php → www/templates/html/Support.tpl.php b/www/templates/Support.tpl.php → www/templates/html/Support.tpl.php
diff --git a/...mplates/UnregisteredViewException.tpl.php → ...es/html/UnregisteredViewException.tpl.php b/...mplates/UnregisteredViewException.tpl.php → ...es/html/UnregisteredViewException.tpl.php
diff --git a/www/templates/rss/LatestReleases.tpl.php b/www/templates/rss/LatestReleases.tpl.php
@@ -0,0 +1,10 @@
+<?php foreach($context as $package): ?>
+<item rdf:about="<?php echo pear2\SimpleChannelFrontend\Main::getURL().$package->name.'-'.$package->version['release']; ?>">
+ <title><?php echo $package->name.' '.$package->version['release']; ?></title>
+ <link><?php echo pear2\SimpleChannelFrontend\Main::getURL().$package->name.'-'.$package->version['release']; ?></link>
+ <content:encoded>
+ <?php echo htmlspecialchars(nl2br($package->notes)); ?>
+ </content:encoded>
+ <dc:date><?php echo date('c', strtotime($package->date.' '.$package->time)); ?></dc:date>
+</item>
+<?php endforeach; ?>
diff --git a/www/templates/rss/Main.tpl.php b/www/templates/rss/Main.tpl.php
@@ -0,0 +1,17 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL; ?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://purl.org/rss/1.0/"
+    xmlns:content="http://purl.org/rss/1.0/modules/content/"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+    <channel rdf:about="<?php echo pear2\SimpleChannelFrontend\Main::getURL(); ?>">
+        <link><?php echo pear2\SimpleChannelFrontend\Main::getURL(); ?></link>
+        <dc:creator>pear-webmaster@lists.php.net</dc:creator>
+        <dc:publisher>pear-webmaster@lists.php.net</dc:publisher>
+        <dc:language>en-us</dc:language>
+        <title><?php echo pear2\SimpleChannelFrontend\Main::$channel->summary; ?>: Latest releases</title>
+        <description>The latest releases for <?php echo pear2\SimpleChannelFrontend\Main::$channel->summary; ?>.</description>
+    </channel>
+    <?php echo $savant->render($context->page_content); ?>
+</rdf:RDF>