X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fcontrollers%2Ffeed_controller.rb;h=8e89663852aa502a7da8eead64a9726e22dc928c;hb=0c831f9107670526c653c82f182b0b6983f49c31;hp=2d6fee9786f62166fb4414cef8fa241c67c7f96c;hpb=542a16e225fc1d0418fe53b9736da7f1ef3b8394;p=feedcatcher.git

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 2d6fee9..8e89663 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,9 +1,10 @@
 class FeedController < ApplicationController
-
+  
   skip_before_filter :verify_authenticity_token
 
   def index
-    @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+    # @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+    @feeds = FeedItem.select(:feed_name).distinct
     respond_to do |format|
       format.html
       format.rss { render :layout => false }
@@ -12,12 +13,12 @@ class FeedController < ApplicationController
 
   
   def show
-    if valid_feed_name?(params[:feed_name])
-      @feed_items = FeedItem.find_all_by_feed_name(params[:feed_name])
+    if FeedItem::valid_feed_name?(params[:feed_name])
       @feed_name = params[:feed_name]
+      @feed_items = FeedItem.in_feed(@feed_name)
       respond_to do |format|
         if @feed_items == []
-          flash[:notice] = "No items in feed #{params[:feed_name]}"
+          flash[:notice] = "No items in feed #{@feed_name}"
           format.html { redirect_to index_url }
           format.rss  { render :layout => false }
         else
@@ -36,10 +37,10 @@ class FeedController < ApplicationController
 
 
   def update
-    if valid_feed_name?(params[:new_feed_name])
-      item = FeedItem.find_by_feed_name_and_title(params[:new_feed_name], params[:title])
+    if FeedItem::valid_feed_name?(params[:feed_name])
+      item = FeedItem.in_feed(params[:feed_name]).entitled(params[:title]).take
       if item
-        if params[:description] == ''
+        if params[:description].empty?
           destroy_item(item)
         else
           update_item(item)
@@ -59,30 +60,21 @@ class FeedController < ApplicationController
 
   private
 
-  def valid_feed_name?(feed_name)
-    Rack::Utils::escape(feed_name) == feed_name and
-      Rack::Utils::unescape(feed_name) == feed_name and
-      feed_name != 'index' and
-      feed_name != 'show' and
-      feed_name != 'update' and
-      feed_name != 'action'
-  end
-
 
   def create_item
-    item = FeedItem.new(:feed_name => params[:new_feed_name],
+    item = FeedItem.new(:feed_name => params[:feed_name],
       :title => params[:title],
       :description => params[:description])
     item.save!
     flash[:notice] = "Element #{params[:title]} created"
     respond_to do |format|
-      format.html { redirect_to feed_url(params[:new_feed_name]) }
+      format.html { redirect_to feed_url(params[:feed_name]) }
       format.rss  { head :ok }
     end
   rescue ActiveRecord::RecordInvalid => error
     flash[:notice] = "Element #{params[:title]} could not be created"
     respond_to do |format|
-      format.html { redirect_to feed_url(params[:new_feed_name]) }
+      format.html { redirect_to feed_url(params[:feed_name]) }
       format.rss  { head :unprocessable_entity }
     end
   end
@@ -92,13 +84,13 @@ class FeedController < ApplicationController
     if item.update_attribute(:description, params[:description])
       flash[:notice] = "Element #{params[:title]} updated"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :ok }
       end
     else
       flash[:notice] = "Element #{params[:title]} could not be updated"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :unprocessable_entity }
       end
     end
@@ -107,15 +99,15 @@ class FeedController < ApplicationController
 
   def destroy_item(item)
     if item.destroy
-      flash[:notice] = "Element #{params[:title]} destroyed"
+      flash[:notice] = "Element #{params[:title]} deleted"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :ok }
       end
     else
-      flash[:notice] = "Element #{params[:title]} could not be destroyed"
+      flash[:notice] = "Element #{params[:title]} could not be deleted"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :unprocessable_entity }
       end
     end