poptart 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e454a49d246480fbceba4a7a07fbfbb43ecb6949
-  data.tar.gz: 3688f52a375033dbc60a778f4cee1f9d7321bd57
+  metadata.gz: 805d1e873fdd7fe9a06cdbd4f8753cc6d8900ac0
+  data.tar.gz: 7a7d7ee6954629aea9ae683b5c91598fa524603b
 SHA512:
-  metadata.gz: 9ec9f2b803bfd4ad5a28f0af65a3c5e7b2d5286bb2d938941c9dba4e43175f5643072c6e8a9e8f998a4663de2db5a2f2dc570e7529f1e708eaf1451f5120373b
-  data.tar.gz: 0918d4b46bbc134b55d9e5660a022e28d27928070a12e14760a21a220a8317711905af2fe3a85965475463ecc035867fc2c8fa44eeabd0845f92b751b94ca4c6
+  metadata.gz: 84a0a219316b81765ee869926ca6230b60af2890cb4975e493d86116610b78b213800ab08a85990e2f8921ee4847aa1c4e61b8aa6601ead3492642e74275e819
+  data.tar.gz: 9c5b3e0cc0fd80ba004ddca6dcbf22e8a07e5eab53e2ac949103b38dff69a357364c27ac45c87a3edf44d09e0ef2f00ff501780fb213b708d8484aba9d2dc7ed

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1.3

data/lib/poptart.rb

@@ -41,13 +41,10 @@ require "addressable/template"
 
 require_relative 'version'
 require_relative 'poptart/request'
+require_relative 'poptart/link'
 require_relative 'poptart/model'
 require_relative 'poptart/root'
 require_relative 'poptart/survey'
 require_relative 'poptart/survey_question'
 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/poptart/link.rb

@@ -0,0 +1,9 @@
+class Link
+  attr_reader :rel, :href, :method
+
+  def initialize(href:, rel:, method:)
+    @rel = rel
+    @href = href
+    @method = method
+  end
+end

data/lib/poptart/model.rb

@@ -13,7 +13,13 @@ module Poptart
       end
 
       @id = @params['id']
-      @links = Hashie::Mash.new(@params['_links'])
+
+      @links = []
+      if @params['_links']
+        @params['_links'].each do |link|
+          @links << Link.new(href: link['href'], rel: link['rel'], method: link['method'])
+        end
+      end
     end
 
     def self.root
@@ -26,38 +32,16 @@ module Poptart
       Poptart::Model.root
     end
 
-    def users_url(id: nil, query: nil)
-      template = Addressable::Template.new(links.users.href)
-      template.expand(id: id, query: query).to_s
-    end
-
-    def surveys_url(id: nil, query: nil)
-      template = Addressable::Template.new(links.surveys.href)
-      template.expand(id: id, query: query).to_s
-    end
-
-    def questions_url(id: nil, query: nil)
-      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
+    def url(relation: , method: 'GET', query: nil, survey_id: nil, id: nil)
+      link = find_link(relation, method)
+      template = Addressable::Template.new(link.href)
+      template.expand(survey_id: survey_id, id: id, query: query).to_s
     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
+    def find_link(relation, method)
+      links.find { |link| link.rel == relation && link.method == method }
     end
   end
 end

data/lib/poptart/question.rb

@@ -2,31 +2,39 @@ module Poptart
   class Question < Model
     extend Poptart::Request
 
-    attr_accessor :responses, :freeform, :question_type, :absolute_index, :parent_question_id, :key
+    attr_accessor :responses, :question_type, :key, :text
 
     def initialize(response)
       super
       @responses = params['responses']
-      @freeform = params['freeform']
       @question_type = params['question_type']
-      @absolute_index = params['absolute_index']
-      @parent_question_id = params['parent_question_id']
+      @text = params['text']
       @key = params['key']
     end
 
-    def self.create(text, responses: [], freeform: false, absolute_index: nil, parent_question_id: nil, key: nil)
-      response = post(root.questions_url, question: { question_type: question_type,
-                                                      responses: responses,
-                                                      text: text,
-                                                      freeform: freeform,
-                                                      absolute_index: absolute_index,
-                                                      parent_question_id: parent_question_id,
-                                                      key: key})
+    def self.create(text,
+                    responses: [],
+                    question_type: nil,
+                    key: nil)
+
+      question_data = {
+        'question_type' => question_type,
+        'responses' => responses,
+        'text' => text,
+        'key' => key
+      }
+      url = root.url(relation: 'questions', method: 'POST')
+      response = post(url, 'question' => question_data)
+      new(response)
+    end
+
+    def self.find(id_or_key)
+      response = get(root.url(relation: 'questions', id: id_or_key))
       new(response)
     end
 
     def self.all(params = {})
