♻️ cleaner separation between rss/atom/json, thanks @dewey

related #60

Author: bnomei

README.md

@@ -66,7 +66,7 @@ If you use these defaults you need to provide the fields `date (type: date)` and
     'datefield' => 'date',
     'textfield' => 'text',
     'modified' => time(),
-    'snippet' => 'feed/rss', // 'feed/json'
+    'snippet' => 'feed/rss', // 'feed/json', 'feed/atom'
     'dateformat' => 'r',
     'mime' => null,
     'sort' => true,

classes/Feed.php

@@ -124,6 +124,7 @@ public function optionsFromDefault(?Pages $pages = null, $options = []): array
             'link' => site()->url(),
             'urlfield' => 'url',
             'titlefield' => 'title',
+            'idfield' => 'id',
             'datefield' => 'date',
             'textfield' => 'text',
             'modified' => time(),
@@ -181,6 +182,8 @@ public function response(): Response
             return new Response($this->string, $mime);
         } elseif ($snippet === 'feed/sitemap' && Feed::isXml($this->string)) {
             return new Response($this->string, 'xml');
+        } elseif ($snippet === 'feed/atom' || Feed::isXml($this->string)) {
+            return new Response($this->string, 'xml');
         } elseif ($snippet === 'feed/json' || Feed::isJson($this->string)) {
             return new Response($this->string, 'json');
         } elseif ($snippet === 'feed/rss' || Feed::isXml($this->string)) {

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-feed",
   "type": "kirby-plugin",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Generate a RSS/JSON/Sitemap-Feed from a Pages-Collection",
   "license": "MIT",
   "authors": [

index.php

@@ -15,6 +15,7 @@
         'expires' => (60*24*7), // minutes
     ],
     'snippets' => [
+        'feed/atom' => __DIR__ . '/snippets/feed/atom.php',
         'feed/rss' => __DIR__ . '/snippets/feed/rss.php',
         'feed/json' => __DIR__ . '/snippets/feed/json.php',
         'feed/sitemap' => __DIR__ . '/snippets/feed/sitemap.php',

snippets/feed/atom.php

@@ -0,0 +1,16 @@
+<?php
+echo '<?xml version="1.0" encoding="utf-8"?>'; ?><feed xmlns="http://www.w3.org/2005/Atom">
+    <title><?= \Kirby\Toolkit\Xml::encode($title) ?></title>
+    <link href="<?= $link ?>"/>
+    <updated><?= date('r', $modified) ?></updated>
+    <id><?= str_replace(site()->url(),'', $link) ?></id>
+    <?php foreach ($items as $item): ?>
+    <entry>
+        <title><?= \Kirby\Toolkit\Xml::encode($item->{$titlefield}()) ?></title>
+        <link href="<?= $item->{$urlfield}() ?>"/>
+        <id><?= $item->{$idfield}() ?></id>
+        <updated><?= $datefield === 'modified' ? $item->modified('r', 'date') : date('r', $item->{$datefield}()->toTimestamp()) ?></updated>
+        <summary><![CDATA[<?= $item->{$textfield}()->kirbytext() ?>]]><</summary>
+    </entry>
+    <?php endforeach; ?>
+</feed>

snippets/feed/rss.php

@@ -1,11 +1,10 @@
 <?php
 echo '<?xml version="1.0" encoding="utf-8"?>';
-?><rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+?><rss version="2.0">
   <channel>
     <title><?= \Kirby\Toolkit\Xml::encode($title) ?></title>
     <link><?= \Kirby\Toolkit\Xml::encode($link) ?></link>
     <lastBuildDate><?= $modified ?></lastBuildDate>
-    <atom:link href="<?= \Kirby\Toolkit\Xml::encode($feedurl) ?>" rel="self" type="application/rss+xml" />
     <?php if ($description && is_string($description) && strlen(trim($description)) > 0): ?>
     <description><?= \Kirby\Toolkit\Xml::encode($description) ?></description>
     <?php endif; ?>

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby3-feed',
-        'pretty_version' => '1.6.1',
-        'version' => '1.6.1.0',
+        'pretty_version' => '1.7.0',
+        'version' => '1.7.0.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby3-feed' => array(
-            'pretty_version' => '1.6.1',
-            'version' => '1.6.1.0',
+            'pretty_version' => '1.7.0',
+            'version' => '1.7.0.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',