poptart 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e866e5a5e27b895fa5736f6563bf11a3ff32f88f
-  data.tar.gz: 53641259333474ad4dfc3caa9e0b4a28147aef84
+  metadata.gz: 9562c2a9cbf777cce16a855129ecbdeeb6de4446
+  data.tar.gz: 9172f17c4db0b7f8a0ef1d5ea773d051f2c47eb8
 SHA512:
-  metadata.gz: dd84a6bd7702ffc6fe8e195a55e4bd9ee6756e704687cc0fbcf389920fb2f85284299406753067ceba0ad1569bbf697c14d26184e0a03f4ea8e10feb8765355a
-  data.tar.gz: 997bd36d34df9af9903805faa1359fec597fc5f1c1514124cc77363584b168d88560bb6ac6b8cb028f60e5c27f55fbca6a0cde7f25777081dd3c17144a2589a0
+  metadata.gz: 1cc2c2527997928f3011d9939919277387e6c7c0844d5fdb0366dcf804f5e9ba1f6365eadd77653a93111ec21d8acf3fb619776d85e9567607cddf4387ecf3ab
+  data.tar.gz: b66de0f765cb2302d86f7018f4e53661c61b8f6e7af0d4cf82d5cfcdb133e03edacc2923c67823c669da7278414ed141ba17fa926e0637e1bf16ee16d17da786

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    poptart (0.0.7)
+    poptart (0.0.8)
       activesupport
       addressable
       faraday

data/lib/poptart/model.rb

@@ -26,26 +26,24 @@ module Poptart
       Poptart::Model.root
     end
 
-    def build_url(resource, id: nil, nested_resource: nil, query: nil)
-      template_string = "#{scheme}://#{host}/{+resource}/{id}"
-      if nested_resource
-        template_string += "/{nested_resource}"
-      end
-      template_string += "{?query*}"
-      template = Addressable::Template.new(template_string)
-      template.expand(resource: resource, id: id, nested_resource: nested_resource, query: query).to_s
-    end
-
     def users_url(id: nil, query: nil)
-      build_url(links.users.href, id: id, query: query)
+      template = Addressable::Template.new(links.users.href)
+      template.expand(id: id, query: query).to_s
     end
 
     def surveys_url(id: nil, query: nil)
-      build_url(links.surveys.href, id: id, query: query)
+      template = Addressable::Template.new(links.surveys.href)
+      template.expand(id: id, query: query).to_s
     end
 
     def questions_url(id: nil, query: nil)
-      build_url(links.questions.href, id: id, query: query)
+      template = Addressable::Template.new(links.questions.href)
+      template.expand(id: id, query: query).to_s
+    end
+
+    def survey_questions_url(question_id: nil, query: nil)
+      template = Addressable::Template.new(links.survey_questions.href)
+      template.expand(question_id: question_id, query: query).to_s
     end
 
     private

data/lib/poptart/range_question.rb

@@ -1,5 +1,5 @@
 module Poptart
-  class RangeResponseQuestion < Question
+  class RangeQuestion < Question
     extend Poptart::Request
 
     def self.question_type

data/lib/poptart/survey.rb

@@ -18,8 +18,7 @@ module Poptart
     end
 
     def add_question(question)
-      url = build_url(links.survey_questions.post.href)
-      response = post(url, { survey_question: { question_id: question.id } } )
+      response = post(links.survey_questions.post.href, { survey_question: { question_id: question.id } } )
       if response.status == 201
         Poptart::SurveyQuestion.new(response).tap { |survey_question| survey_questions << survey_question }
       end

data/lib/poptart/survey_question.rb

@@ -8,10 +8,16 @@ module Poptart
     def initialize(response)
       super
       @text = params['text']
-      @answer = params['answer']
       @type = params['type']
       @freeform = params['freeform']
       @responses = params['responses']
+      @answer = params['answer']
+
+      if @answer == 't'
+        @answer = true
+      elsif @answer == 'f'
+        @answer = false
+      end
     end
 
     def boolean?
@@ -35,8 +41,7 @@ module Poptart
     end
 
     def submit
-      url = build_url(links.put.href)
-      response = put(url, { id: id, survey_question: { answer: answer} })
+      response = put(links.put.href, { id: id, survey_question: { answer: answer} })
       response.status == 204
     end
   end

data/lib/poptart/time_question.rb

@@ -0,0 +1,9 @@
+module Poptart
+  class TimeQuestion < Question
+    extend Poptart::Request
+
+    def self.question_type
+      'time'
+    end
+  end
+end

