MissionHub 1.0rc2 → 1.0rc3

data/README.md

@@ -5,7 +5,7 @@ Consume the MissionHub API easily with this Ruby Gem
 
 Add this line to your application's Gemfile:
 
-    gem 'missionhub'
+    gem 'MissionHub'
 
 And then execute:
 
@@ -13,7 +13,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install missionhub
+    $ gem install MissionHub
 
 ## Usage
 

data/fixtures/vcr_cassettes/auth.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://www.missionhub.com/oauth/access_token
     body:
       encoding: US-ASCII
-      string: grant_type=none&client_id=6&client_secret=05fbcedcf2b2ea3958b359b51796b14b1c04c19a
+      string: grant_type=none&client_id=12&client_secret=83f84763001c1fb4ce96adc4908b9ba285b510d6
     headers: {}
   response:
     status:
@@ -15,7 +15,7 @@ http_interactions:
       Server:
       - nginx/1.0.14
       Date:
-      - Tue, 02 Oct 2012 22:34:39 GMT
+      - Wed, 03 Oct 2012 22:39:16 GMT
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -31,156 +31,18 @@ http_interactions:
       X-Ua-Compatible:
       - IE=Edge,chrome=1
       Etag:
-      - ! '"5433947c658216a0f750764a263167da"'
-      X-Request-Id:
-      - f7c1b81b77d8afd6dc0599de0598cb2a
-      X-Runtime:
-      - '0.201593'
-      X-Rack-Cache:
-      - invalidate, pass
-    body:
-      encoding: US-ASCII
-      string: ! '{"access_token":"11b341eeb9b9d6401944e8310ea82283e3927b1b3a8b77335d0992373b047deb","scope":"contacts,userinfo,contact_assignment,followup_comments,roles,organization_info"}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 22:33:28 GMT
-- request:
-    method: post
-    uri: http://www.missionhub.com/oauth/access_token
-    body:
-      encoding: US-ASCII
-      string: grant_type=none&client_id=6&client_secret=
-    headers: {}
-  response:
-    status:
-      code: 400
-      message: Bad Request
-    headers:
-      Server:
-      - nginx/1.0.14
-      Date:
-      - Tue, 02 Oct 2012 22:34:39 GMT
-      Content-Type:
-      - application/json
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Status:
-      - '400'
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.15
-      Cache-Control:
-      - no-store
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      X-Request-Id:
-      - 830a7ef7ae292f2be4ff646ca5750f5d
-      X-Runtime:
-      - '0.031778'
-      X-Rack-Cache:
-      - invalidate, pass
-    body:
-      encoding: US-ASCII
-      string: ! '{"error":"invalid_client","error_description":"{\"error\": {\"message\":\"Client
-        ID and client secret do not match.\", \"code\": \"52\"}}"}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 22:33:29 GMT
-- request:
-    method: post
-    uri: http://www.missionhub.com/api/v2/contacts.json
-    body:
-      encoding: US-ASCII
-      string: person[firstName]=Test&person[lastName]=User&person[email_address]=mail%40google.com&person[gender]=female&person[current_address_attributes][address1]=123%20Somewhere%20St&person[current_address_attributes][address2]=Dept%202500&person[current_address_attributes][city]=Orlando&person[current_address_attributes][country]=US&person[current_address_attributes][state]=FL&person[current_address_attributes][zip]=32832&answers[4952]=Hello%20World&org_id=6774&user_id=1615180&access_token=11b341eeb9b9d6401944e8310ea82283e3927b1b3a8b77335d0992373b047deb
-    headers: {}
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx/1.0.14
-      Date:
-      - Tue, 02 Oct 2012 22:34:41 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Status:
-      - '200'
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.15
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      Etag:
-      - ! '"8f0ddbec1e2c4a3ee368d905e342a557"'
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      Set-Cookie:
-      - _mh_session=0df192db43584bcb75bb8c65cef20f08; path=/; expires=Thu, 04-Oct-2012
-        22:34:39 GMT; HttpOnly
-      - logged_in=true; path=/
-      X-Request-Id:
-      - 75864fbaa173037b73666f912dd09707
-      X-Runtime:
-      - '0.478109'
-      X-Rack-Cache:
-      - invalidate, pass
-    body:
-      encoding: US-ASCII
-      string: ! '{"id":2592529,"name":"Test User","assignment":{"assigned_to_person":[],"person_assigned_to":[]},"gender":"female","status":"uncontacted","request_org_id":6774,"first_contact_date":"2012-10-02
-        22:34:38 UTC","date_surveyed":"2012-10-02 22:34:38 UTC","organizational_roles":[]}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 22:33:30 GMT
-- request:
-    method: post
-    uri: http://www.missionhub.com/api/v2/contacts.json
-    body:
-      encoding: US-ASCII
-      string: person[firstName]=Test&person[lastName]=User&person[email_address]=mail%40google.com&person[gender]=female&person[current_address_attributes][address1]=123%20Somewhere%20St&person[current_address_attributes][address2]=Dept%202500&person[current_address_attributes][city]=Orlando&person[current_address_attributes][country]=US&person[current_address_attributes][state]=FL&person[current_address_attributes][zip]=32832&answers[4952]=Hello%20World&answers[4953]=R2&answers[4955]=D2&answers[4954][2]=C3&answers[4954][3]=C4&org_id=6774&user_id=1615180&access_token=11b341eeb9b9d6401944e8310ea82283e3927b1b3a8b77335d0992373b047deb
-    headers: {}
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx/1.0.14
-      Date:
-      - Tue, 02 Oct 2012 22:38:59 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Status:
-      - '200'
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.15
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      Etag:
-      - ! '"6fb7f46d4c45fe2d3382eaaf2a12bbcf"'
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      Set-Cookie:
-      - _mh_session=eaf0f05cdb6efc004b0a1d1860a2032a; path=/; expires=Thu, 04-Oct-2012
-        22:38:14 GMT; HttpOnly
-      - logged_in=true; path=/
+      - ! '"d0d53d93eea872825c2d3ddf4602b136"'
       X-Request-Id:
