lib/vclog/templates/changelog.atom.erb in vclog-1.6.0 vs lib/vclog/templates/changelog.atom.erb in vclog-1.6.1

@@ -1,26 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-  <title><%= title %> Feed</title>
-  <% if url %><link href="<%= url %>" rel="self" /><% end %>
+  <title><%= title %></title>
+
+  <% if url %><link href="<%= url %>" /><% end %>
+
   <% if homepage %><link href="<%= homepage %>" /><% end %>
+
   <id><% if vcs.uuid %>urn:uuid:<%= vcs.uuid %><% else %><%= vcs.repository %><% end %></id>
-  <updated><%= Time.now %></updated>
+
+  <updated><%= Time.now.xmlschema %></updated>
+
   <author>
+
     <name><%= user %></name>
+
     <email><%= email %></email>
+
   </author>
 
-  <% changelog.changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
+<% changelog.changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
+
   <entry>
-    <title><%= h entry.message.lines.first %></title>
-    <id><%= entry.revision %></id>
+
+    <title><%= h entry.message.lines.first.rstrip %></title>
+
+    <id><%= url %>#<%= entry.revision %></id>
+
     <author><%= entry.author %></author>
-    <updated><%= entry.date %></updated>
-    <summary type="html"><%= h entry.message %></summary>
+
+    <updated><%= entry.date.xmlschema %></updated>
+
+    <content type="xhtml">
+
+      <div xmlns="http://www.w3.org/1999/xhtml">
+
+        <%= entry.message %><br/>
+
+        <%= entry.author %> <%= entry.date.strftime('%Y-%m-%d %H:%M:%S') %>
+
+      </div>
+
+    </content>
+
   </entry>
-  <% end %>
+
+<% end %>
 
 </feed>