Fixing it up

steveklabnik · steveklabnik · commit ad89e25d0bf7 · 2012-03-06T11:38:43.000-05:00
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -19,6 +19,18 @@ def update
     params[:question][:solution_id] != @question.solution_id ? update!(:notice => "Okay! We've selected that answer") : update!
   end
 
+  def feed
+    @title = "Questions Feed"
+
+    @questions = Question.sort(:created_at.desc).limit(20).all
+
+    @updated = @questions.first.updated_at
+
+    respond_to do |format|
+      format.atom
+    end
+  end
+
   def collection
     @questions = @presenter.apply_scope(end_of_association_chain).newest_first.paginate(:page => params[:page])
   end
@@ -66,18 +78,4 @@ def set_presenter
     end
   end
 
-  def feed
-    @title = "Questions Feed"
-
-    @questions = Question.all(:select => "title, description, solution_id, created_at", :order => "created_at DESC", :limit => 20) unless @support
-
-    @updated = @questions.first.updated_at unless @questions.empty?
-
-    respond_to do |format|
-      format.html
-      format.atom
-      format.xml { render :xml => @questions }
-    end
-  end
-
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,8 +2,7 @@
 !!!
 %html
   %head
-    = auto_discovery_link_tag :atom, feed_path
-    = auto_discovery_link_tag :rss, feed_path
+    = auto_discovery_link_tag :atom, "/questions/feed.atom" # I don't even care
 
     - title = yield :title
     %title #{title.blank? ? "" : "#{title} | "}Hackety Hack!
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,9 +3,9 @@
   resources :lessons, :only => [:index, :show]
 
   resources :questions do
-    match '/feed' => 'questions#feed',
+    match 'feed' => 'questions#feed',
       :as => :feed,
-      :defaults => { :format => 'atom' }
+      :on => :collection
   end
 
   resources :questions do