-      - c2c3b8a9648d3bbf1e204e0c38a336a4
+      - 349184278b44962580048593d664a0cc
       X-Runtime:
-      - '0.901663'
+      - '0.021574'
       X-Rack-Cache:
       - invalidate, pass
     body:
       encoding: US-ASCII
-      string: ! '{"id":2592532,"name":"Test User","assignment":{"assigned_to_person":[],"person_assigned_to":[]},"gender":"female","status":"uncontacted","request_org_id":6774,"first_contact_date":"2012-10-02
-        22:38:14 UTC","date_surveyed":"2012-10-02 22:38:14 UTC","organizational_roles":[]}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 22:37:48 GMT
+      string: ! '{"access_token":"b08f825c2543643e561ba92b296028c4de2887a17179269c311ba680a96574d6","scope":"contacts,userinfo,contact_assignment,followup_comments,roles,organization_info"}'
+    http_version:
+  recorded_at: Wed, 03 Oct 2012 22:38:06 GMT
 - request:
     method: post
     uri: http://www.missionhub.com/oauth/access_token
@@ -196,7 +58,7 @@ http_interactions:
       Server:
       - nginx/1.0.14
       Date:
-      - Tue, 02 Oct 2012 23:12:32 GMT
+      - Wed, 03 Oct 2012 22:39:17 GMT
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -212,66 +74,23 @@ http_interactions:
       X-Ua-Compatible:
       - IE=Edge,chrome=1
       X-Request-Id:
-      - 91024aeaccf492cc12391d87befaa36b
+      - bc57010e2ca62e9c3ac610e8fd5f7444
       X-Runtime:
-      - '0.004484'
+      - '0.052999'
       X-Rack-Cache:
       - invalidate, pass
     body:
       encoding: US-ASCII
       string: ! '{"error":"invalid_client","error_description":"{\"error\": {\"message\":\"Client
         ID and client secret do not match.\", \"code\": \"52\"}}"}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 23:11:21 GMT
-- request:
-    method: post
-    uri: http://www.missionhub.com/oauth/access_token
-    body:
-      encoding: US-ASCII
-      string: grant_type=none&client_id=12&client_secret=83f84763001c1fb4ce96adc4908b9ba285b510d6
-    headers: {}
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx/1.0.14
-      Date:
-      - Tue, 02 Oct 2012 23:12:32 GMT
-      Content-Type:
-      - application/json
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Status:
-      - '200'
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.15
-      Cache-Control:
-      - no-store
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      Etag:
-      - ! '"8e7d0338744d5a62ee5c240f3f2ebb30"'
-      X-Request-Id:
-      - 399d5091e15a9b4621d55060d10b3f58
-      X-Runtime:
-      - '0.012341'
-      X-Rack-Cache:
-      - invalidate, pass
-    body:
-      encoding: US-ASCII
-      string: ! '{"access_token":"03a6f575b13657a0dad1b6ff07a099d9088fed26617758dd374b0c985a502a79","scope":"contacts,userinfo,contact_assignment,followup_comments,roles,organization_info"}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 23:11:22 GMT
+    http_version:
+  recorded_at: Wed, 03 Oct 2012 22:38:07 GMT
 - request:
     method: post
     uri: http://www.missionhub.com/api/v2/contacts.json
     body:
       encoding: US-ASCII
-      string: person[firstName]=Test&person[lastName]=User&person[email_address]=mail%40google.com&person[gender]=female&person[current_address_attributes][address1]=123%20Somewhere%20St&person[current_address_attributes][address2]=Dept%202500&person[current_address_attributes][city]=Orlando&person[current_address_attributes][country]=US&person[current_address_attributes][state]=FL&person[current_address_attributes][zip]=32832&answers[4952]=Hello%20World&answers[4953]=R2&answers[4955]=D2&answers[4954][2]=C3&answers[4954][3]=C4&org_id=5522&user_id=1615180&access_token=03a6f575b13657a0dad1b6ff07a099d9088fed26617758dd374b0c985a502a79
+      string: person[firstName]=Test&person[lastName]=User&person[gender]=female&person[current_address_attributes][address1]=123%20Somewhere%20St&person[current_address_attributes][address2]=Dept%202500&person[current_address_attributes][city]=Orlando&person[current_address_attributes][country]=US&person[current_address_attributes][state]=FL&person[current_address_attributes][zip]=32832&person[email_address][email]=mail%40google.com&person[email_address][primary]=0&person[phone_number][number]=021021021&person[phone_number][primary]=0&person[phone_number][location]=mobile&answers[4952]=Hello%20World&answers[4953]=R2&answers[4955]=D2&answers[4954][2]=C3&answers[4954][3]=C4&org_id=5522&user_id=1615180&access_token=b08f825c2543643e561ba92b296028c4de2887a17179269c311ba680a96574d6
     headers: {}
   response:
     status:
@@ -281,7 +100,7 @@ http_interactions:
       Server:
       - nginx/1.0.14
       Date:
-      - Tue, 02 Oct 2012 23:12:50 GMT
+      - Wed, 03 Oct 2012 22:39:18 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
@@ -295,22 +114,22 @@ http_interactions:
       X-Ua-Compatible:
       - IE=Edge,chrome=1
       Etag:
-      - ! '"fa696d44203f05b4311fbf064e85e2d0"'
+      - ! '"3dcdd09d5cbaecb64214082017b4217f"'
       Cache-Control:
       - max-age=0, private, must-revalidate
       Set-Cookie:
-      - _mh_session=76da570805214bd26bb6301dac676ad5; path=/; expires=Thu, 04-Oct-2012
-        23:12:05 GMT; HttpOnly
+      - _mh_session=442712f2622c96725ffa979ebf420216; path=/; expires=Fri, 05-Oct-2012
+        22:39:16 GMT; HttpOnly
+      - logged_in=true; path=/
       X-Request-Id:
-      - 2fecf45d93bc215c4e407a6c5cfa8ad0
+      - fc4796e6abe7872a110570a706b0bf12
       X-Runtime:
-      - '5.431635'
+      - '0.158785'
       X-Rack-Cache:
       - invalidate, pass
     body:
       encoding: US-ASCII
-      string: ! '{"meta":{"request_time":1349219525},"error":"undefined method `user''
-        for nil:NilClass"}'
-    http_version: 
-  recorded_at: Tue, 02 Oct 2012 23:11:39 GMT
+      string: ! '{"id":2592834,"name":"Test User","assignment":{"assigned_to_person":[],"person_assigned_to":[]},"gender":"female","request_org_id":5522,"organizational_roles":[]}'
+    http_version:
+  recorded_at: Wed, 03 Oct 2012 22:38:08 GMT
 recorded_with: VCR 2.2.5

data/lib/missionhub/api.rb

