From c24799fed2a6f461ba296fcf617993897e0272b8 Mon Sep 17 00:00:00 2001
From: Aaron Mueller <mail@aaron-mueller.de>
Date: Thu, 10 Jan 2013 21:34:08 +0100
Subject: [PATCH] Make the importer even more robust and add a delete button

---
 app/controllers/feeds_controller.rb | 6 +++---
 app/models/item.rb                  | 2 +-
 app/views/feeds/show.html.erb       | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 190af3d..5bd1337 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -1,12 +1,12 @@
 class FeedsController < ApplicationController
   # Show all feeds
   def index
-    @feeds = Feed.all
+    @feeds = Feed.order("title").all
   end
 
   # Show a single feed
   def show
-    @items = Feed.find(params[:id]).items
+    @feed = Feed.find(params[:id])
     render :layout => false
   end
 
@@ -26,7 +26,7 @@ class FeedsController < ApplicationController
   end
 
   def import
-    fh = File.open(Rails.root.join("public", "uploads", params[:importer][:import_file].original_filename))
+    #fh = File.open(Rails.root.join("public", "uploads", params[:importer][:import_file].original_filename))
     # TODO: Hier gehts weiter
   end
 end
diff --git a/app/models/item.rb b/app/models/item.rb
index 176dada..8713928 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -14,7 +14,7 @@ class Item < ActiveRecord::Base
       :title => feed_entry.title,
       :url => feed_entry.url,
       :author => feed_entry.author || "Anonymous",
-      :published_at => feed_entry.published,
+      :published_at => feed_entry.published || Time.now,
       :content => feed_entry.content || feed_entry.summary || "No content available"
     )
   end
diff --git a/app/views/feeds/show.html.erb b/app/views/feeds/show.html.erb
index d7a051f..cb70947 100644
--- a/app/views/feeds/show.html.erb
+++ b/app/views/feeds/show.html.erb
@@ -1,5 +1,7 @@
+<h3><%= link_to(@feed.url, @feed.url) %></h3>
+
 <ul>
-<% @items.each do |item| %>
+<% @feed.items.each do |item| %>
 <li class="item">
   <%= link_to raw(item.title), item_path(item), :remote => true %>
   <em class="date_published"><%= time_ago_in_words(item.published_at) %></em> <em class="author">by <%= item.author %></em>