Merged changes into stable branch

[feedcatcher.git] / app / controllers / feed_controller.rb

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 2eddc8ca05f06eb2ea34ec6d76ead08e3c448703..30ddb0c6668cfdbe1bc12cfd26fd93ca15492de2 100644 (file)
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,4 +1,7 @@
 class FeedController < ApplicationController
+
+  skip_before_filter :verify_authenticity_token
+
   def index
     @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
     respond_to do |format|
@@ -7,27 +10,115 @@ class FeedController < ApplicationController
     end
   end
 
+  
   def show
-    @feed_items = FeedItem.find_all_by_feed_name(params[:feed_name])
-    redirect_to index_url if @feed_items == []
-    respond_to do |format|
-      format.html
-      format.rss { render :layout => false }
+    if valid_feed_name?(params[:feed_name])
+      @feed_items = FeedItem.find_all_by_feed_name(params[:feed_name])
+      @feed_name = params[:feed_name]
+      respond_to do |format|
+        if @feed_items == []
+          flash[:notice] = "No items in feed #{params[:feed_name]}"
+          format.html { redirect_to index_url }
+          format.rss  { render :layout => false }
+        else
+          format.html
+          format.rss { render :layout => false }
+        end
+      end
+    else
+      respond_to do |format|
+        flash[:notice] = "Invalid feed name"
+        format.html { redirect_to index_url }
+        format.rss  { head :not_found}
+      end
     end
   end
 
+
   def update
-    item = FeedItem.find_by_feed_name_and_title(params[:feed_item][:feed_name], params[:feed_item][:title])
-    if item
-      if params[:feed_item][:description] == ''
-        item.destroy
+    if valid_feed_name?(params[:feed_name])
+      item = FeedItem.find_by_feed_name_and_title(params[:feed_name], params[:title])
+      if item
+        if params[:description] == ''
+          destroy_item(item)
+        else
+          update_item(item)
+        end
       else
-        item.update_attribute(:description, params[:feed_item][:description])
+        create_item
+      end
+    else
+      respond_to do |format|
+        flash[:notice] = "Invalid feed name"
+        format.html { redirect_to index_url }
+        format.rss  { head :not_found }
+      end
+    end
+  end
+  
+
+  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[: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[: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[:feed_name]) }
+      format.rss  { head :unprocessable_entity }
+    end
+  end
+
+
+  def update_item(item)
+    if item.update_attribute(:description, params[:description])
+      flash[:notice] = "Element #{params[:title]} updated"
+      respond_to do |format|
+        format.html { redirect_to feed_url(params[:feed_name]) }
+        format.rss  { head :ok }
       end
     else
-      FeedItem.create(params[:feed_item])
+      flash[:notice] = "Element #{params[:title]} could not be updated"
+      respond_to do |format|
+        format.html { redirect_to feed_url(params[:feed_name]) }
+        format.rss  { head :unprocessable_entity }
+      end
+    end
+  end
+
+
+  def destroy_item(item)
+    if item.destroy
+      flash[:notice] = "Element #{params[:title]} destroyed"
+      respond_to do |format|
+        format.html { redirect_to feed_url(params[:feed_name]) }
+        format.rss  { head :ok }
+      end
+    else
+      flash[:notice] = "Element #{params[:title]} could not be destroyed"
+      respond_to do |format|
+        format.html { redirect_to feed_url(params[:feed_name]) }
+        format.rss  { head :unprocessable_entity }
+      end
     end
-    redirect_to feed_url(params[:feed_item][:feed_name])
   end
 
 end