RubyGems - intercom - Versions diffs - 3.5.10 → 4.1.2 - Mend

intercom 3.5.10 → 4.1.2

Files changed (101) hide show

checksums.yaml +5 -5
data/.circleci/config.yml +35 -0
data/.github/PULL_REQUEST_TEMPLATE.md +5 -0
data/Gemfile +1 -4
data/README.md +418 -216
data/RELEASING.md +9 -0
data/Rakefile +1 -1
data/changes.txt +141 -0
data/intercom.gemspec +1 -2
data/lib/intercom.rb +34 -19
data/lib/intercom/api_operations/archive.rb +16 -0
data/lib/intercom/api_operations/delete.rb +4 -1
data/lib/intercom/api_operations/find.rb +5 -2
data/lib/intercom/api_operations/find_all.rb +4 -3
data/lib/intercom/api_operations/list.rb +4 -1
data/lib/intercom/api_operations/load.rb +4 -2
data/lib/intercom/api_operations/nested_resource.rb +70 -0
data/lib/intercom/api_operations/request_hard_delete.rb +12 -0
data/lib/intercom/api_operations/save.rb +6 -4
data/lib/intercom/api_operations/scroll.rb +4 -5
data/lib/intercom/api_operations/search.rb +18 -0
data/lib/intercom/article.rb +7 -0
data/lib/intercom/base_collection_proxy.rb +72 -0
data/lib/intercom/client.rb +66 -18
data/lib/intercom/client_collection_proxy.rb +17 -39
data/lib/intercom/collection.rb +7 -0
data/lib/intercom/company.rb +8 -0
data/lib/intercom/contact.rb +22 -3
data/lib/intercom/conversation.rb +5 -0
data/lib/intercom/data_attribute.rb +7 -0
data/lib/intercom/deprecated_leads_collection_proxy.rb +22 -0
data/lib/intercom/deprecated_resources.rb +13 -0
data/lib/intercom/errors.rb +44 -4
data/lib/intercom/extended_api_operations/segments.rb +3 -1
data/lib/intercom/extended_api_operations/tags.rb +3 -1
data/lib/intercom/lead.rb +21 -0
data/lib/intercom/lib/typed_json_deserializer.rb +42 -37
data/lib/intercom/note.rb +4 -0
data/lib/intercom/request.rb +162 -95
data/lib/intercom/scroll_collection_proxy.rb +38 -42
data/lib/intercom/search_collection_proxy.rb +47 -0
data/lib/intercom/section.rb +23 -0
data/lib/intercom/segment.rb +4 -0
data/lib/intercom/service/article.rb +20 -0
data/lib/intercom/service/base_service.rb +13 -0
data/lib/intercom/service/collection.rb +24 -0
data/lib/intercom/service/company.rb +4 -2
data/lib/intercom/service/contact.rb +29 -6
data/lib/intercom/service/conversation.rb +23 -2
data/lib/intercom/service/data_attribute.rb +20 -0
data/lib/intercom/service/event.rb +12 -0
data/lib/intercom/service/lead.rb +41 -0
data/lib/intercom/service/note.rb +4 -8
data/lib/intercom/service/section.rb +7 -0
data/lib/intercom/service/tag.rb +8 -8
data/lib/intercom/service/team.rb +17 -0
data/lib/intercom/service/user.rb +4 -2
data/lib/intercom/service/visitor.rb +15 -6
data/lib/intercom/tag.rb +4 -0
data/lib/intercom/team.rb +7 -0
data/lib/intercom/traits/api_resource.rb +48 -27
data/lib/intercom/traits/dirty_tracking.rb +8 -1
data/lib/intercom/user.rb +12 -3
data/lib/intercom/utils.rb +13 -2
data/lib/intercom/version.rb +1 -1
data/lib/intercom/visitor.rb +0 -2
data/spec/spec_helper.rb +881 -436
data/spec/unit/intercom/admin_spec.rb +2 -2
data/spec/unit/intercom/article_spec.rb +40 -0
data/spec/unit/intercom/base_collection_proxy_spec.rb +30 -0
data/spec/unit/intercom/client_collection_proxy_spec.rb +41 -41
data/spec/unit/intercom/client_spec.rb +76 -9
data/spec/unit/intercom/collection_spec.rb +32 -0
data/spec/unit/intercom/company_spec.rb +29 -21
data/spec/unit/intercom/contact_spec.rb +365 -29
data/spec/unit/intercom/conversation_spec.rb +70 -7
data/spec/unit/intercom/count_spec.rb +4 -4
data/spec/unit/intercom/data_attribute_spec.rb +40 -0
data/spec/unit/intercom/deprecated_leads_collection_proxy_spec.rb +17 -0
data/spec/unit/intercom/event_spec.rb +25 -8
data/spec/unit/intercom/job_spec.rb +24 -24
data/spec/unit/intercom/lead_spec.rb +57 -0
data/spec/unit/intercom/lib/flat_store_spec.rb +22 -20
data/spec/unit/intercom/message_spec.rb +1 -1
data/spec/unit/intercom/note_spec.rb +4 -10
data/spec/unit/intercom/request_spec.rb +150 -9
data/spec/unit/intercom/scroll_collection_proxy_spec.rb +40 -39
data/spec/unit/intercom/search_collection_proxy_spec.rb +60 -0
data/spec/unit/intercom/section_spec.rb +32 -0
data/spec/unit/intercom/segment_spec.rb +2 -2
data/spec/unit/intercom/subscription_spec.rb +5 -6
data/spec/unit/intercom/tag_spec.rb +22 -14
data/spec/unit/intercom/team_spec.rb +21 -0
data/spec/unit/intercom/traits/api_resource_spec.rb +129 -47
data/spec/unit/intercom/user_spec.rb +227 -217
data/spec/unit/intercom/visitor_spec.rb +49 -0
data/spec/unit/intercom_spec.rb +5 -3
metadata +63 -26
data/.travis.yml +0 -6
data/lib/intercom/extended_api_operations/users.rb +0 -16
data/spec/unit/intercom/visitors_spec.rb +0 -61

