poptart 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b322723a131db8bb8a376500573598aee988e0
-  data.tar.gz: 80e1c8afe85c907e2d7d1a577717e8f324f8fcdf
+  metadata.gz: f25834bcd5de7c7d86e441b4d9e4934db4beb1b4
+  data.tar.gz: f5778a090c1b45c9e433763533c1227f439fcfcb
 SHA512:
-  metadata.gz: 073ecece14fb149678c5989d5e54b7eec2458cd0902b0f12a011af374fe9a67aa48c4455c5ae7c91a5e85bda9bc6bb8842c03172b652f15c27d77499cf2f422e
-  data.tar.gz: 6e6fa0b9bc27db04f054a2800e8d326b2be9df08abfe1583272d59821321a34e370ad7daf997079b2d5450215adc1588bcc622611e6a2d51be6a656d967f70f0
+  metadata.gz: b1742e82de647cae81f9d9e4eb91e737b44e7b708df50810830e8ca8677d390b709a511bec4d331aa9a3d0d45be6fac8f4be74505852d4e0e8fae2f9ed0ada36
+  data.tar.gz: 76a51e841b06c6df233cafea45d3701a3c2f6eeb1821090167cb4afc923e0c4d366e734adf1d54b2e6071b6b6b96f40778e19a29590d2ca4c04e1880a333201e

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    poptart (0.0.4)
+    poptart (0.0.5)
       activesupport
+      addressable
       faraday
       hashie
 
@@ -37,8 +38,8 @@ GEM
     guard-rspec (4.0.0)
       guard (~> 2.0)
       rspec (~> 2.14)
-    hashie (3.1.0)
-    i18n (0.6.9)
+    hashie (3.3.1)
+    i18n (0.6.11)
     json (1.8.1)
     listen (2.1.0)
       celluloid (>= 0.15.2)

data/lib/poptart/model.rb

@@ -1,6 +1,8 @@
 module Poptart
   class Model
-    attr_accessor :id, :links, :params
+    extend Poptart::Request
+
+    attr_accessor :id, :links, :params, :root
 
     def initialize(response)
       if response.respond_to?(:has_key?)
@@ -13,5 +15,51 @@ module Poptart
       @id = @params['id']
       @links = Hashie::Mash.new(@params['_links'])
     end
+
+    def self.root
+      return @root if @root
+      response =  get("/")
+      @root = Poptart::Root.new(response)
+    end
+
+    def root
+      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)
+    end
+
+    def surveys_url(id: nil, query: nil)
+      build_url(links.surveys.href, id: id, query: query)
+    end
+
+    def questions_url(id: nil, query: nil)
+      build_url(links.questions.href, id: id, query: query)
+    end
+
+    private
+
+    def root_uri
+      @root_uri = URI.parse(root.links.self.href)
+    end
+
+    def scheme
+      root_uri.scheme
+    end
+
+    def host
+      root_uri.port ? "#{root_uri.host}:#{root_uri.port}" : root_uri.host
+    end
   end
 end

data/lib/poptart/question.rb

@@ -11,8 +11,7 @@ module Poptart
     end
 
     def self.all(params = {})
-      root = Poptart::Root.get_root
-      response = get(root.links.questions.href)
+      response = get(root.questions_url)
       JSON.parse(response.body).map do |question|
         if params[:type]
           if question['question_type'] == params[:type]

data/lib/poptart/request.rb

@@ -19,7 +19,7 @@ module Poptart
       end
     end
 
-    def post(url, data, headers = {})
+    def post(url, data = {}, headers = {})
       connection.post do |req|
         req.url(url)
         req.body = data.to_json if data

data/lib/poptart/root.rb

@@ -1,11 +1,6 @@
 module Poptart
   class Root < Model
-    extend Poptart::Request
     attr_accessor :links
 
-    def self.get_root
-      response =  get("/")
-      Poptart::Root.new(response)
-    end
   end
 end

data/lib/poptart/survey.rb

@@ -6,6 +6,7 @@ module Poptart
     def initialize(response)
       super
       @user_id = params['user_id']
+      @completed = params['completed']
 
       @survey_questions = params['survey_questions'].map do |survey_question|
         if survey_question['type'] == 'BooleanQuestion'
@@ -17,8 +18,8 @@ module Poptart
     end
 
     def add_question(question)
-      response = post("#{links.self.href}/survey_questions",
-                                      { survey_question: { question_id: question.id } } )
+      url = build_url(links.survey_questions.post.href)
+      response = post(url, { survey_question: { question_id: question.id } } )
       response.status == 201
     end
 
@@ -28,10 +29,8 @@ module Poptart
       end
     end
 
-    def next_question
-      if links['next']
-        SurveyQuestion.for_url(links['next']['href'])
-      end
+    def completed?
+      @completed
     end
   end
 end

data/lib/poptart/survey_question.rb

@@ -35,7 +35,8 @@ module Poptart
     end
 
     def submit
-      response = put(links.submit.href, { id: id, survey_question: { answer: answer} })
+      url = build_url(links.put.href)
+      response = put(url, { id: id, survey_question: { answer: answer} })
       response.status == 204
     end
   end

data/lib/poptart/user.rb

@@ -2,39 +2,39 @@ module Poptart
   class User < Model
     extend Poptart::Request
     include Poptart::Request
-    attr_accessor :external_user_id, :token
+    attr_accessor :service_user_id, :token
 
     def initialize(response)
       super