data/lib/poptart/user.rb

@@ -39,7 +39,9 @@ module Poptart
     end
 
     def survey_questions_for_question_id(question_id)
-
+      url = root.survey_questions_url(question_id: question_id)
+      response = get(url)
+      JSON.parse(response.body)["survey_questions"].map { |response_body| Poptart::SurveyQuestion.new(response_body) }
     end
   end
 end

data/lib/poptart.rb

@@ -31,4 +31,5 @@ require_relative 'poptart/question'
 require_relative 'poptart/boolean_question'
 require_relative 'poptart/multiple_response_question'
 require_relative 'poptart/range_question'
+require_relative 'poptart/time_question'
 require_relative 'poptart/user'

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Poptart
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/requests/answering_survey_questions_spec.rb

@@ -12,7 +12,7 @@ describe 'Answering survey questions' do
     user = Poptart::User.create
     survey = user.create_random_survey
     survey.service_user_id.should == user.service_user_id
-    survey.survey_questions.count.should == 5
+    survey.survey_questions.count.should > 0
   end
 
   it "answers a survey question", :vcr do
@@ -37,11 +37,11 @@ describe 'Answering survey questions' do
     survey_question.responses.should == ['t', 'f']
     survey_question.type.should == 'boolean'
 
-    survey_question.answer = 'true'
+    survey_question.answer = true
     survey_question.submit.should be
 
     survey = user.survey_for_id(survey.id)
-    survey.survey_questions.first.answer.should == 'true'
+    survey.survey_questions.first.answer.should == true
   end
 
   it "answers a multiple choice question", :vcr do
@@ -69,28 +69,4 @@ describe 'Answering survey questions' do
     survey_question = survey.survey_question_for_id(first_survey_question.id)
     first_survey_question.should == survey_question
   end
-
-  xit "returns all answered survey questions for a question", :vcr, :record => :all do
-    questions = Poptart::Question.all(type: 'multiple')
-    question = questions.find { |question| question.responses.include?('At Home') }
-    user = Poptart::User.create
-
-    survey = user.create_survey
-    survey.add_question(question).should be
-    second_survey = user.create_survey
-    second_survey.add_question(question).should be
-
-    survey = user.survey_for_id(survey.id)
-    survey_question = survey.survey_questions.first
-    survey_question.answer = 'At Home'
-    survey_question.submit.should be
-
-    survey = user.survey_for_id(second_survey.id)
-    survey_question = survey.survey_questions.first
-    survey_question.answer = 'At Work'
-    survey_question.submit.should be
-
-    answered_questions = user.survey_questions_for_question_id(question.id)
-    answered_questions.map(&:answer).should =~ ['At Home', 'At Work']
-  end
 end

data/spec/requests/answers_spec.rb

@@ -1,24 +1,22 @@
 require 'spec_helper'
 
 describe 'retrieving answers' do
-  xit 'returns answers', :vcr, record: :all do
-    question = Poptart::BooleanQuestion.create(text: text)
+  it "returns all answered survey questions for a question", :vcr do
+    question = Poptart::BooleanQuestion.create("Do you like poptarts?")
     user = Poptart::User.create
-    survey = user.create_survey
-    survey_question = survey.add_question(question)
-    survey_question.answer = true
-    survey_question.submit
 
+    survey = user.create_survey
+    first_survey_question = survey.add_question(question)
     second_survey = user.create_survey
     second_survey_question = second_survey.add_question(question)
-    second_survey_question.answer = false
-    second_survey_question.submit
 
-    answers = question.answers
-    answers.first.answer.should == true
-    answers.created_at.should_not be_nil
+    first_survey_question.answer = true
+    first_survey_question.submit.should be
+
+    second_survey_question.answer = false
+    second_survey_question.submit.should be
 
-    answers.first.answer.should == false
-    answers.last.should_not be_nil
+    survey_questions = user.survey_questions_for_question_id(question.id)
+    survey_questions.map(&:answer).should =~ [true, false]
   end
 end

data/spec/requests/user_management_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe "User Management" do
   it "creates a user", :vcr do
     user = Poptart::User.create
-    user.id.should be
     user.service_user_id.should be
     user.token.should be
   end
@@ -11,7 +10,6 @@ describe "User Management" do
   it "returns a user", :vcr do
     user = Poptart::User.create
     other_user = Poptart::User.for_id(user.service_user_id)
-    user.id.should == other_user.id
     user.service_user_id.should == other_user.service_user_id
   end
 end