From 148f2477e8e0dd41fcd753f9293efa97788cd1a1 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Sat, 9 Nov 2013 07:07:10 -0500
Subject: [PATCH] Use here-doc for Atom feed template

Rather than unnaturally re-reading __FILE__ and splitting,
use a here-doc to clarify the intent.
(Should also consider splitting it to a file.)
---
 lib/travis/api/app/responders/atom.rb | 74 +++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/lib/travis/api/app/responders/atom.rb b/lib/travis/api/app/responders/atom.rb
index a904197e..3cd4dba6 100644
--- a/lib/travis/api/app/responders/atom.rb
+++ b/lib/travis/api/app/responders/atom.rb
@@ -2,7 +2,43 @@ module Travis::Api::App::Responders
   require 'securerandom'
 
   class Atom < Base
-    ATOM_FEED_ERB = ERB.new(File.read(__FILE__).split("__END__").last.strip)
+    ATOM_FEED_ERB = ERB.new <<-EOF
+<?xml version="1.0" encoding="utf-8"?>
+ 
+<feed xmlns="http://www.w3.org/2005/Atom">
+ 
+  <title><%= @builds.first.repository.slug %> Builds</title>
+  <link href="<%= endpoint.url %>" type="application/atom+xml" rel = "self" />
+  <id>urn:uuid:<%= SecureRandom.uuid %></id>
+  <rights>Copyright (c) <%= DateTime.now.strftime("%Y") %> Travis CI GmbH</rights>
+  <updated><%= DateTime.now.strftime %></updated>
+ 
+  <% @builds.each do |build| %>
+  <entry>
+    <title><%= build.repository.slug %> Build #<%= build.number %></title>
+    <link href="<%= endpoint.url %>" />
+    <id>urn:uuid:<%= SecureRandom.uuid %></id>
+    <updated><%= build.finished_at || build.started_at %></updated>
+    <summary type="html">
+    &lt;p&gt;
+      <%= build.commit.message %> (<%= build.commit.committer_name %>)
+      &lt;br/&gt;&lt;br/&gt;
+      State: <%= build.state %>
+      &lt;br/&gt;
+      Started at: <%= build.started_at ? build.started_at : 'not started' %>
+      &lt;br/&gt;
+      Finished at: <%= build.finished_at ? build.finished_at :
+        build.started_at ? 'still running' : 'not started' %>
+    &lt;/p&gt;
+    </summary>
+    <author>
+      <name><%= build.commit.committer_name %></name>
+    </author>
+  </entry>
+  <% end %>
+ 
+</feed>
+    EOF
 
     def apply?
       if resource.is_a?(ActiveRecord::Relation) && resource.first.is_a?(Build)
@@ -25,39 +61,3 @@ module Travis::Api::App::Responders
 
   end
 end
-
-__END__
-<?xml version="1.0" encoding="utf-8"?>
- 
-<feed xmlns="http://www.w3.org/2005/Atom">
- 
-  <title><%= @builds.first.repository.slug %> Builds</title>
-  <link href="<%= endpoint.url %>" rel = "self" />
-  <id>urn:uuid:<%= SecureRandom.uuid %></id>
-  <updated><%= DateTime.now.strftime %></updated>
- 
-  <% @builds.each do |build| %>
-  <entry>
-    <title><%= build.repository.slug %> Build #<%= build.number %></title>
-    <link href="" />
-    <id>urn:uuid:<%= SecureRandom.uuid %></id>
-    <updated><%= build.finished_at || build.started_at %></updated>
-    <summary type="html">
-    &lt;p&gt;
-      <%= build.commit.message %> (<%= build.commit.committer_name %>)
-      &lt;br/&gt;&lt;br/&gt;
-      State: <%= build.state %>
-      &lt;br/&gt;
-      Started at: <%= build.started_at ? build.started_at : 'not started' %>
-      &lt;br/&gt;
-      Finished at: <%= build.finished_at ? build.finished_at :
-        build.started_at ? 'still running' : 'not started' %>
-    &lt;/p&gt;
-    </summary>
-    <author>
-      <name><%= build.commit.committer_name %></name>
-    </author>
-  </entry>
-  <% end %>
- 
-</feed>
\ No newline at end of file