data/spec/unit/intercom/note_spec.rb CHANGED Viewed

@@ -1,13 +1,7 @@
 require "spec_helper"
 describe "notes" do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
-  it "creates a note" do
-    client.expects(:post).with("/notes", {"body" => "Note to leave on user"}).returns({"body" => "<p>Note to leave on user</p>", "created_at" => 1234567890})
-    note = client.notes.create("body" => "Note to leave on user")
-    note.body.must_equal "<p>Note to leave on user</p>"
-  end
+  let(:client) { Intercom::Client.new(token: 'token') }
   it 'gets a note' do
     client.expects(:get).with("/notes/123", {}).returns({"id" => "123", "body" => "<p>Note to leave on user</p>", "created_at" => 1234567890})
@@ -18,9 +12,9 @@ describe "notes" do
     params = {"body" => "Note body", "email" => "me@example.com", :user_id => "abc123"}
     note = Intercom::Note.new(params)
-    note.to_hash.keys.sort.must_equal params.keys.map(&:to_s).sort
-    params.keys.each do | key|
-      note.send(key).must_equal params[key]
+    _(note.to_hash.keys.sort).must_equal params.keys.map(&:to_s).sort
+    params.keys.each do |key|
+      _(note.send(key)).must_equal params[key]
     end
   end
 end

data/spec/unit/intercom/request_spec.rb CHANGED Viewed

@@ -1,16 +1,157 @@
 require 'spec_helper'
 require 'ostruct'
-describe 'Intercom::Request' do
-  it 'raises an error when a html error page rendered' do
-    response = OpenStruct.new(:code => 500)
-    req = Intercom::Request.new('path/', 'GET')
-    proc {req.parse_body('<html>somethjing</html>', response)}.must_raise(Intercom::ServerError)
+WebMock.enable!
+describe 'Intercom::Request', '#execute' do
+  let(:uri) {"https://api.intercom.io/users"}
+  let(:req) { Intercom::Request.get(uri, {}) }
+  let(:default_body) { { data: "test" }.to_json }
+  def execute!
+    req.execute(uri, token: 'test-token')
+  end
+  it 'should call sleep for rate limit error three times and raise a rate limit error otherwise' do
+    stub_request(:any, uri).to_return(
+      status: [429, "Too Many Requests"],
+      headers: { 'X-RateLimit-Reset' => (Time.now.utc + 10).to_i.to_s },
+      body: default_body
+    )
+    req.handle_rate_limit=true
+    req.expects(:sleep).times(3).with(any_parameters)
+    expect { execute! }.must_raise(Intercom::RateLimitExceeded)
+  end
+  it 'should not call sleep for rate limit error' do
+    stub_request(:any, uri).to_return(
+      status: [200, "OK"],
+      headers: { 'X-RateLimit-Reset' => Time.now.utc + 10 },
+      body: default_body
+    )
+    req.handle_rate_limit=true
+    req.expects(:sleep).never.with(any_parameters)
+    execute!
+  end
+  it 'should call sleep for rate limit error just once' do
+    stub_request(:any, uri).to_return(
+      status: [429, "Too Many Requests"],
+      headers: { 'X-RateLimit-Reset' => (Time.now.utc + 10).to_i.to_s },
+    ).then.to_return(status: [200, "OK"], body: default_body)
+    req.handle_rate_limit=true
+    req.expects(:sleep).with(any_parameters)
+    execute!
   end
