intercom 3.9.5 → 4.0.0

data/spec/unit/intercom/admin_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 describe "Intercom::Admin" do
-  let (:client) { Intercom::Client.new(token: 'token') }
+  let(:client) { Intercom::Client.new(token: 'token') }
 
   it "returns a CollectionProxy for all without making any requests" do
     client.expects(:execute_request).never
     all = client.admins.all
-    all.must_be_instance_of(Intercom::ClientCollectionProxy)
+    _(all).must_be_instance_of(Intercom::ClientCollectionProxy)
   end
 
   it "gets me (access token method only)" do

data/spec/unit/intercom/base_collection_proxy_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Intercom::BaseCollectionProxy do
+  let(:client) { Intercom::Client.new(token: 'token') }
+
+  it "stops iterating if no starting after value" do
+    client.expects(:get).with("/contacts", {}). returns(page_of_contacts(false))
+    emails = []
+    client.contacts.all.each { |contact| emails << contact.email }
+    _(emails).must_equal %w[test1@example.com test2@example.com test3@example.com]
+  end
+
+  it "keeps iterating if starting after value" do
+    client.expects(:get).with("/contacts", {}).returns(page_of_contacts(true))
+    client.expects(:get).with('/contacts', { starting_after: "EnCrYpTeDsTrInG" }).returns(page_of_contacts(false))
+    emails = []
+    client.contacts.all.each { |contact| emails << contact.email }
+  end
+
+  it "supports indexed array access" do
+    client.expects(:get).with("/contacts", {}).returns(page_of_contacts(false))
+    _(client.contacts.all[0].email).must_equal "test1@example.com"
+  end
+
+  it "supports map" do
+    client.expects(:get).with("/contacts", {}).returns(page_of_contacts(false))
+    emails = client.contacts.all.map { |contact| contact.email }
+    _(emails).must_equal %w[test1@example.com test2@example.com test3@example.com]
+  end
+end

data/spec/unit/intercom/client_collection_proxy_spec.rb

@@ -1,80 +1,80 @@
 require "spec_helper"
 
 describe Intercom::ClientCollectionProxy do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
+  let(:client) { Intercom::Client.new(token: 'token') }
 
   it "stops iterating if no next link" do
-    client.expects(:get).with("/users", {}).returns(page_of_users(false))
-    emails = []
-    client.users.all.each { |user| emails << user.email }
-    emails.must_equal %W(user1@example.com user2@example.com user3@example.com)
+    client.expects(:get).with("/companies", {}).returns(page_of_companies(false))
+    names = []
+    client.companies.all.each { |company| names << company.name }
+    _(names).must_equal %W(company1 company2 company3)
   end
 
   it "keeps iterating if next link" do
-    client.expects(:get).with("/users", {}).returns(page_of_users(true))
-    client.expects(:get).with('https://api.intercom.io/users?per_page=50&page=2', {}).returns(page_of_users(false))
-    emails = []
-    client.users.all.each { |user| emails << user.email }
+    client.expects(:get).with("/companies", {}).returns(page_of_companies(true))
+    client.expects(:get).with('https://api.intercom.io/companies?per_page=50&page=2', {}).returns(page_of_companies(false))
+    names = []
+    client.companies.all.each { |company| names << company.name }
   end
 
   it "supports indexed array access" do
-    client.expects(:get).with("/users", {}).returns(page_of_users(false))
-    client.users.all[0].email.must_equal 'user1@example.com'
+    client.expects(:get).with("/companies", {}).returns(page_of_companies(false))
+    _(client.companies.all[0].name).must_equal 'company1'
   end
 
   it "supports map" do
-    client.expects(:get).with("/users", {}).returns(page_of_users(false))
-    emails = client.users.all.map { |user| user.email }
-    emails.must_equal %W(user1@example.com user2@example.com user3@example.com)
+    client.expects(:get).with("/companies", {}).returns(page_of_companies(false))
+    names = client.companies.all.map { |company| company.name }
+    _(names).must_equal %W(company1 company2 company3)
   end
 
   it "supports querying" do
