X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fmodels%2Ffeed_item.rb;h=db0613da3827753d0ae08c5a77984926a8463974;hb=a3d41b1468861303edef7450ff1a7d5bc10dfbd6;hp=6dac7bca5d29a6eab048eeaf331ebc21b5750f45;hpb=9afca4a2a5790ed8842a7e5f0a3a3c716d28bb24;p=feedcatcher.git diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb index 6dac7bc..db0613d 100644 --- a/app/models/feed_item.rb +++ b/app/models/feed_item.rb @@ -1,8 +1,6 @@ class FeedItem < ActiveRecord::Base - - # require 'cgi' # needed for url decoding - validates_presence_of :feed_name, :title, :description + validates_uniqueness_of :title, :scope => :feed_name validate :feed_name_must_be_legal def FeedItem.valid_feed_name?(feed_name) @@ -18,8 +16,7 @@ class FeedItem < ActiveRecord::Base def feed_name_must_be_legal unless FeedItem.valid_feed_name?(feed_name) - errors.add(:feed_name, 'is an invalid feed name') + errors.add(:feed_name, 'is invalid') end end - end