-      response = get(root.questions_url)
+      response = get(root.url(relation: 'questions'))
       JSON.parse(response.body).map do |question|
         if params[:type]
           if question['question_type'] == params[:type]
@@ -37,9 +45,5 @@ module Poptart
         end
       end.compact
     end
-
-    def freeform?
-      @freeform
-    end
   end
 end

data/lib/poptart/root.rb

@@ -1,6 +1,15 @@
 module Poptart
   class Root < Model
-    attr_accessor :links
+    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/survey.rb

@@ -8,19 +8,27 @@ module Poptart
       @service_user_id = params['service_user_id']
       @completed = params['completed']
 
-      @survey_questions = params['survey_questions'].map do |survey_question|
-        if survey_question['type'] == 'BooleanQuestion'
-          BooleanQuestion.new(survey_question)
-        else
+      if params['survey_questions']
+        @survey_questions = params['survey_questions'].map do |survey_question|
           SurveyQuestion.new(survey_question)
         end
+      else
+        @survey_questions = []
       end
     end
 
-    def add_question(question)
-      response = post(links.survey_questions.post.href, { survey_question: { question_id: question.id } } )
+    def add_survey_question(survey_question)
+      url = url(relation: 'survey-questions', method: 'POST')
+      response = post(url, {
+        'survey_question' => {
+          'question_id' => survey_question.question_id,
+          'responses' => survey_question.responses
+        }
+      })
       if response.status == 201
-        Poptart::SurveyQuestion.new(response).tap { |survey_question| survey_questions << survey_question }
+        survey_question = Poptart::SurveyQuestion.new(response)
+        survey_questions << survey_question
+        survey_question
       end
     end
 
@@ -33,5 +41,24 @@ module Poptart
     def completed?
       @completed
     end
+
+    def self.create
+      url = root.url(relation: 'surveys', method: 'POST')
+      response = post(url)
+      Poptart::Survey.new(response)
+    end
+
+    def self.all
+      response = get(root.url(relation: 'surveys'))
+      JSON.parse(response.body)['surveys'].map do |survey|
+        Poptart::Survey.new(survey)
+      end
+    end
+
+    def self.find(id)
+      url = root.url(relation: 'surveys', id: id)
+      response = get(url)
+      Poptart::Survey.new(response)
+    end
   end
 end

data/lib/poptart/survey_question.rb

@@ -3,17 +3,17 @@ module Poptart
     extend Poptart::Request
     include Poptart::Request
 
-    attr_accessor :text, :answer, :type, :responses, :key
+    attr_accessor :text, :answer, :question_type, :responses, :key, :question_id
 
     def initialize(response)
       super
       @text = params['text']
-      @type = params['type']
-      @freeform = params['freeform']
+      @question_type = params['question_type']
       @responses = params['responses']
       @answer = params['answer']
       @created_at = params['created_at']
       @key = params['key']
+      @question_id = params['question_id']
 
       if @answer == 't'
         @answer = true
@@ -23,31 +23,51 @@ module Poptart
     end
 
     def boolean?
-      type == "boolean"
+      question_type == "boolean"
     end
 
     def multiple?
-      type == "multiple"
+      question_type == "multiple"
     end
 
     def range?
-      type == "range"
+      question_type == "range"
     end
 
     def time?
-      type == "time"
-    end
-
-    def freeform?
-      @freeform == true
+      question_type == "time"
     end
 
     def created_at
       DateTime.parse(@created_at)
     end
 
+    def self.find_all(question_id: nil, key: nil, survey_id: nil)
+      if question_id
+        query = { question_id: question_id }
+      elsif key
+        query = { key: key }
+      elsif survey_id
+        query = { survey_id: survey_id }
+      end
+
+      url = root.url(relation: 'survey-questions-by-query', query: query)
+      response = get(url)
+      JSON.parse(response.body)["survey_questions"].map do |response_body|
+        Poptart::SurveyQuestion.new(response_body)
+      end
+    end
+
     def submit
-      response = put(links.put.href, { id: id, survey_question: { answer: answer} })
+      url = url(method: 'PUT', relation: 'self')
+      response = put(url,
+        {
+          'id' => id,
+          'survey_question' => {
+            'answer' => answer
+          }
+        }
+      )
       response.status == 204
     end
   end

