Merge pull request #209 from bjfish/protip_page_performance

just3ws · just3ws · commit 13890b2e851c · 2014-10-03T10:47:45.000-05:00
Improve page loading time for the Protips page #371
diff --git a/app/controllers/protips_controller.rb b/app/controllers/protips_controller.rb
@@ -424,7 +424,8 @@ def search_options
 
     {
       page:     (signed_in? && search_options_params[:page].try(:to_i)) || 1,
-      per_page: [(signed_in? && search_options_params[:per_page].try(:to_i)) || 18, Protip::PAGESIZE].min
+      per_page: [(signed_in? && search_options_params[:per_page].try(:to_i)) || 18, Protip::PAGESIZE].min,
+      load: { include: [:user, :likes, :protip_links, :comments] }
     }
   end
 
diff --git a/app/models/protip.rb b/app/models/protip.rb
@@ -551,15 +551,15 @@ def best_stat
     {
       views:    self.total_views/COUNTABLE_VIEWS_CHUNK,
       upvotes:  self.upvotes,
-      comments: self.comments.count,
+      comments: self.comments.size,
       hawt:     self.hawt? ? 100 : 0
     }.sort_by do |k, v|
       -v
     end.first
   end
 
   def upvotes
-    @upvotes ||= likes.count
+    likes.size
   end
 
   def upvotes=(count)
@@ -782,7 +782,7 @@ def images
     if self.new_record?
       self.links.select { |link| ProtipLink.is_image? link }
     else
-      protip_links.where('kind in (?)', ProtipLink::IMAGE_KINDS).map(&:url)
+      protip_links.loaded? ? protip_links.select { |p| ProtipLink::IMAGE_KINDS.include?(p.kind.to_sym) }.map(&:url) : protip_links.where('kind in (?)', ProtipLink::IMAGE_KINDS).map(&:url)
     end
   end
 
diff --git a/app/views/protips/_grid.html.haml b/app/views/protips/_grid.html.haml
@@ -21,7 +21,7 @@
       - if protip == 'show-ad'
         = render(partial: 'opportunities/mini', locals: { opportunity: opportunity })
       -elsif protip.present?
-        - if protip = protip.load rescue nil # HACK: User deleted, protip no longer exists. Won't be found.
+        - if protip.is_a?(Protip) || protip = protip.load rescue nil # HACK: User deleted, protip no longer exists. Won't be found.
           %li{ class: (protip.kind == 'link' ? 'ext-link' : '') }
             = render(partial: 'protips/mini', locals: { protip: protip, mode: mode })
 

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,8 @@ def search_options`
`424`	`424`
`425`	`425`	`{`
`426`	`426`	`page: (signed_in? && search_options_params[:page].try(:to_i)) \|\| 1,`
`427`		`- per_page: [(signed_in? && search_options_params[:per_page].try(:to_i)) \|\| 18, Protip::PAGESIZE].min`
	`427`	`+ per_page: [(signed_in? && search_options_params[:per_page].try(:to_i)) \|\| 18, Protip::PAGESIZE].min,`
	`428`	`+ load: { include: [:user, :likes, :protip_links, :comments] }`
`428`	`429`	`}`
`429`	`430`	`end`
`430`	`431`