Don't find all the events twice on the projects#show page, and add conditional GET

1 files changed, 10 insertions, 8 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3942dc3..ef47bee 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -54,14 +54,16 @@ class ProjectsController < ApplicationController
   
   def show
     @owner = @project
-    @events = @project.events.top.paginate(:all, :page => params[:page], 
-      :order => "created_at desc", :include => [:user, :project])
+    @events = @project.events.top.paginate(:all, :page => params[:page],
+                :order => "created_at desc", :include => [:user, :project],)
     @atom_auto_discovery_url = project_path(@project, :format => :atom)
-    
-    respond_to do |format|
-      format.html
-      format.xml  { render :xml => @project }
-      format.atom { }
+    if stale?(:etag => [@project, @events.first], 
+              :last_modified => (@events.first || @project).created_at)
+      respond_to do |format|
+        format.html
+        format.xml  { render :xml => @project }
+        format.atom { }
+      end
     end
   end
   
@@ -127,7 +129,7 @@ class ProjectsController < ApplicationController
   
   protected
     def find_project
-      @project = Project.find_by_slug!(params[:id], :include => [:repositories, :events])
+      @project = Project.find_by_slug!(params[:id], :include => [:repositories])
     end
     
     def assure_adminship