-  it 'parse_body returns nil if decoded_body is nil' do
-    response = OpenStruct.new(:code => 500)
-    req = Intercom::Request.new('path/', 'GET')
-    req.parse_body(nil, response).must_equal(nil)
+  it 'should not sleep if rate limit reset time has passed' do
+    stub_request(:any, uri).to_return(
+      status: [429, "Too Many Requests"],
+      headers: { 'X-RateLimit-Reset' => Time.parse("February 25 2010").utc.to_i.to_s },
+      body: default_body
+    ).then.to_return(status: [200, "OK"], body: default_body)
+    req.handle_rate_limit=true
+    req.expects(:sleep).never.with(any_parameters)
+    execute!
+  end
+  it 'handles an empty body gracefully' do
+    stub_request(:any, uri).to_return(
+      status: 200,
+      body: nil
+    )
+    assert_nil(execute!)
+  end
+  describe 'HTTP error handling' do
+    it 'raises an error when the response is successful but the body is not JSON' do
+      stub_request(:any, uri).to_return(
+        status: 200,
+        body: '<html>something</html>'
+      )
+      expect { execute! }.must_raise(Intercom::UnexpectedResponseError)
+    end
+    it 'raises an error when an html error page rendered' do
+      stub_request(:any, uri).to_return(
+        status: 500,
+        body: '<html>something</html>'
+      )
+      expect { execute! }.must_raise(Intercom::ServerError)
+    end
+    it 'raises an error if the decoded_body is "null"' do
+      stub_request(:any, uri).to_return(
+        status: 500,
+        body: 'null'
+      )
+      expect { execute! }.must_raise(Intercom::ServerError)
+    end
+    it 'raises a RateLimitExceeded error when the response code is 429' do
+      stub_request(:any, uri).to_return(
+        status: 429,
+        body: 'null'
+      )
+      expect { execute! }.must_raise(Intercom::RateLimitExceeded)
+    end
+    it 'raises a GatewayTimeoutError error when the response code is 504' do
+      stub_request(:any, uri).to_return(
+        status: 504,
+        body: '<html> <head><title>504 Gateway Time-out</title></head> <body bgcolor="white"> <center><h1>504 Gateway Time-out</h1></center> </body> </html>'
+      )
+      expect { execute! }.must_raise(Intercom::GatewayTimeoutError)
+    end
+  end
+  describe "application error handling" do
+    let(:uri) {"https://api.intercom.io/conversations/reply"}
+    let(:req) { Intercom::Request.put(uri, {}) }
+    it 'should raise ResourceNotUniqueError error on resource_conflict code' do
+      stub_request(:put, uri).to_return(
+        status: [409, "Resource Already Exists"],
+        headers: { 'X-RateLimit-Reset' => (Time.now.utc + 10).to_i.to_s },
+        body: { type: "error.list", errors: [ code: "resource_conflict" ] }.to_json
+      )
+      expect { execute! }.must_raise(Intercom::ResourceNotUniqueError)
+    end
+    it 'should raise ApiVersionInvalid error on intercom_version_invalid code' do
+      stub_request(:put, uri).to_return(
+        status: [400, "Bad Request"],
+        headers: { 'X-RateLimit-Reset' => (Time.now.utc + 10).to_i.to_s },
+        body: { type: "error.list", errors: [ code: "intercom_version_invalid" ] }.to_json
+      )
+      expect { execute! }.must_raise(Intercom::ApiVersionInvalid)
+    end
+    it 'should raise ResourceNotFound error on company_not_found code' do
+      stub_request(:put, uri).to_return(
+        status: [404, "Not Found"],
+        headers: { 'X-RateLimit-Reset' => (Time.now.utc + 10).to_i.to_s },
+        body: { type: "error.list", errors: [ code: "company_not_found" ] }.to_json
+      )
+      expect { execute! }.must_raise(Intercom::ResourceNotFound)
+    end
   end
 end

data/spec/unit/intercom/scroll_collection_proxy_spec.rb CHANGED Viewed

@@ -1,56 +1,57 @@
-require "spec_helper"
+# frozen_string_literal: true
+require 'spec_helper'
 describe Intercom::ScrollCollectionProxy 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 users returned" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(false))
-    emails = []
-    client.users.scroll.each { |user| emails << user.email }
-    emails.must_equal %W()
+  it 'stops iterating if no companies returned' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(false))
+    names = []
+    client.companies.scroll.each { |company| names << company.name }
+    _(names).must_equal %w[]
   end
-  it "keeps iterating if users returned" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(true))
-    client.expects(:get).with('/users/scroll', {:scroll_param => 'da6bbbac-25f6-4f07-866b-b911082d7'}).returns(users_scroll(false))
-    emails = []
-    client.users.scroll.each { |user| emails << user.email }
+  it 'keeps iterating if companies returned' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(true))
+    client.expects(:get).with('/companies/scroll', scroll_param: 'da6bbbac-25f6-4f07-866b-b911082d7').returns(companies_scroll(false))
+    names = []
+    client.companies.scroll.each { |company| names << company.name }
   end
-  it "supports indexed array access" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(true))
-    client.users.scroll[0].email.must_equal 'user1@example.com'
+  it 'supports indexed array access' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(true))
+    _(client.companies.scroll[0].name).must_equal 'company1'
   end
-  it "supports map" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(true))
-    client.expects(:get).with('/users/scroll', {:scroll_param => 'da6bbbac-25f6-4f07-866b-b911082d7'}).returns(users_scroll(false))
-    emails = client.users.scroll.map { |user| user.email }
-    emails.must_equal %W(user1@example.com user2@example.com user3@example.com)
+  it 'supports map' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(true))
+    client.expects(:get).with('/companies/scroll', scroll_param: 'da6bbbac-25f6-4f07-866b-b911082d7').returns(companies_scroll(false))
+    names = client.companies.scroll.map(&:name)
+    _(names).must_equal %w[company1 company2 company3]
   end
-  it "returns one page scroll" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(true))
-    scroll = client.users.scroll.next
-    emails = []
-    scroll.records.each {|usr| emails << usr.email}
-    emails.must_equal %W(user1@example.com user2@example.com user3@example.com)
+  it 'returns one page scroll' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(true))
+    scroll = client.companies.scroll.next
+    names = []
+    scroll.records.each { |usr| names << usr.name }
+    _(names).must_equal %w[company1 company2 company3]
   end
-  it "keeps iterating if called with scroll_param" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(true))
-    client.expects(:get).with('/users/scroll', {:scroll_param => 'da6bbbac-25f6-4f07-866b-b911082d7'}).returns(users_scroll(true))
-    scroll = client.users.scroll.next
-    scroll = client.users.scroll.next('da6bbbac-25f6-4f07-866b-b911082d7')
-    emails =[]
-    scroll.records.each {|usr| puts usr.email}
+  it 'keeps iterating if called with scroll_param' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(true))
+    client.expects(:get).with('/companies/scroll', scroll_param: 'da6bbbac-25f6-4f07-866b-b911082d7').returns(companies_scroll(true))
+    scroll = client.companies.scroll.next
+    scroll = client.companies.scroll.next('da6bbbac-25f6-4f07-866b-b911082d7')
+    scroll.records.each(&:name)
   end
-  it "works with an empty list" do
-    client.expects(:get).with("/users/scroll", '').returns(users_scroll(false))
-    scroll = client.users.scroll.next
-    emails = []
-    scroll.records.each {|usr| emails << usr.email}
-    emails.must_equal %W()
+  it 'works with an empty list' do
+    client.expects(:get).with('/companies/scroll', '').returns(companies_scroll(false))
+    scroll = client.companies.scroll.next
+    names = []
+    scroll.records.each { |usr| names << usr.name }
+    _(names).must_equal %w[]
   end
 end

data/spec/unit/intercom/search_collection_proxy_spec.rb ADDED Viewed

@@ -0,0 +1,60 @@
+require "spec_helper"
+describe Intercom::SearchCollectionProxy do
+  let(:client) { Intercom::Client.new(token: 'token') }
+  it "sends query to the contact search endpoint" do
+    client.expects(:post).with("/contacts/search", { query: {} }).returns(page_of_contacts(false))
+    client.contacts.search(query: {}).first
+  end
+  it "sends query to the conversation search endpoint" do
+    client.expects(:post).with("/conversations/search", { query: {} }).returns(test_conversation_list)
+    client.conversations.search(query: {}).first
+  end
+  it "sends query to the contact search endpoint with sort_field" do
+    client.expects(:post).with("/contacts/search", { query: {}, sort: { field: "name" } }).returns(page_of_contacts(false))
+    client.contacts.search(query: {}, sort_field: "name").first
+  end
+  it "sends query to the contact search endpoint with sort_field and sort_order" do
+    client.expects(:post).with("/contacts/search", { query: {}, sort: { field: "name", order: "ascending" } }).returns(page_of_contacts(false))
+    client.contacts.search(query: {}, sort_field: "name", sort_order: "ascending").first
+  end
+  it "sends query to the contact search endpoint with per_page" do
+    client.expects(:post).with("/contacts/search", { query: {}, pagination: { per_page: 10 }}).returns(page_of_contacts(false))
+    client.contacts.search(query: {}, per_page: 10).first
+  end
+  it "sends query to the contact search endpoint with starting_after" do
+    client.expects(:post).with("/contacts/search", { query: {}, pagination: { starting_after: "EnCrYpTeDsTrInG" }}).returns(page_of_contacts(false))
+    client.contacts.search(query: {}, starting_after: "EnCrYpTeDsTrInG").first
+  end
+  it "stops iterating if no starting_after value" do
+    client.expects(:post).with("/contacts/search", { query: {} }).returns(page_of_contacts(false))
+    emails = []
+    client.contacts.search(query: {}).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(:post).with("/contacts/search", { query: {} }).returns(page_of_contacts(true))
+    client.expects(:post).with("/contacts/search", { query: {}, pagination: { starting_after: "EnCrYpTeDsTrInG" }}).returns(page_of_contacts(false))
+    emails = []
+    client.contacts.search(query: {}).each { |contact| emails << contact.email }
+  end
+  it "supports indexed array access" do
+    client.expects(:post).with("/contacts/search", { query: {} }).returns(page_of_contacts(false))
+    _(client.contacts.search(query: {})[0].email).must_equal 'test1@example.com'
+  end
+  it "supports map" do
+    client.expects(:post).with("/contacts/search", { query: {} }).returns(page_of_contacts(false))
+    emails = client.contacts.search(query: {}).map { |contact| contact.email }
+    _(emails).must_equal %w[test1@example.com test2@example.com test3@example.com]
+  end
+end

data/spec/unit/intercom/section_spec.rb ADDED Viewed

@@ -0,0 +1,32 @@
+require 'spec_helper'
+describe Intercom::Section do
+  let(:client) { Intercom::Client.new(token: 'token') }
+  it 'creates a section' do
+    client.expects(:post).with('/help_center/sections', { 'name' => 'Section 1', 'parent_id' => '1' }).returns(test_section)
+    client.sections.create(:name => 'Section 1', :parent_id => '1')
+  end
+  it 'lists sections' do
+    client.expects(:get).with('/help_center/sections', {}).returns(test_section_list)
+    client.sections.all.each { |t| }
+  end
+  it 'finds a section' do
+    client.expects(:get).with('/help_center/sections/1', {}).returns(test_section)
+    client.sections.find(id: '1')
+  end
+  it 'updates a section' do
+    section = Intercom::Section.new(id: '12345')
+    client.expects(:put).with('/help_center/sections/12345', {})
+    client.sections.save(section)
+  end
+  it 'deletes a section' do
+    section = Intercom::Section.new(id: '12345')
+    client.expects(:delete).with('/help_center/sections/12345', {})
+    client.sections.delete(section)
+  end
+end

data/spec/unit/intercom/segment_spec.rb CHANGED Viewed

@@ -2,11 +2,11 @@ require 'spec_helper'
 describe "Intercom::Segment" do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
+  let(:client) { Intercom::Client.new(token: 'token') }
   it 'lists segments' do
     client.expects(:get).with('/segments', {}).returns(segment_list)
     segments = client.segments.all.to_a