-      @external_user_id = params['external_user_id']
+      @service_user_id = params['service_user_id']
       @token = params['token']
     end
 
-    def self.create(external_user_id)
-      root = Poptart::Root.get_root
-      response = post(root.links.users.href, user: { external_user_id: external_user_id })
+    def self.create
+      response = post(root.users_url)
       Poptart::User.new(response)
     end
 
-    def self.for_id(external_user_id)
-      root = Poptart::Root.get_root
-      response = get("#{root.links.users.href}/#{external_user_id}")
+    def self.for_id(service_user_id)
+      url = root.users_url(id: service_user_id)
+      response = get(url)
       Poptart::User.new(response)
     end
 
     def create_survey
-      root = Poptart::Root.get_root
-      response = post(root.links.surveys.href, survey: { user_id: id })
+      response = post(root.surveys_url, survey: { user_id: id })
       Poptart::Survey.new(response)
     end
 
     def create_random_survey
-      response = post("/api/surveys?random=true", survey: { user_id: id })
+      url = root.surveys_url(query: {random: true})
+      response = post(url, survey: { user_id: id })
       Poptart::Survey.new(response)
     end
 
     def survey_for_id(id)
-      response = get("/api/surveys/#{id}")
+      url = root.surveys_url(id: id)
+      response = get(url)
       Poptart::Survey.new(response)
     end
 
@@ -42,5 +42,9 @@ module Poptart
       response = get(url)
       Survey.new.extend(SurveyRepresenter).from_json(response.body)
     end
+
+    def survey_questions_for_question_id(question_id)
+
+    end
   end
 end

data/lib/poptart.rb

@@ -19,10 +19,11 @@ end
 require 'faraday'
 require 'json'
 require 'hashie'
+require "addressable/template"
 
 require_relative 'version'
-require_relative 'poptart/model'
 require_relative 'poptart/request'
+require_relative 'poptart/model'
 require_relative 'poptart/root'
 require_relative 'poptart/survey'
 require_relative 'poptart/survey_question'

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Poptart
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/poptart.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport'
   gem.add_dependency 'hashie'
   gem.add_dependency 'faraday'
+  gem.add_dependency 'addressable'
 
   gem.add_development_dependency 'bourne', "1.5.0"
   gem.add_development_dependency 'guard'

data/spec/requests/answering_survey_questions_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe 'Answering survey questions', :vcr do
+describe 'Answering survey questions' do
   it "creates and returns an empty survey", :vcr do
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_survey
     survey.user_id.should == user.id
     survey.survey_questions.count.should == 0
   end
 
   it "creates and returns a random question survey", :vcr do
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_random_survey
     survey.user_id.should == user.id
-    survey.survey_questions.count.should == 6
+    survey.survey_questions.count.should == 5
   end
 
   it "answers a survey question", :vcr do
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_random_survey
     survey_question = survey.survey_questions.first
     survey_question.text.should be
@@ -29,7 +29,7 @@ describe 'Answering survey questions', :vcr do
 
   it "answers a survey question", :vcr do
     boolean_questions = Poptart::Question.all(type: 'boolean')
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_survey
     survey.add_question(boolean_questions.first).should be
 
@@ -49,7 +49,7 @@ describe 'Answering survey questions', :vcr do
   it "answers a multiple choice question", :vcr do
     questions = Poptart::Question.all(type: 'multiple')
     question = questions.find { |question| question.responses.include?('At Home') }
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_survey
     survey.add_question(question).should be
 
@@ -64,14 +64,37 @@ describe 'Answering survey questions', :vcr do
 
     survey = user.survey_for_id(survey.id)
     survey.survey_questions.first.answer.should == 'At Home'
-    survey.completed?.should be
   end
 
   it "finds survey question for id", :vcr do
-    user = Poptart::User.create(42)
+    user = Poptart::User.create
     survey = user.create_random_survey
     first_survey_question = survey.survey_questions.first
     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/root_spec.rb

@@ -1,8 +1,11 @@
 require 'spec_helper'
 
 describe Poptart::Root do
-  it "returns survey links", :vcr do
-    root = Poptart::Root.get_root
-    root.links.self.href.should == 'http://localhost:3000/api'
+  it "builds urls", :vcr do
+    root = Poptart::Root.root
+    root.build_url('api/questions').should == 'http://localhost:3000/api/questions/'
+    root.build_url('api/questions', id: 1).should == 'http://localhost:3000/api/questions/1'
+    root.build_url('api/questions', id: 1, nested_resource: 'poptarts').should == 'http://localhost:3000/api/questions/1/poptarts'
+    root.build_url('api/questions', query: {space: 'cat'}).should == 'http://localhost:3000/api/questions/?space=cat'
   end
 end

data/spec/requests/user_management_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe "User Management", :vcr do
-  it "creates a user" do
-    user = Poptart::User.create(42)
+describe "User Management" do
+  it "creates a user", :vcr do
+    user = Poptart::User.create
     user.id.should be
-    user.external_user_id.should == 42
+    user.service_user_id.should be
     user.token.should be
   end
 
-  it "returns a user" do
-    user = Poptart::User.create(43)
-    other_user = Poptart::User.for_id(user.external_user_id)
+  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.external_user_id.should == other_user.external_user_id
+    user.service_user_id.should == other_user.service_user_id
   end
 end