-    client.expects(:get).with("/users", {:tag_name => 'Taggart J'}).returns(page_of_users(false))
-    client.users.find_all(:tag_name => 'Taggart J').map(&:email).must_equal %W(user1@example.com user2@example.com user3@example.com)
+    client.expects(:get).with("/companies", {:tag_name => 'Taggart J'}).returns(page_of_companies(false))
+    _(client.companies.find_all(:tag_name => 'Taggart J').map(&:name)).must_equal %W(company1 company2 company3)
   end
 
   it "supports single page pagination" do
-    users = [test_user("user1@example.com"), test_user("user2@example.com"), test_user("user3@example.com"),
-     test_user("user4@example.com"), test_user("user5@example.com"), test_user("user6@example.com"),
-     test_user("user7@example.com"), test_user("user8@example.com"), test_user("user9@example.com"),
-     test_user("user10@example.com")]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 10, :page => 1}).returns(users_pagination(include_next_link: false, per_page: 10, page: 1, total_pages: 1, total_count: 10, user_list: users))
-    result = client.users.find_all(:type=>'users', :per_page => 10, :page => 1).map {|user| user.email }
-    result.must_equal %W(user1@example.com user2@example.com user3@example.com user4@example.com user5@example.com user6@example.com user7@example.com user8@example.com user9@example.com user10@example.com)
+    companies = [test_company("company1"), test_company("company2"), test_company("company3"),
+     test_company("company4"), test_company("company5"), test_company("company6"),
+     test_company("company7"), test_company("company8"), test_company("company9"),
+     test_company("company10")]
+    client.expects(:get).with("/companies", {:type=>'companies', :per_page => 10, :page => 1}).returns(companies_pagination(include_next_link: false, per_page: 10, page: 1, total_pages: 1, total_count: 10, company_list: companies))
+    result = client.companies.find_all(:type=>'companies', :per_page => 10, :page => 1).map {|company| company.name }
+    _(result).must_equal %W(company1 company2 company3 company4 company5 company6 company7 company8 company9 company10)
   end
 
   it "supports multi page pagination" do
-    users = [test_user("user3@example.com"), test_user("user4@example.com")]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 3}).returns(users_pagination(include_next_link: true, per_page: 2, page: 3, total_pages: 5, total_count: 10, user_list: users))
-    result = client.users.find_all(:type=>'users', :per_page => 2, :page => 3).map {|user| user.email }
-    result.must_equal %W(user3@example.com user4@example.com)
+    companies = [test_company("company3"), test_company("company4")]
+    client.expects(:get).with("/companies", {:type=>'companies', :per_page => 2, :page => 3}).returns(companies_pagination(include_next_link: true, per_page: 2, page: 3, total_pages: 5, total_count: 10, company_list: companies))
+    result = client.companies.find_all(:type=>'companies', :per_page => 2, :page => 3).map {|company| company.name }
+    _(result).must_equal %W(company3 company4)
   end
 
   it "works with page out of range request" do
-    users = []
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 30}).returns(users_pagination(include_next_link: true, per_page: 2, page: 30, total_pages: 2, total_count: 3, user_list: users))
-    result = client.users.find_all(:type=>'users', :per_page => 2, :page => 30).map {|user| user.email }
-    result.must_equal %W()
+    companies = []
+    client.expects(:get).with("/companies", {:type=>'companies', :per_page => 2, :page => 30}).returns(companies_pagination(include_next_link: true, per_page: 2, page: 30, total_pages: 2, total_count: 3, company_list: companies))
+    result = client.companies.find_all(:type=>'companies', :per_page => 2, :page => 30).map {|company| company.name }
+    _(result).must_equal %W()
   end
 
   it "works with asc order" do
     test_date=1457337600
     time_increment=1000