-    segments[0].name.must_equal('Active')
+    _(segments[0].name).must_equal('Active')
   end
 end

data/spec/unit/intercom/subscription_spec.rb CHANGED Viewed

@@ -1,20 +1,19 @@
 require 'spec_helper'
 describe "Intercom::Subscription" do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
+  let(:client) { Intercom::Client.new(token: 'token') }
   it "gets a subscription" do
     client.expects(:get).with("/subscriptions/nsub_123456789", {}).returns(test_subscription)
     subscription = client.subscriptions.find(:id => "nsub_123456789")
-    subscription.request.topics[0].must_equal "user.created"
-    subscription.request.topics[1].must_equal "conversation.user.replied"
+    _(subscription.request.topics[0]).must_equal "user.created"
+    _(subscription.request.topics[1]).must_equal "conversation.user.replied"
   end
   it "creates a subscription" do
     client.expects(:post).with("/subscriptions", {'url' => "http://example.com", 'topics' => ["user.created"]}).returns(test_subscription)
     subscription = client.subscriptions.create(:url => "http://example.com", :topics => ["user.created"])
-    subscription.request.topics[0].must_equal "user.created"
-    subscription.request.url.must_equal "http://example.com"
+    _(subscription.request.topics[0]).must_equal "user.created"
+    _(subscription.request.url).must_equal "http://example.com"
   end
 end

data/spec/unit/intercom/tag_spec.rb CHANGED Viewed

@@ -1,23 +1,31 @@
+# frozen_string_literal: true
 require 'spec_helper'
-describe "Intercom::Tag" do
-  let (:client) { Intercom::Client.new(app_id: 'app_id',  api_key: 'api_key') }
+describe 'Intercom::Tag' do
+  let(:client) { Intercom::Client.new(token: 'token') }
+  it 'creates a tag' do
+    client.expects(:post).with('/tags', 'name' => 'Test Tag').returns(test_tag)
+    tag = client.tags.create(name: 'Test Tag')
+    _(tag.name).must_equal 'Test Tag'
+  end
-  it "creates a tag" do
-    client.expects(:post).with("/tags", {'name' => "Test Tag"}).returns(test_tag)
-    tag = client.tags.create(:name => "Test Tag")
-    tag.name.must_equal "Test Tag"
+  it 'finds a tag by id' do
+    client.expects(:get).with('/tags/4f73428b5e4dfc000b000112', {}).returns(test_tag)
+    tag = client.tags.find(id: '4f73428b5e4dfc000b000112')
+    _(tag.name).must_equal 'Test Tag'
   end
-  it "tags users" do
-    client.expects(:post).with("/tags", {'name' => "Test Tag", 'users' => [ { user_id: 'abc123' }, { user_id: 'def456' } ], 'tag_or_untag' => 'tag'}).returns(test_tag)
-    tag = client.tags.tag(:name => "Test Tag", :users => [ { user_id: "abc123" }, { user_id: "def456" } ] )
-    tag.name.must_equal "Test Tag"
-    tag.tagged_user_count.must_equal 2
+  it 'tags companies' do
+    client.expects(:post).with('/tags', 'name' => 'Test Tag', 'companies' => [{ company_id: 'abc123' }, { company_id: 'def456' }], 'tag_or_untag' => 'tag').returns(test_tag)
+    tag = client.tags.tag(name: 'Test Tag', companies: [{ company_id: 'abc123' }, { company_id: 'def456' }])
+    _(tag.name).must_equal 'Test Tag'
+    _(tag.tagged_company_count).must_equal 2
   end
-  it 'untags users' do
-    client.expects(:post).with("/tags", {'name' => "Test Tag", 'users' => [ { user_id: 'abc123', untag: true }, { user_id: 'def456', untag: true } ], 'tag_or_untag' => 'untag'}).returns(test_tag)
-    client.tags.untag(:name => "Test Tag", :users => [ { user_id: "abc123" }, { user_id: "def456" } ])
+  it 'untags companies' do
+    client.expects(:post).with('/tags', 'name' => 'Test Tag', 'companies' => [{ company_id: 'abc123', untag: true }, { company_id: 'def456', untag: true }], 'tag_or_untag' => 'untag').returns(test_tag)
+    client.tags.untag(name: 'Test Tag', companies: [{ company_id: 'abc123' }, { company_id: 'def456' }])
   end
 end