From a0fd2990d435fae07fb9824c81bf5231f4eff8ec Mon Sep 17 00:00:00 2001
From: Lakshmi Vyasarajan <lakshmi.vyas@gmail.com>
Date: Mon, 21 Mar 2011 11:05:40 +0530
Subject: [PATCH] Adding atom feed

---
 hyde/layouts/basic/content/blog/atom.xml     |  5 +++
 hyde/layouts/basic/content/blog/excerpts.xml |  6 +++
 hyde/layouts/basic/content/index.html        |  4 +-
 hyde/layouts/basic/layout/atom.j2            | 40 ++++++++++++++++++++
 hyde/layouts/basic/layout/blog.j2            |  4 +-
 hyde/layouts/basic/layout/macros.j2          | 12 ++++++
 hyde/layouts/basic/site.yaml                 |  1 +
 7 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 hyde/layouts/basic/content/blog/atom.xml
 create mode 100644 hyde/layouts/basic/content/blog/excerpts.xml
 create mode 100644 hyde/layouts/basic/layout/atom.j2

diff --git a/hyde/layouts/basic/content/blog/atom.xml b/hyde/layouts/basic/content/blog/atom.xml
new file mode 100644
index 0000000..7d37140
--- /dev/null
+++ b/hyde/layouts/basic/content/blog/atom.xml
@@ -0,0 +1,5 @@
+===
+title: BASIC blog full text feed
+extends: atom.j2
+listable: false
+===
diff --git a/hyde/layouts/basic/content/blog/excerpts.xml b/hyde/layouts/basic/content/blog/excerpts.xml
new file mode 100644
index 0000000..aa803e8
--- /dev/null
+++ b/hyde/layouts/basic/content/blog/excerpts.xml
@@ -0,0 +1,6 @@
+===
+title: BASIC blog excerpts feed
+extends: atom.j2
+excerpts_only: true
+listable: false
+===
diff --git a/hyde/layouts/basic/content/index.html b/hyde/layouts/basic/content/index.html
index d34ee51..c52c770 100644
--- a/hyde/layouts/basic/content/index.html
+++ b/hyde/layouts/basic/content/index.html
@@ -9,12 +9,12 @@ description: Home page for the BASIC hyde template
 <section class="blog_excerpt">
 {% set latest = site.content.walk_resources_sorted_by_time()|first %}
 
---- if latest:
+{% if latest -%}
 {{ render_excerpt(latest, 'post') }}
 
 <a class="button white medium"
     href="{{ content_url(latest.url) }}">Read more&hellip;</a>
 
---- endif
+{%- endif %}
 
 </section>
\ No newline at end of file
diff --git a/hyde/layouts/basic/layout/atom.j2 b/hyde/layouts/basic/layout/atom.j2
new file mode 100644
index 0000000..e03c40b
--- /dev/null
+++ b/hyde/layouts/basic/layout/atom.j2
@@ -0,0 +1,40 @@
+{% from "macros.j2" import render_excerpt, render_post with context %}
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title>
+        {% block title %}{{ resource.meta.title|default(feed_title) }}{% endblock %}
+    </title>
+    {% block self_url %}
+    <link href="{{ resource.url }}" rel="self" />
+    {% endblock %}
+
+    {% block site_url %}
+    <link href="{{ content_url('') }}"/>
+    {% endblock %}
+
+    {% block feed_extra %}
+    {% endblock %}
+
+    <updated>{{ now|xmldatetime }}</updated>
+
+    <id>{{ content_url(resource.url) }}/</id>
+
+    {% for res in resource.node.walk_resources_sorted_by_time() %}
+        <entry>
+            <title type="html">{{ res.meta.title }}</title>
+            <author><name>{{ res.meta.author }}</name></author>
+            <link href="{{ content_url(res.url) }}"/>
+            <updated>{{ res.meta.created|xmldatetime }}</updated>
+            <published>{{ res.meta.created|xmldatetime }}</published>
+            <id>{{ content_url(res.url) }}</id>
+            <content type="html">
+                {% if resource.meta.excerpts_only -%}
+                {{ render_excerpt(res) }}
+                {%- else %}
+                {{ render_post(res) }}
+                {%- endif %}
+              {{ res.text }}
+            </content>
+        </entry>
+    {% endfor %}
+</feed>
\ No newline at end of file
diff --git a/hyde/layouts/basic/layout/blog.j2 b/hyde/layouts/basic/layout/blog.j2
index bf187ec..1e5fe2e 100644
--- a/hyde/layouts/basic/layout/blog.j2
+++ b/hyde/layouts/basic/layout/blog.j2
@@ -56,9 +56,9 @@
 </ul>
 {% endif %}
 {% filter markdown|typogrify -%}
-
+{% mark post -%}
 {% block post -%}{%- endblock %}
-
+{%- endmark %}
 {%- endfilter %}
 </article>
 
diff --git a/hyde/layouts/basic/layout/macros.j2 b/hyde/layouts/basic/layout/macros.j2
index d60c8d3..c1172e8 100644
--- a/hyde/layouts/basic/layout/macros.j2
+++ b/hyde/layouts/basic/layout/macros.j2
@@ -1,3 +1,15 @@
+{% macro render_post(res) %}
+{% refer to res.url as article %}
+<article>
+<h3><a href="{{ content_url(res.url) }}">{{ res.meta.title }}</a></h3>
+<time datetime="{{ res.meta.created.strftime('%Y-%m-%d') }}">
+    Posted: {{ res.meta.created.strftime('%a, %d %b %Y') }}
+</time>
+{{ article.post|markdown|typogrify }}
+</article>
+{% endmacro %}
+
+
 {% macro render_excerpt(res, class=None) %}
 {% refer to res.url as post %}
 <article {{'class='~class if class }}>
diff --git a/hyde/layouts/basic/site.yaml b/hyde/layouts/basic/site.yaml
index 2c48bd1..bf24e3f 100644
--- a/hyde/layouts/basic/site.yaml
+++ b/hyde/layouts/basic/site.yaml
@@ -40,6 +40,7 @@ context:
 meta:
     nodemeta: meta.yaml
     created: !!timestamp 2010-01-01 00:00:00
+    author: Lakshmi Vyasarajan
 sorter:
     time:
         attr: