Merging changes from trunk into stable branch

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 30ddb0c6668cfdbe1bc12cfd26fd93ca15492de2..819dab13c0dd344c376e38f73d544ba9a2fea61e 100644 (file)
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -12,7 +12,7 @@ class FeedController < ApplicationController
 
   
   def show
-    if valid_feed_name?(params[:feed_name])
+    if FeedItem::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|
@@ -36,7 +36,7 @@ class FeedController < ApplicationController
 
 
   def update
-    if valid_feed_name?(params[:feed_name])
+    if FeedItem::valid_feed_name?(params[:feed_name])
       item = FeedItem.find_by_feed_name_and_title(params[:feed_name], params[:title])
       if item
         if params[:description] == ''
@@ -59,15 +59,6 @@ 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[:feed_name],
@@ -107,13 +98,13 @@ 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[: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[:feed_name]) }
         format.rss  { head :unprocessable_entity }

diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index 75830a53f1f58287626fec37b24104aea36d4919..6dac7bca5d29a6eab048eeaf331ebc21b5750f45 100644 (file)
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -5,15 +5,19 @@ class FeedItem < ActiveRecord::Base
   validates_presence_of :feed_name, :title, :description
   validate :feed_name_must_be_legal
 
-private
+  def FeedItem.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
+
+  private
 
   def feed_name_must_be_legal
-    if Rack::Utils::escape(feed_name) != feed_name or
-        Rack::Utils::unescape(feed_name) != feed_name or
-        feed_name == 'index' or
-        feed_name == 'show' or
-        feed_name == 'update' or
-        feed_name == 'action'
+    unless FeedItem.valid_feed_name?(feed_name)
       errors.add(:feed_name, 'is an invalid feed name')
     end
   end