-    users = [test_user_dates(email="user1@example.com", created_at=test_date), test_user_dates(email="user2@example.com", created_at=test_date-time_increment),
-             test_user_dates(email="user3@example.com", created_at=test_date-2*time_increment), test_user_dates(email="user4@example.com", created_at=test_date-3*time_increment)]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at"}).returns(users_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, user_list: users))
-    result = client.users.find_all(:type=>'users', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at").map(&:email)
-    result.must_equal %W(user1@example.com user2@example.com user3@example.com user4@example.com)
+    companies = [test_company_dates(name="company1", created_at=test_date), test_company_dates(name="company2", created_at=test_date-time_increment),
+             test_company_dates(name="company3", created_at=test_date-2*time_increment), test_company_dates(name="company4", created_at=test_date-3*time_increment)]
+    client.expects(:get).with("/companies", {:type=>'companies', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at"}).returns(companies_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, company_list: companies))
+    result = client.companies.find_all(:type=>'companies', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at").map(&:name)
+    _(result).must_equal %W(company1 company2 company3 company4)
   end
 
   it "works with desc order" do
     test_date=1457337600
     time_increment=1000
-    users = [test_user_dates(email="user4@example.com", created_at=3*test_date), test_user_dates(email="user3@example.com", created_at=test_date-2*time_increment),
-             test_user_dates(email="user2@example.com", created_at=test_date-time_increment), test_user_dates(email="user1@example.com", created_at=test_date)]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at"}).returns(users_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, user_list: users))
-    result = client.users.find_all(:type=>'users', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at").map {|user| user.email }
-    result.must_equal %W(user4@example.com user3@example.com user2@example.com user1@example.com)
+    companies = [test_company_dates(name="company4", created_at=3*test_date), test_company_dates(name="company3", created_at=test_date-2*time_increment),
+             test_company_dates(name="company2", created_at=test_date-time_increment), test_company_dates(name="company1", created_at=test_date)]
+    client.expects(:get).with("/companies", {:type=>'companies', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at"}).returns(companies_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, company_list: companies))
+    result = client.companies.find_all(:type=>'companies', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at").map {|company| company.name }
+    _(result).must_equal %W(company4 company3 company2 company1)
   end
 
 end

data/spec/unit/intercom/client_spec.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Intercom
   describe Client do
-    let(:app_id) { 'myappid' }
-    let(:api_key) { 'myapikey' }
+    let(:token) { 'my_access_token' }
     let(:client) do
       Client.new(
-        app_id: app_id,
-        api_key: api_key,
+        token: token,
         handle_rate_limit: true
       )
     end
 
     it 'should set the base url' do
-      client.base_url.must_equal('https://api.intercom.io')
+      _(client.base_url).must_equal('https://api.intercom.io')
     end
 
     it 'should have handle_rate_limit set' do
@@ -22,34 +22,34 @@ module Intercom
 
     it 'should be able to change the base url' do
       prev = client.options(Intercom::Client.set_base_url('https://mymockintercom.io'))
-      client.base_url.must_equal('https://mymockintercom.io')
+      _(client.base_url).must_equal('https://mymockintercom.io')
       client.options(prev)
-      client.base_url.must_equal('https://api.intercom.io')
+      _(client.base_url).must_equal('https://api.intercom.io')
     end
 
     it 'should be able to change the timeouts' do
       prev = client.options(Intercom::Client.set_timeouts(open_timeout: 10, read_timeout: 15))
-      client.timeouts.must_equal(open_timeout: 10, read_timeout: 15)
+      _(client.timeouts).must_equal(open_timeout: 10, read_timeout: 15)
       client.options(prev)
-      client.timeouts.must_equal(open_timeout: 30, read_timeout: 90)
+      _(client.timeouts).must_equal(open_timeout: 30, read_timeout: 90)
     end
 
     it 'should be able to change the open timeout individually' do
       prev = client.options(Intercom::Client.set_timeouts(open_timeout: 50))
-      client.timeouts.must_equal(open_timeout: 50, read_timeout: 90)
+      _(client.timeouts).must_equal(open_timeout: 50, read_timeout: 90)
       client.options(prev)
-      client.timeouts.must_equal(open_timeout: 30, read_timeout: 90)
+      _(client.timeouts).must_equal(open_timeout: 30, read_timeout: 90)
     end
 
     it 'should be able to change the read timeout individually' do
       prev = client.options(Intercom::Client.set_timeouts(read_timeout: 50))
-      client.timeouts.must_equal(open_timeout: 30, read_timeout: 50)
+      _(client.timeouts).must_equal(open_timeout: 30, read_timeout: 50)
       client.options(prev)
-      client.timeouts.must_equal(open_timeout: 30, read_timeout: 90)
+      _(client.timeouts).must_equal(open_timeout: 30, read_timeout: 90)
     end
 
     it 'should raise on nil credentials' do
-      proc { Client.new(app_id: nil, api_key: nil) }.must_raise MisconfiguredClientError
+      _(proc { Client.new(token: nil) }).must_raise MisconfiguredClientError
     end
 
     describe 'API version' do
@@ -58,42 +58,41 @@ module Intercom
       end
 
       it 'allows api version to be provided' do
-        Client.new(app_id: app_id, api_key: api_key, api_version: '1.0').api_version.must_equal('1.0')
+        _(Client.new(token: token, api_version: '2.0').api_version).must_equal('2.0')
       end
 
       it 'allows api version to be nil' do
         # matches default behavior, and will honor version set in the Developer Hub
-        assert_nil(Client.new(app_id: app_id, api_key: api_key, api_version: nil).api_version)
+        assert_nil(Client.new(token: token, api_version: nil).api_version)
       end
 
       it 'allows api version to be Unstable' do
-        Client.new(app_id: app_id, api_key: api_key, api_version: 'Unstable').api_version.must_equal('Unstable')
+        _(Client.new(token: token, api_version: 'Unstable').api_version).must_equal('Unstable')
       end
 
       it 'raises on invalid api version' do
-        proc { Client.new(app_id: app_id, api_key: api_key, api_version: '0.2') }.must_raise MisconfiguredClientError
+        _(proc { Client.new(token: token, api_version: '0.2') }).must_raise MisconfiguredClientError
       end
 
       it 'raises on empty api version' do
-        proc { Client.new(app_id: app_id, api_key: api_key, api_version: '') }.must_raise MisconfiguredClientError
+        _(proc { Client.new(token: token, api_version: '') }).must_raise MisconfiguredClientError
       end
 
-      it "assigns works" do
-        stub_request(:any, "https://api.intercom.io/users?id=123").to_return(
-          status: [200, "OK"],
+      it 'assigns works' do
+        stub_request(:any, 'https://api.intercom.io/contacts?id=123').to_return(
+          status: [200, 'OK'],
           headers: { 'X-RateLimit-Reset' => Time.now.utc + 10 },
-          body: { "test": "testing" }.to_json
+          body: { "test": 'testing' }.to_json
         )
 
-        client.get("/users", { id: "123" })
+        client.get('/contacts', id: '123')
       end
     end
 
     describe 'OAuth clients' do
       it 'supports "token"' do
         client = Client.new(token: 'foo')
-        client.username_part.must_equal('foo')
-        client.password_part.must_equal('')
+        _(client.token).must_equal('foo')
       end
     end
   end

data/spec/unit/intercom/company_spec.rb

@@ -1,40 +1,38 @@
 require "spec_helper"
 
 describe Intercom::Company do
-  let (:client) { Intercom::Client.new(app_id: "app_id",  api_key: "api_key") }
+  let(:client) { Intercom::Client.new(token: 'token') }
 
   describe "when no response raises error" do
     it "on find" do
       client.expects(:get).with("/companies", {:company_id => "4"}).returns(nil)
-      proc {client.companies.find(:company_id => "4")}.must_raise Intercom::HttpError
+      _(proc { client.companies.find(:company_id => "4")}).must_raise Intercom::HttpError
     end
 
     it "on find_all" do
       client.expects(:get).with("/companies", {}).returns(nil)
-      proc {client.companies.all.each {|company| }}.must_raise Intercom::HttpError
+      _(proc { client.companies.all.each {|company| }}).must_raise Intercom::HttpError
     end
 
     it "on load" do
       client.expects(:get).with("/companies", {:company_id => "4"}).returns({"type" =>"user", "id" =>"aaaaaaaaaaaaaaaaaaaaaaaa", "company_id" => "4", "name" => "MyCo"})
       company = client.companies.find(:company_id => "4")
       client.expects(:get).with("/companies/aaaaaaaaaaaaaaaaaaaaaaaa", {}).returns(nil)
-      proc {client.companies.load(company)}.must_raise Intercom::HttpError
+      _(proc { client.companies.load(company)}).must_raise Intercom::HttpError
     end
   end
 
-  it "gets users in a company by intercom ID" do
-    client.expects(:get).with("/companies/abc123/users", {}).returns(page_of_users(false))
-    client.companies.users_by_intercom_company_id("abc123").each { |u| }
-  end
-
-  it "gets users in a company by external company ID" do
-    client.expects(:get).with("/companies", { company_id: "abc123", type: "user" }).returns(page_of_users(false))
-    client.companies.users_by_company_id("abc123").each { |u| }
-  end
-
   it "finds a company" do
     client.expects(:get).with("/companies/531ee472cce572a6ec000006", {}).returns(test_company)
     company = client.companies.find(id: "531ee472cce572a6ec000006")
-    company.name.must_equal("Blue Sun")
+    _(company.name).must_equal("Blue Sun")
+  end
+
+  it "returns a collection proxy for listing contacts" do
+    company = Intercom::Company.new("id" => "1")
+    proxy = company.contacts
+    _(proxy.resource_name).must_equal 'contacts'
+    _(proxy.url).must_equal '/companies/1/contacts'
+    _(proxy.resource_class).must_equal Intercom::Contact
   end
 end

data/spec/unit/intercom/contact_spec.rb

@@ -1,59 +1,315 @@
-require "spec_helper"
+# frozen_string_literal: true
 
-describe "Intercom::Contact" do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
+require 'spec_helper'
+
+describe Intercom::Contact do
+  let(:client) { Intercom::Client.new(token: 'token') }
 
   it 'should be listable' do
     proxy = client.contacts.all
-    proxy.resource_name.must_equal 'contacts'
-    proxy.finder_url.must_equal '/contacts'
-    proxy.resource_class.must_equal Intercom::Contact
+    _(proxy.resource_name).must_equal 'contacts'
+    _(proxy.url).must_equal '/contacts'
+    _(proxy.resource_class).must_equal Intercom::Contact
   end
 
-  it 'should not throw ArgumentErrors when there are no parameters' do
-    client.expects(:post)
-    client.contacts.create
+  it 'should throw an ArgumentError when there are no parameters' do
+    _(proc { client.contacts.create }).must_raise(ArgumentError)
   end
 
-  it 'can update a contact with an id' do
-    contact = Intercom::Contact.new(:id => "de45ae78gae1289cb")
-    client.expects(:put).with("/contacts/de45ae78gae1289cb", {'custom_attributes' => {}})
+  it "to_hash'es itself" do
+    created_at = Time.now
+    contact = Intercom::Contact.new(email: 'jim@example.com', contact_id: '12345', created_at: created_at, name: 'Jim Bob')
+    as_hash = contact.to_hash
+    _(as_hash['email']).must_equal 'jim@example.com'
+    _(as_hash['contact_id']).must_equal '12345'
+    _(as_hash['created_at']).must_equal created_at.to_i
+    _(as_hash['name']).must_equal 'Jim Bob'
+  end
+
+  it 'presents created_at and last_impression_at as Date' do
+    now = Time.now
+    contact = Intercom::Contact.new(created_at: now, last_impression_at: now)
+    _(contact.created_at).must_be_kind_of Time
+    _(contact.created_at.to_s).must_equal now.to_s
+    _(contact.last_impression_at).must_be_kind_of Time
+    _(contact.last_impression_at.to_s).must_equal now.to_s
+  end
+
+  it 'is throws a Intercom::AttributeNotSetError on trying to access an attribute that has not been set' do
+    contact = Intercom::Contact.new
+    _(proc { contact.foo_property }).must_raise Intercom::AttributeNotSetError
+  end
+
+  it 'presents a complete contact record correctly' do
+    contact = Intercom::Contact.new(test_contact)
+    _(contact.external_id).must_equal 'id-from-customers-app'
+    _(contact.email).must_equal 'bob@example.com'
+    _(contact.name).must_equal 'Joe Schmoe'
+    _(contact.workspace_id).must_equal 'the-workspace-id'
+    _(contact.session_count).must_equal 123
+    _(contact.created_at.to_i).must_equal 1_401_970_114
+    _(contact.remote_created_at.to_i).must_equal 1_393_613_864
+    _(contact.updated_at.to_i).must_equal 1_401_970_114
+
+    _(contact.avatar).must_be_kind_of Intercom::Avatar
+    _(contact.avatar.image_url).must_equal 'https://graph.facebook.com/1/picture?width=24&height=24'
+
+    _(contact.notes).must_be_kind_of Intercom::BaseCollectionProxy
+    _(contact.tags).must_be_kind_of Intercom::BaseCollectionProxy
+    _(contact.companies).must_be_kind_of Intercom::ClientCollectionProxy
+
+    _(contact.custom_attributes).must_be_kind_of Intercom::Lib::FlatStore
+    _(contact.custom_attributes['a']).must_equal 'b'
+    _(contact.custom_attributes['b']).must_equal 2
+
+    _(contact.social_profiles.size).must_equal 4
+    twitter_account = contact.social_profiles.first
+    _(twitter_account).must_be_kind_of Intercom::SocialProfile
+    _(twitter_account.name).must_equal 'twitter'
+    _(twitter_account.username).must_equal 'abc'
+    _(twitter_account.url).must_equal 'http://twitter.com/abc'
+
+    _(contact.location_data).must_be_kind_of Intercom::LocationData
+    _(contact.location_data.city_name).must_equal 'Dublin'
+    _(contact.location_data.continent_code).must_equal 'EU'
+    _(contact.location_data.country_name).must_equal 'Ireland'
+    _(contact.location_data.latitude).must_equal '90'
+    _(contact.location_data.longitude).must_equal '10'
+    _(contact.location_data.country_code).must_equal 'IRL'
+
+    _(contact.unsubscribed_from_emails).must_equal true
+    _(contact.user_agent_data).must_equal 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11'
+  end
+
+  it 'allows easy setting of custom data' do
+    now = Time.now
+    contact = Intercom::Contact.new
+    contact.custom_attributes['mad'] = 123
+    contact.custom_attributes['other'] = now.to_i
+    contact.custom_attributes['thing'] = 'yay'
+    _(contact.to_hash['custom_attributes']).must_equal 'mad' => 123, 'other' => now.to_i, 'thing' => 'yay'
+  end
+
+  it 'rejects nested data structures in custom_attributes' do
+    contact = Intercom::Contact.new
+
+    _(proc { contact.custom_attributes['thing'] = [1] }).must_raise(ArgumentError)
+    _(proc { contact.custom_attributes['thing'] = { 1 => 2 } }).must_raise(ArgumentError)
+    _(proc { contact.custom_attributes['thing'] = { 1 => { 2 => 3 } } }).must_raise(ArgumentError)
+
+    contact = Intercom::Contact.new(test_contact)
+    _(proc { contact.custom_attributes['thing'] = [1] }).must_raise(ArgumentError)
+  end
+
+  describe 'incrementing custom_attributes fields' do
+    before :each do
+      @now = Time.now
+      @contact = Intercom::Contact.new('email' => 'jo@example.com', :external_id => 'i-1224242', :custom_attributes => { 'mad' => 123, 'another' => 432, 'other' => @now.to_i, :thing => 'yay' })
+    end
+
+    it 'increments up by 1 with no args' do
+      @contact.increment('mad')
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 124
+    end
+
+    it 'increments up by given value' do
+      @contact.increment('mad', 4)
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 127
+    end
+
+    it 'increments down by given value' do
+      @contact.increment('mad', -1)
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 122
+    end
+
+    it 'can increment new custom data fields' do
+      @contact.increment('new_field', 3)
+      _(@contact.to_hash['custom_attributes']['new_field']).must_equal 3
+    end
+
+    it 'can call increment on the same key twice and increment by 2' do
+      @contact.increment('mad')
+      @contact.increment('mad')
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 125
+    end
+  end
+
+  describe 'decrementing custom_attributes fields' do
+    before :each do
+      @now = Time.now
+      @contact = Intercom::Contact.new('email' => 'jo@example.com', :external_id => 'i-1224242', :custom_attributes => { 'mad' => 123, 'another' => 432, 'other' => @now.to_i, :thing => 'yay' })
+    end
+
+    it 'decrements down by 1 with no args' do
+      @contact.decrement('mad')
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 122
+    end
+
+    it 'decrements down by given value' do
+      @contact.decrement('mad', 3)
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 120
+    end
+
+    it 'can decrement new custom data fields' do
+      @contact.decrement('new_field', 5)
+      _(@contact.to_hash['custom_attributes']['new_field']).must_equal(-5)
+    end
+
+    it 'can call decrement on the same key twice and decrement by 2' do
+      @contact.decrement('mad')
+      @contact.decrement('mad')
+      _(@contact.to_hash['custom_attributes']['mad']).must_equal 121
+    end
+  end
+
+  it 'saves a contact (always sends custom_attributes)' do
+    contact = Intercom::Contact.new('email' => 'jo@example.com', :external_id => 'i-1224242')
+    client.expects(:post).with('/contacts', 'email' => 'jo@example.com', 'external_id' => 'i-1224242', 'custom_attributes' => {}).returns('email' => 'jo@example.com', 'external_id' => 'i-1224242')
     client.contacts.save(contact)
   end
 
-  describe 'converting' do
-    let(:contact) { Intercom::Contact.from_api(user_id: 'contact_id') }
-    let(:user) { Intercom::User.from_api(id: 'user_id') }
+  it 'can save a contact with a nil email' do
+    contact = Intercom::Contact.new('email' => nil, :external_id => 'i-1224242')
+    client.expects(:post).with('/contacts', 'custom_attributes' => {}, 'email' => nil, 'external_id' => 'i-1224242').returns('email' => nil, 'external_id' => 'i-1224242')
+    client.contacts.save(contact)
+  end
 
-    it do
-      client.expects(:post).with(
-        "/contacts/convert",
-        {
-          contact: { user_id: contact.user_id },
-          user: { 'id' => user.id }
-        }
-      ).returns(test_user)
+  it 'can use client.contacts.create for convenience' do
+    client.expects(:post).with('/contacts', 'custom_attributes' => {}, 'email' => 'jo@example.com', 'external_id' => 'i-1224242').returns('email' => 'jo@example.com', 'external_id' => 'i-1224242')
+    contact = client.contacts.create('email' => 'jo@example.com', :external_id => 'i-1224242')
+    _(contact.email).must_equal 'jo@example.com'
+  end
 
-      client.contacts.convert(contact, user)
+  it 'updates the contact with attributes as set by the server' do
+    client.expects(:post).with('/contacts', 'email' => 'jo@example.com', 'external_id' => 'i-1224242', 'custom_attributes' => {}).returns('email' => 'jo@example.com', 'external_id' => 'i-1224242', 'session_count' => 4)
+    contact = client.contacts.create('email' => 'jo@example.com', :external_id => 'i-1224242')
+    _(contact.session_count).must_equal 4
+  end
+
+  it 'allows setting dates to nil without converting them to 0' do
+    client.expects(:post).with('/contacts', 'email' => 'jo@example.com', 'custom_attributes' => {}, 'remote_created_at' => nil).returns('email' => 'jo@example.com')
+    contact = client.contacts.create('email' => 'jo@example.com', 'remote_created_at' => nil)
+    assert_nil contact.remote_created_at
+  end
+
+  it 'sets/gets rw keys' do
+    params = { 'email' => 'me@example.com', :external_id => 'abc123', 'name' => 'Bob Smith', 'last_seen_ip' => '1.2.3.4', 'last_seen_contact_agent' => 'ie6', 'created_at' => Time.now }
+    contact = Intercom::Contact.new(params)
+    custom_attributes = (params.keys + ['custom_attributes']).map(&:to_s).sort
+    _(contact.to_hash.keys.sort).must_equal custom_attributes
+    params.keys.each do |key|
+      _(contact.send(key).to_s).must_equal params[key].to_s
     end
   end
 
-  it "returns a ClientCollectionProxy for all without making any requests" do
+  it 'will allow extra attributes in response from api' do
+    contact = Intercom::Contact.send(:from_api, 'new_param' => 'some value')
+    _(contact.new_param).must_equal 'some value'
+  end
+
+  it 'returns a BaseCollectionProxy for all without making any requests' do
     client.expects(:execute_request).never
     all = client.contacts.all
-    all.must_be_instance_of(Intercom::ClientCollectionProxy)
+    _(all).must_be_instance_of(Intercom::BaseCollectionProxy)
+  end
+
+  it 'can print contacts without crashing' do
+    client.expects(:get).with('/contacts', 'email' => 'bo@example.com').returns(test_contact)
+    contact = client.contacts.find('email' => 'bo@example.com')
+
+    begin
+      orignal_stdout = $stdout
+      $stdout = StringIO.new
+
+      puts contact
+      p contact
+    ensure
+      $stdout = orignal_stdout
+    end
   end
 
-  it "deletes a contact" do
-    contact = Intercom::Contact.new("id" => "1")
-    client.expects(:delete).with("/contacts/1", {}).returns(contact)
+  it 'fetches a contact' do
+    client.expects(:get).with('/contacts', 'email' => 'bo@example.com').returns(test_contact)
+    contact = client.contacts.find('email' => 'bo@example.com')
+    _(contact.email).must_equal 'bob@example.com'
+    _(contact.name).must_equal 'Joe Schmoe'
+    _(contact.session_count).must_equal 123
+  end
+
+  it 'can update a contact with an id' do
+    contact = Intercom::Contact.new(id: 'de45ae78gae1289cb')
+    client.expects(:put).with('/contacts/de45ae78gae1289cb', 'custom_attributes' => {})
+    client.contacts.save(contact)
+  end
+
+  it 'deletes a contact' do
+    contact = Intercom::Contact.new('id' => '1')
+    client.expects(:delete).with('/contacts/1', {}).returns(contact)
     client.contacts.delete(contact)
   end
 
-  it "sends a request for a hard deletion" do
-    contact = Intercom::Contact.new("id" => "1")
-    client.expects(:post).with("/user_delete_requests", {intercom_user_id: "1"}).returns({id: contact.id})
-    client.contacts.request_hard_delete(contact)
+  describe 'merging' do
+    let(:lead) { Intercom::Contact.from_api(external_id: 'contact_id', role: 'lead') }
+    let(:user) { Intercom::Contact.from_api(id: 'external_id', role: 'user') }
+
+    it 'should be successful with a lead and user' do
+      client.expects(:post).with('/contacts/merge',
+                                 from: lead.id, into: user.id).returns(test_contact)
+
+      client.contacts.merge(lead, user)
+    end
   end
 
+  describe 'nested resources' do
+    let(:contact) { Intercom::Contact.new(id: '1', client: client) }
+    let(:company) { Intercom::Company.new(id: '1') }
+    let(:tag) { Intercom::Tag.new(id: '1') }
+    let(:note) { Intercom::Note.new(body: "<p>Text for the note</p>") }
+
+    it 'returns a collection proxy for listing notes' do
+      proxy = contact.notes
+      _(proxy.resource_name).must_equal 'notes'
+      _(proxy.url).must_equal '/contacts/1/notes'
+      _(proxy.resource_class).must_equal Intercom::Note
+    end
+
+    it 'returns a collection proxy for listing tags' do
+      proxy = contact.tags
+      _(proxy.resource_name).must_equal 'tags'
+      _(proxy.url).must_equal '/contacts/1/tags'
+      _(proxy.resource_class).must_equal Intercom::Tag
+    end
+
+    it 'returns a collection proxy for listing companies' do
+      proxy = contact.companies
+      _(proxy.resource_name).must_equal 'companies'
+      _(proxy.url).must_equal '/contacts/1/companies'
+      _(proxy.resource_class).must_equal Intercom::Company
+    end
+
+    it 'adds a note to a contact' do
+      client.expects(:post).with('/contacts/1/notes', {body: note.body}).returns(note.to_hash)
+      contact.create_note({body: note.body})
+    end
+
+    it 'adds a tag to a contact' do
+      client.expects(:post).with('/contacts/1/tags', "id": tag.id).returns(tag.to_hash)
+      contact.add_tag({ "id": tag.id })
+    end
+
+    it 'removes a tag from a contact' do
+      client.expects(:delete).with("/contacts/1/tags/#{tag.id}", "id": tag.id ).returns(tag.to_hash)
+      contact.remove_tag({ "id": tag.id })
+    end
+
+    it 'adds a contact to a company' do
+      client.expects(:post).with('/contacts/1/companies', "id": company.id).returns(test_company)
+      contact.add_company({ "id": tag.id })
+    end
+
+    it 'removes a contact from a company' do
+      client.expects(:delete).with("/contacts/1/companies/#{company.id}", "id": tag.id ).returns(test_company)
+      contact.remove_company({ "id": tag.id })
+    end
+  end
 end