Changeset cb93cb8c2391bcfdff4eefed378aa47f6a8ef266

Timestamp:

07/27/10 09:01:10 (6 weeks ago)

Author:

Alban Peignier <alban@…>

Parents:

4c2e420eff672f881710178e0488b6a07aebec4c

Children:

c5037a4ce54f151978b2a29e61f78dde36d3cbea

git-committer:

Alban Peignier <alban@tryphon.eu> / 2010-07-27T09:01:10Z+0200

Message:

Optimise db usage for PublicController#feed?

Location:

app

Files:

• controllers/public_controller.rb (modified) (9 diffs)
• helpers/public_helper.rb (modified) (1 diff)
• models/content.rb (modified) (1 diff)
• models/episode.rb (modified) (1 diff)
• views/public/_feed_content.rxml (modified) (1 diff)

app/controllers/public_controller.rb

@@ -7 +7 @@
   append_view_path "#{Rails.root}/templates"
 
-  before_filter :assigns_show, :assigns_now, :create_user_google_analytics_account
+  before_filter :assigns_show, :create_user_google_analytics_account, :except => :feed
+  before_filter :assigns_now
 
   rescue_from ActiveRecord::RecordNotFound, :with => :show_home_page_when_not_found
@@ -35 +36 @@
 
   def feed
+    current_show [{:episodes => [ :show, { :contents => { :episode => [ :contents, :tags, { :show => :host } ] } }, :tags ]}, :host] 
     render :content_type => "application/rss+xml", :layout => false
   end
@@ -48 +50 @@
 
   def direct
-    render_template @show, :stream, @show
+    render_template current_show, :stream, current_show
   end
 
@@ -58 +60 @@
 
   def vote
-    @episode = @show.episodes.find(params[:episode_id])
+    @episode = current_show.episodes.find(params[:episode_id])
 
     if request.post? and user_session.can_rate_episode?(@episode)
@@ -73 +75 @@
   def tags
     @search = params[:search]
-    @episodes = Episode.sort(@show.episodes.find_tagged_with(@search))
+    @episodes = Episode.sort(current_show.episodes.find_tagged_with(@search))
 
     respond_to do |format|
       format.html {
-        render_template @show, :search, @search
+        render_template current_show, :search, @search
       }
       format.m3u {
@@ -94 +96 @@
 
   def render_show
-    create_visit @show
-    render_template @show, :show, @show
+    create_visit current_show
+    render_template current_show, :show, current_show
   end
 
@@ -105 +107 @@
   end
 
-  def assigns_show
-    host = Host.find_by_name(request.host)
-    unless host.blank?
-      @show = host.show
-    end
-
-    show_slug = ""
-    if request.host =~ /^(.*).bonnes-ondes.(fr|local)$/
-      show_slug = $1
-    end
-
-    @show = find_show(show_slug)
-  end
-
   def assigns_now
     @now = Time.now
@@ -124 +112 @@
 
   def create_user_google_analytics_account
-    user_tracker_id = (@show and @show.host and @show.host.google_analytics_tracker_id)
+    user_tracker_id = (current_show and current_show.host and current_show.host.google_analytics_tracker_id)
 
     unless user_tracker_id.blank?
@@ -131 +119 @@
   end
 
-  def find_show(slug = nil)
-    @show ||= Show.find_by_slug(slug)
+  def current_show(include = [])
+    unless @show
+      if host = Host.find_by_name(request.host)
+        @show = Show.find(host.show, :include => include)
+      else
+        if request.host =~ /^(.*).bonnes-ondes.(fr|local)$/
+          @show = Show.find_by_slug($1, :include => include)
+        end
+      end
+
+      raise ActiveRecord::RecordNotFound unless @show
+    end
+
+    @show
   end
+  alias_method :load_show, :current_show
+  alias_method :assigns_show, :current_show
 
   def find_episode
-    find_show.episodes.find_by_slug(params[:episode_slug]) or raise ActiveRecord::RecordNotFound
+    current_show.episodes.find_by_slug(params[:episode_slug]) or raise ActiveRecord::RecordNotFound
   end
 

app/helpers/public_helper.rb

@@ -3 +3 @@
 
   def contents_for_feed(show)
-    Episode.sort(show.episodes.broadcasted).collect { |e| e.contents.principal }.flatten
+    Episode.sort(show.episodes).select(&:broadcasted?).collect do |episode|
+      episode.contents.select(&:principal?) 
+    end.flatten
   end
 

app/models/content.rb

@@ -5 +5 @@
 
   named_scope :principal, :conditions => { :principal => true }
+  named_scope :for_feed, lambda { |show| { 
+      :conditions => [ "shows.id = ? and episodes.broadcasted_at < ?", show.id, Time.now ], 
+      :include => { :episode => [:tags, :show, :contents] },
+      :order => "episodes.broadcasted_at desc"
+    }
+  }
 
   liquid_methods :name, :episode, :duration, :has_duration?, :id, :available?

app/models/episode.rb

@@ -28 +28 @@
   belongs_to :image
 
+  def broadcasted?
+    self.broadcasted_at < Time.now
+  end
+
   def self.sort(episodes)
     if episodes.all?(&:broadcasted_at)

app/views/public/_feed_content.rxml

@@ -13 +13 @@
   end
 
-  xml.description textilize_in_text(content.episode.description)
-  xml.itunes :summary, textilize_in_text(content.episode.description)
+  text = textilize_in_text(content.episode.description)
+  xml.description text
+  xml.itunes :summary, text
 
   xml.itunes :duration, "#{content.duration}:00" if content.has_duration?