From d5eeeaa31b93a024d51dec01829b7803baa87c4c Mon Sep 17 00:00:00 2001
From: Vitor Baptista <vitor@vitorbaptista.com>
Date: Mon, 27 Aug 2012 14:44:18 -0300
Subject: [PATCH] Returns all Choice or Questions' versions if requested (#24)

---
 app/controllers/choices_controller.rb         |  8 +++++++-
 app/controllers/questions_controller.rb       |  6 ++++--
 spec/controllers/choices_controller_spec.rb   | 21 +++++++++++++++++++++
 spec/controllers/questions_controller_spec.rb |  9 +++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb
index e919f31..2d9ab78 100644
--- a/app/controllers/choices_controller.rb
+++ b/app/controllers/choices_controller.rb
@@ -96,7 +96,13 @@ class ChoicesController < InheritedResources::Base
   def show
     @question = current_user.questions.find(params[:question_id])
     @choice = @question.choices.find(params[:id])
-    show!
+    response_options = {}
+    response_options[:include] = :versions if params[:version] == 'all'
+
+    respond_to do |format|
+      format.xml { render :xml => @choice.to_xml(response_options) }
+      format.json { render :json => @choice.to_json(response_options) }
+    end
   end
 
 
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index bb953dc..40ca5a2 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -23,13 +23,15 @@ class QuestionsController < InheritedResources::Base
     @question_optional_information.each do |key, value|
       optional_information << Proc.new { |options| options[:builder].tag!(key, value)}
     end
+    response_options = { :methods => [:item_count], :procs => optional_information }
+    response_options[:include] = :versions if params[:version] == "all"
 
     respond_to do |format|
       format.xml { 
-        render :xml => @question.to_xml(:methods => [:item_count], :procs => optional_information)
+        render :xml => @question.to_xml(response_options)
       }
       format.js{
-      	render :json => @question.to_json(:methods => [:item_count], :procs => optional_information)
+        render :json => @question.to_json(response_options)
       }
     end
   end
diff --git a/spec/controllers/choices_controller_spec.rb b/spec/controllers/choices_controller_spec.rb
index 2e366ac..fda4108 100644
--- a/spec/controllers/choices_controller_spec.rb
+++ b/spec/controllers/choices_controller_spec.rb
@@ -125,4 +125,25 @@ describe ChoicesController do
       end
     end
   
+    describe "GET show" do
+      it "doesn't returns all versions by default" do
+        question = Factory(:question, :site => @user)
+        choice = Factory(:choice, :question => question)
+
+        get :show, :question_id => question.id, :id => choice.id, :format => "xml"
+
+        response.code.should == "200"
+        response.body.should_not have_tag("versions")
+      end
+
+      it "responds with all versions if requested" do
+        question = Factory(:question, :site => @user)
+        choice = Factory(:choice, :question => question)
+
+        get :show, :question_id => question.id, :id => choice.id, :format => "xml", :version => "all"
+
+        response.code.should == "200"
+        response.body.should have_tag("versions")
+      end
+    end
 end
diff --git a/spec/controllers/questions_controller_spec.rb b/spec/controllers/questions_controller_spec.rb
index 6d867ae..d27a23b 100644
--- a/spec/controllers/questions_controller_spec.rb
+++ b/spec/controllers/questions_controller_spec.rb
@@ -17,6 +17,7 @@ describe QuestionsController do
     assigns[:question].should == @question
     @response.body.should have_tag("question")
     @response.code.should == "200"
+    @response.body.should_not have_tag("versions")
   end
 
 
@@ -32,4 +33,12 @@ describe QuestionsController do
     @response.body.should have_tag("visitor_votes")
     @response.body.should have_tag("visitor_ideas")
   end
+
+  it "responds with all versions if requested" do
+    get :show, :id => @question.id, :format => "xml", :version => "all"
+
+    assigns[:question].should == @question
+    @response.code.should == "200"
+    @response.body.should have_tag("versions")
+  end
 end
--
libgit2 0.21.2