@@ -33,7 +33,11 @@ module MissionHub
       person_hash.delete("answers")
       options = {:body => { :person => person_hash, :answers => person.answers, :org_id => MissionHub.org_id, :user_id => 1615180, :access_token => @access_token} }
       response = self.class.post('/api/v2/contacts.json', options)
-      response["id"].to_i
+      if !response.parsed_response['error'].nil?
+        raise response.parsed_response['error']
+      else
+        response.parsed_response['id'].to_i
+      end
     end
   end
 end

data/lib/missionhub/person.rb

@@ -2,7 +2,7 @@ require 'resolv'
 
 module MissionHub
   class Person
-    attr_accessor :current_address_attributes, :phone_number, :email_address, :gender, :firstName, :lastName, :answers
+    attr_accessor :current_address_attributes, :phone_number, :email_address, :gender, :firstName, :lastName, :answers, :phone_number
 
     #align variable naming with MissionHub API
     alias :first_name= :firstName=
@@ -11,8 +11,16 @@ module MissionHub
     alias :last_name= :lastName=
     alias :last_name :lastName
 
+    alias :phone= :phone_number=
+    alias :phone :phone_number
+
     alias :address :current_address_attributes
 
+    def phone=(phone)
+      raise "Phone must be a MissionHub::Person::Phone" unless phone.kind_of? MissionHub::Person::Phone
+      @phone_number = phone
+    end
+
     def address=(address)
       raise "Address must be a MissionHub::Person::Address" unless address.kind_of? MissionHub::Person::Address
       @current_address_attributes = address
@@ -43,13 +51,17 @@ module MissionHub
       @current_address_attributes = address
     end
 
+    def email_address
+      @email_address[:email]
+    end
+
     def email_address=(email)
       unless email.empty?
         unless email =~ /^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
             raise "Email does not appear to be valid format"
         else
             raise "Email domain name appears to be incorrect" unless validate_email_domain(email)
-            @email_address = email
+            @email_address = {:email => email, :primary => 0}
         end
       else
         raise "Email appears to be empty"
@@ -81,10 +93,10 @@ module MissionHub
       self.instance_variables.each do |var|
         temp = self.instance_variable_get(var)
         if not temp.nil? and var.to_s != "@mx"
-          if not temp.kind_of? MissionHub::Person::Address
-            hash_to_return[var.to_s.gsub("@","")] = temp
-          else
+          if temp.kind_of? MissionHub::Person::Address or temp.kind_of? MissionHub::Person::Phone
             hash_to_return[var.to_s.gsub("@","")] = temp.hash
+          else
+            hash_to_return[var.to_s.gsub("@","")] = temp
           end
         end
       end

data/lib/missionhub/version.rb

@@ -1,3 +1,3 @@
 module MissionHub
-  VERSION = "1.0rc2"
+  VERSION = "1.0rc3"
 end

data/spec/lib/missionhub/api_spec.rb

@@ -83,6 +83,11 @@ describe MissionHub::API do
       person.set_answer(4955, "D2")
       hash_answer = {"2" => "C3", "3" => "C4"}
       person.set_answer(4954, hash_answer)
+      phone = MissionHub::Person::Phone.new
+      phone.number = "021021021"
+      phone.primary = 0
+      phone.location = "mobile"
+      person.phone = phone
       response = api.create_person(person)
       response.must_be_instance_of Fixnum
     end

data/spec/lib/missionhub/person_spec.rb

@@ -16,6 +16,19 @@ describe MissionHub::Person do
     end
   end
 
+  describe "Set Phone" do
+    it "must throw exception when phone is wrong type" do
+      phone_error = lambda { person.phone = '' }
+      phone_error.must_raise RuntimeError
+    end
+
+    it "must be able to set phone" do
+      phone = MissionHub::Person::Phone.new
+      person.phone = phone
+      person.phone.must_equal phone
+    end
+  end
+
   describe "Set Email" do
     it "must throw exception when email is empty" do
       email_error = lambda { person.email_address = '' }

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ Turn.config do |c|
 end
 
 MissionHub.config do |c|
-  # :outline  - turn's original case/test outline mode [default]
   c.base_uri = 'http://www.missionhub.com/'
   c.client_id = 12
   c.client_secret = '83f84763001c1fb4ce96adc4908b9ba285b510d6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MissionHub
 version: !ruby/object:Gem::Version
-  version: 1.0rc2
+  version: 1.0rc3
   prerelease: 3
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest