app.patch

# TODO: remove this file from repo

From 3f49166f8f0c268dd7184404b292b8db8fa1b8b7 Mon Sep 17 00:00:00 2001
From: Phil McGachey <phil_mcgachey@harvard.edu>
Date: Sat, 1 Nov 2014 11:12:23 -0400
Subject: [PATCH] Fixes to the form generation and JSON serialization.

---
 app/controllers/questions_controller.rb           | 8 +++++---
 app/helpers/questions_helper.rb                   | 4 ++--
 app/models/question.rb                            | 3 ++-
 db/migrate/20141101140632_add_fields_to_answer.rb | 6 ++++++
 db/schema.rb                                      | 4 +++-
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20141101140632_add_fields_to_answer.rb

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index a3e73ca..ab12bc1 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -7,12 +7,14 @@ class QuestionsController < ApplicationController

   def new
     @question = Question.new
-    @answer = Answer.new
+    @question.answers.build
   end

   def create
-    question = Question.new(params.require(:question).permit(:text, :answer))
-    post_question(@question)
+    question = Question.new(params.require(:question)
+      .permit(:text,
+        answers_attributes:[:text]))
+    post_question(question)
     redirect_to questions_path
   end
 end
diff --git a/app/helpers/questions_helper.rb b/app/helpers/questions_helper.rb
index 49300c0..cbfb042 100644
--- a/app/helpers/questions_helper.rb
+++ b/app/helpers/questions_helper.rb
@@ -8,8 +8,8 @@ module QuestionsHelper
   end

   def post_question question
-    json = question.to_json
-    response = RestClient.post('http://localhost:3000/questions', :data => json, :content_type => :json , :accept => :json)
+    json = question.to_json(:include => :answers)
+    response = RestClient.post('http://localhost:3000/questions', json, :content_type => :json , :accept => :json)
     print "THIS IS THE #{response}"
   end
 end
diff --git a/app/models/question.rb b/app/models/question.rb
index 78b4ead..94140f5 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -1,3 +1,4 @@
 class Question < ActiveRecord::Base
-  has_one :answers
+  has_many :answers
+  accepts_nested_attributes_for :answers
 end
diff --git a/db/migrate/20141101140632_add_fields_to_answer.rb b/db/migrate/20141101140632_add_fields_to_answer.rb
new file mode 100644
index 0000000..d35c609
--- /dev/null
+++ b/db/migrate/20141101140632_add_fields_to_answer.rb
@@ -0,0 +1,6 @@
+class AddFieldsToAnswer < ActiveRecord::Migration
+  def change
+    add_column :answers, :question_id, :int
+    add_column :answers, :text, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 352a799..9776cf1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 20141030231443) do
+ActiveRecord::Schema.define(version: 20141101140632) do

   create_table "answers", force: true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "question_id"
+    t.string   "text"
   end

   create_table "questions", force: true do |t|
--
1.9.3 (Apple Git-50)