moar eager loading

Pius Uzamere
1 parent 43a5f214
Showing 3 changed files with 8 additions and 14 deletions Show diff stats
app/controllers/choices_controller.rb
app/controllers/prompts_controller.rb
app/models/question.rb
@@ -9,14 +9,9 @@ class ChoicesController &lt; InheritedResources::Base
       @question = Question.find(params[:question_id])#, :include => :choices)
       @question.reload
       @choices = Choice.find(:all, :conditions => {:question_id => @question.id, :active => true}, :limit => params[:limit].to_i, :order => 'score DESC', :include => :item)
-      
-      #@choices.each {|c| c.compute_score!}
     else
       @question = Question.find(params[:question_id], :include => :choices) #eagerloads ALL choices
       @choices = @question.choices(true).active.find(:all, :include => :item)
-
-      
-      #@choices.each {|c| c.compute_score!}
     end
     index! do |format|
       format.xml { render :xml => params[:data].blank? ? @choices.to_xml(:methods => [:item_data, :votes_count]) : @choices.to_xml(:include => [:items], :methods => [:data, :votes_count])}
@@ -50,7 +50,7 @@ class PromptsController &lt; InheritedResources::Base
     logger.info "#{current_user.inspect} is voting #{direction}."
     @question = Question.find(params[:question_id])
-    @prompt = @question.prompts.find(params[:id])
+    @prompt = @question.prompts.find(params[:id], :include => :choices)
     case direction
     when :left
       successful = c = current_user.record_vote(params['params']['auto'], @prompt, 0)
@@ -81,11 +81,11 @@ class PromptsController &lt; InheritedResources::Base
     @prompt = @question.prompts.find(params[:id])
     respond_to do |format|
       if @prompt.suspend!
-        format.xml { render :xml => @choice.to_xml, :status => :created }
-        format.json { render :json => @choice.to_json, :status => :created }
+        format.xml { render :xml => @prompt.to_xml, :status => :created }
+        format.json { render :json => @prompt.to_json, :status => :created }
       else
-        format.xml { render :xml => @choice.errors, :status => :unprocessable_entity }
-        format.json { render :json => @choice.to_json }
+        format.xml { render :xml => @prompt.errors, :status => :unprocessable_entity }
+        format.json { render :json => @prompt.to_json }
       end
     end
   end
@@ -96,7 +96,7 @@ class PromptsController &lt; InheritedResources::Base
     authenticate
     logger.info "#{current_user.inspect} is skipping."
     @question = Question.find(params[:question_id])
-    @prompt = @question.prompts.find(params[:id])
+    @prompt = @question.prompts.find(params[:id], :include => [{ :left_choice => :item }, { :right_choice => :item }])
     respond_to do |format|
@@ -152,8 +152,7 @@ class PromptsController &lt; InheritedResources::Base
   def show
     @question = Question.find(params[:question_id])
-    @prompt = @question.prompts.find(params[:id])
-    show! do |format|
+    @prompt = @question.prompts.find(params[:id], :include => [{ :left_choice => :item }, { :right_choice => :item }])
       format.xml { render :xml => @prompt.to_xml(:methods => [:left_choice_text, :right_choice_text])}
       format.json { render :json => @prompt.to_json(:methods => [:left_choice_text, :right_choice_text])}
     end
@@ -23,7 +23,7 @@ class Question &lt; ActiveRecord::Base
    def picked_prompt
      begin
-       @p = prompts.first(:order => 'RANDOM()')
+       @p = prompts.first(:order => 'RANDOM()', :include => [{ :left_choice => :item }, { :right_choice => :item }])
      end until @p.active?
      return @p
    end
	@@ -23,7 +23,7 @@ class Question < ActiveRecord::Base		@@ -23,7 +23,7 @@ class Question < ActiveRecord::Base
23		23
24	def picked_prompt	24	def picked_prompt
25	begin	25	begin
26	- @p = prompts.first(:order => 'RANDOM()')	26	+ @p = prompts.first(:order => 'RANDOM()', :include => [{ :left_choice => :item }, { :right_choice => :item }])
27	end until @p.active?	27	end until @p.active?
28	return @p	28	return @p
29	end	29	end