Merge pull request #34 from andela-iamadi/ft-implement-jbuilder-for-a…

…nswer-controller

Implement JBuilder for AnswersController

Gemfile

@@ -14,7 +14,7 @@ gem 'ancestry'
 gem 'will_paginate'
 gem "puma"
 # gem 'kaminari'
-gem "active_model_serializers", github: "rails-api/active_model_serializers"
+gem 'jbuilder'
 gem "jwt"
 # gem 'unicorn-rails'
 gem 'rack-cors'

Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: git://github.com/rails-api/active_model_serializers.git
-  revision: b45f7b4ffea36b44fdf7be075295ad9db6bea1b0
-  specs:
-    active_model_serializers (0.10.0.rc4)
-      actionpack (>= 4.0)
-      activemodel (>= 4.0)
-      railties (>= 4.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -63,6 +54,9 @@ GEM
       activesupport (>= 4.1.0)
     hashie (3.4.3)
     i18n (0.7.0)
+    jbuilder (2.4.1)
+      activesupport (>= 3.0.0, < 5.1)
+      multi_json (~> 1.2)
     json (1.8.3)
     jwt (1.5.1)
     loofah (2.0.3)
@@ -176,10 +170,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_model_serializers!
   ancestry
   faker
   figaro
+  jbuilder
   jwt
   omniauth-google-oauth2
   omniauth-oauth2 (~> 1.3.1)

app/controllers/answers_controller.rb

@@ -5,28 +5,25 @@ class AnswersController < ApplicationController
 
   def index
     @answers = @question.answers.with_votes
-
-    render json: @answers
   end
 
   def show
-    render json: @answer
   end
 
   def create
     @answer = @question.answers.new(answer_params)
     @answer.user = current_user
 
     if @answer.save
-      render json: @answer, status: :created, location: question_answer_path(@question, @answer)
+      render :show
     else
       invalid_request(error_msg)
     end
   end
 
   def update
     if @answer.update(answer_params)
-      render json: @answer, status: 200
+      render :show
     else
       invalid_request(error_msg)
     end

app/controllers/application_controller.rb

@@ -1,6 +1,5 @@
 class ApplicationController < ActionController::API
   include ActionController::HttpAuthentication::Token::ControllerMethods
-  include ActionController::Serialization
 
   attr_reader :current_user
   before_action :authenticate_user

app/views/answers/_answer.json.jbuilder

@@ -0,0 +1,7 @@
+json.answers(answers) do |answer|
+  json.partial! 'comments/default', data: answer
+  json.extract! answer, :question_id
+  json.extract! answer, :comments_count
+  json.partial! 'users/user', user: answer.user
+  json.partial! 'comments/comment', comments: answer.comments
+end

app/views/answers/index.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'answer', answers: @answers

app/views/answers/show.json.jbuilder

@@ -0,0 +1,5 @@
+json.partial! 'comments/default', data: @answer
+json.extract! @answer, :question_id
+json.extract! @answer, :comments_count
+json.partial! 'users/user', user: @answer.user
+json.partial! 'comments/comment', comments: @answer.comments

app/views/comments/_comment.json.jbuilder

@@ -0,0 +1 @@
+ json.comments comments, partial: 'comments/default', as: :data

app/views/comments/_default.json.jbuilder

@@ -0,0 +1,2 @@
+json.(data, :id, :content, :votes_count, :created_at, :updated_at)
+json.partial! 'users/user', user: data.user

app/views/comments/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@comments) do |comment|
+  json.extract! comment, :id
+  json.url comment_url(comment, format: :json)
+end

app/views/comments/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @comment, :id, :created_at, :updated_at

app/views/users/_user.json.jbuilder

@@ -0,0 +1 @@
+json.user user

app/views/users/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@users) do |user|
+  json.extract! user, :id
+  json.url user_url(user, format: :json)
+end

app/views/users/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @user, :id, :created_at, :updated_at