X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fcontrollers%2Ffeed_controller.rb;h=f7b8c3e9c7a8b65ba40e39e1aeff9fbc7cddf52c;hb=449f88a595af707cec02270dd752773a18dacfc2;hp=819dab13c0dd344c376e38f73d544ba9a2fea61e;hpb=9afca4a2a5790ed8842a7e5f0a3a3c716d28bb24;p=feedcatcher.git diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb index 819dab1..f7b8c3e 100644 --- a/app/controllers/feed_controller.rb +++ b/app/controllers/feed_controller.rb @@ -1,24 +1,21 @@ class FeedController < ApplicationController - - skip_before_filter :verify_authenticity_token - + def index - @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 } end end - def show if FeedItem::valid_feed_name?(params[:feed_name]) - @feed_items = FeedItem.find_all_by_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]}" - format.html { redirect_to index_url } + if @feed_items.empty? + flash[:notice] = "No items in feed #{@feed_name}" + format.html { redirect_to index_path } format.rss { render :layout => false } else format.html @@ -28,18 +25,17 @@ class FeedController < ApplicationController else respond_to do |format| flash[:notice] = "Invalid feed name" - format.html { redirect_to index_url } + format.html { redirect_to index_path } format.rss { head :not_found} end end end - def update if FeedItem::valid_feed_name?(params[:feed_name]) - item = FeedItem.find_by_feed_name_and_title(params[:feed_name], params[:title]) + 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) @@ -50,63 +46,60 @@ class FeedController < ApplicationController else respond_to do |format| flash[:notice] = "Invalid feed name" - format.html { redirect_to index_url } + format.html { redirect_to index_path } format.rss { head :not_found } end end end - private - + # private - def create_item + private 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.html { redirect_to feed_path(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.html { redirect_to feed_path(params[:feed_name]) } format.rss { head :unprocessable_entity } end end - - def update_item(item) + private 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.html { redirect_to feed_path(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[:feed_name]) } + format.html { redirect_to feed_path(params[:feed_name]) } format.rss { head :unprocessable_entity } end end end - - def destroy_item(item) + private def destroy_item(item) if item.destroy flash[:notice] = "Element #{params[:title]} deleted" respond_to do |format| - format.html { redirect_to feed_url(params[:feed_name]) } + format.html { redirect_to feed_path(params[:feed_name]) } format.rss { head :ok } end else flash[:notice] = "Element #{params[:title]} could not be deleted" respond_to do |format| - format.html { redirect_to feed_url(params[:feed_name]) } + format.html { redirect_to feed_path(params[:feed_name]) } format.rss { head :unprocessable_entity } end end