data/lib/poptart/user.rb

@@ -11,33 +11,16 @@ module Poptart
     end
 
     def self.create
-      response = post(root.users_url)
+      url = root.url(relation: 'users', method: 'POST')
+      response = post(url)
       Poptart::User.new(response)
     end
 
-    def self.for_id(service_user_id)
-      url = root.users_url(id: service_user_id)
-      response = get(url)
+    def self.get_user
+      response = get(root.url(relation: 'users'))
       Poptart::User.new(response)
     end
 
-    def create_survey
-      response = post(root.surveys_url, { survey: { service_user_id: service_user_id } })
-      Poptart::Survey.new(response)
-    end
-
-    def create_random_survey
-      url = root.surveys_url(query: {random: true})
-      response = post(url, { survey: { service_user_id: service_user_id } })
-      Poptart::Survey.new(response)
-    end
-
-    def survey_for_id(id)
-      url = root.surveys_url(id: id)
-      response = get(url)
-      Poptart::Survey.new(response)
-    end
-
     def survey_questions_for_question_id(question_id)
       url = root.survey_questions_url(question_id: question_id)
       response = get(url)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Poptart
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/poptart.gemspec

@@ -20,10 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday'
   gem.add_dependency 'addressable'
 
-  gem.add_development_dependency 'bourne', "1.5.0"
-  gem.add_development_dependency 'guard'
-  gem.add_development_dependency 'guard-rspec'
-  gem.add_development_dependency 'mocha', "~> 0.14.0"
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'

data/spec/lib/poptart/model_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe Poptart::Model do
+  class Poptart::TestModel < Poptart::Model; end
+
+  context '.new' do
+    context 'response is a hash' do
+      it 'sets id' do
+        response = { 'id' => 1 }
+        model = Poptart::TestModel.new(response)
+        expect(model.id).to eq(1)
+      end
+
+      it 'sets links' do
+        response = {
+          '_links' => [
+            { 'rel' => 'self',
+              'href' => 'http://example.com'
+            }
+          ]
+        }
+        model = Poptart::TestModel.new(response)
+        expect(model.links.count).to eq(1)
+        link = model.links.first
+        expect(link.rel).to eq('self')
+        expect(link.href).to eq('http://example.com')
+      end
+    end
+
+    context 'response is http response object' do
+      it 'sets id' do
+        response = double(:response, status: 200, body: { 'id' => 1, status: 200 }.to_json)
+        model = Poptart::TestModel.new(response)
+        expect(model.id).to eq(1)
+      end
+
+      it 'sets links' do
+        response = double(:response, status: 200, body: {
+          '_links' => [
+            { 'rel' => 'self',
+              'href' => 'http://example.com'
+            }
+          ]
+        }.to_json)
+
+        model = Poptart::TestModel.new(response)
+        expect(model.links.count).to eq(1)
+        link = model.links.first
+        expect(link.rel).to eq('self')
+        expect(link.href).to eq('http://example.com')
+      end
+    end
+
+    context 'invalid response' do
+      it 'raises unauthorized exception' do
+        response = double(:response, status: 401)
+        expect{
+          Poptart::TestModel.new(response)
+        }.to raise_exception('Unauthorized')
+      end
+    end
+  end
+
+  context '.root' do
+    it 'returns Root' do
+      root_response = double(:response)
+      root = double(:root)
+      allow(Poptart::Model).to receive(:get).with('/').and_return(root_response)
+      allow(Poptart::Root).to receive(:new).with(root_response).and_return(root)
+
+      returned_root = Poptart::TestModel.root
+
+      expect(Poptart::Model).to have_received(:get).with('/')
+      expect(Poptart::Root).to have_received(:new).with(root_response)
+      expect(returned_root).to eq(root)
+    end
+  end
+
+  context '#root' do
+    it 'returns root' do
+      root_response = double(:response)
+      root = double(:root)
+      allow(Poptart::Model).to receive(:get).with('/').and_return(root_response)
+      allow(Poptart::Root).to receive(:new).with(root_response).and_return(root)
+
+      model = Poptart::TestModel.new({})
+      returned_root = model.root
+
+      expect(Poptart::Model).to have_received(:get).with('/')
+      expect(Poptart::Root).to have_received(:new).with(root_response)
+      expect(returned_root).to eq(root)
+    end
+  end
+end
+