Improved atom feeds and now using jekyll-feed

Author: biomadeira

_layouts/atom.xml

@@ -3,15 +3,39 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
    {% if page.grouptype == 'category' %}
-      <title>{{ site.short_url }} - Category: {{ page.category }}</title>
+      <title>{{ site.url }}{{ site.baseurl }} - Category: {{ page.category }}</title>
    {% else %}
-      <title>{{ site.short_url }}</title>
+      <title>{{ site.url }}{{ site.baseurl }}</title>
    {% endif %}
-   <link>{{ site.url }}</link>
+   <link>{{ site.url }}{{ site.baseurl }}</link>
    <description>{{ site.description }}</description>
    <language>{{ site.language }}</language>
-   <managingEditor> {{ site.author[1].username }}</managingEditor>
+   {% if page.author %}
+      {% for author in site.data.authors %}
+            {% if author[1].username == page.author %}
+               {% assign author_name = author[1].name %}
+               {% assign author_username = author[1].username %}
+                  <managingEditor>{{ author_name }}</managingEditor>
+            {% endif %}
+      {% endfor %}
+   {% endif %}
+   <title>
+   <![CDATA[ {% if author_name %}{{ author_name }} - {% endif %}{{ site.title }} ]]>
+   </title>
+   <description>
+   <![CDATA[ {{ site.description }} ]]>
+   </description>
+   <link>{{ site.url }}{{ site.baseurl }}</link>
+   <image>
+   <url>{{ site.url }}{{ site.baseurl }}{{ site.favicon }}</url>
+   <title>{% if author_name %}{{ author_name }} - {% endif %}{{ site.title }}</title>
+   <link>{{ site.url }}{{ site.baseurl }}</link>
+   </image>
+   <generator>Jekyll 3.6.2</generator>
+   <lastBuildDate>{{ post.date | date_to_xmlschema }}</lastBuildDate>
+   <atom:link href="{{ site.url }}{{ site.baseurl }}{% if author_name %}author/{{ author_username }}/{% endif %}rss.xml" rel="self" type="application/rss+xml"/>
+   <ttl>60</ttl>
    <atom:link href="rss" rel="self" type="application/rss+xml" />
-   {{content}}
+   {{ content }}
 </channel>
 </rss>

_layouts/author.xml

@@ -5,10 +5,14 @@ title: nil
 {% for post in page.posts %}
 	<item>
 	  <title>{{ post.title }}</title>
-	  <link>{{ site.baseurl }}{{ post.url }}</link>
-	  <author>{{ site.author[1].username }}</author>
+	  <link>{{ site.url }}{{ site.baseurl }}{{ post.url | remove: '/' }}</link>
+		{% for author in site.data.authors %}
+				{% if author[1].username == page.author %}
+						<author>{{ author[1].name }}</author>
+				{% endif %}
+		{% endfor %}
 	  <pubDate>{{ post.date | date_to_xmlschema }}</pubDate>
-	  <guid>{{ site.baseurl }}{{ post.url }}</guid>
+	  <guid>{{ site.url }}{{ site.baseurl }}{{ post.url | remove: '/' }}</guid>
 	  <description><![CDATA[
 	     {{ post.content | expand_urls : site.url }}
 	  ]]></description>

_layouts/tag.xml

@@ -5,10 +5,14 @@ title: nil
 {% for post in page.posts %}
 	<item>
 	  <title>{{ post.title }}</title>
-	  <link>{{ site.baseurl }}{{ post.url }}</link>
-	  <author>{{ site.author[1].username }}</author>
+	  <link>{{ site.url }}{{ site.baseurl }}{{ post.url | remove: '/' }}</link>
+		{% for author in site.data.authors %}
+				{% if author[1].username == post.author %}
+						<author>{{ author[1].name }}</author>
+				{% endif %}
+		{% endfor %}
 	  <pubDate>{{ post.date | date_to_xmlschema }}</pubDate>
-	  <guid>{{ site.baseurl }}{{ post.url }}</guid>
+	  <guid>{{ site.url }}{{ site.baseurl }}{{ post.url | remove: '/' }}</guid>
 	  <description><![CDATA[
 	     {{ post.content | expand_urls : site.url }}
 	  ]]></description>

_plugins/jekyll-autgenerator.rb

@@ -57,7 +57,7 @@ def initialize(site, base, dir, type, val, posts)
       @site = site
       @base = base
       @dir = dir
-      @name = 'rss.xml'
+      @name = 'feed.xml'
 
       self.process(@name)
       self.read_yaml(File.join(base, '_layouts'), "author.xml")

_plugins/jekyll-tagsgenerator.rb

@@ -57,7 +57,7 @@ def initialize(site, base, dir, type, val, posts)
       @site = site
       @base = base
       @dir = dir
-      @name = 'rss.xml'
+      @name = 'feed.xml'
 
       self.process(@name)
       self.read_yaml(File.join(base, '_layouts'), "tag.xml")

atom.xml

@@ -0,0 +1,28 @@
+---
+layout: null
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ site.name | xml_escape }} - Articles</title>
+    <description>{% if site.description %}{{ site.description | xml_escape }}{% endif %}</description>
+    <link>
+    {{ site.url }}</link>
+    {% for post in site.posts %}
+      {% unless post.link %}
+      <item>
+        <title>{{ post.title | xml_escape }}</title>
+        {% if post.excerpt %}
+          <description>{{ post.excerpt | xml_escape }}</description>
+        {% else %}
+          <description>{{ post.content | xml_escape }}</description>
+        {% endif %}
+        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <link>
+        {{ site.url }}{{ post.url }}</link>
+        <guid isPermaLink="true">{{ site.url }}{{ post.url }}</guid>
+      </item>
+      {% endunless %}
+    {% endfor %}
+  </channel>
+</rss>