Merge branch 'master' into seanhealy/opedSubscription

Author: SeanHealy33

README.md

@@ -114,6 +114,9 @@ intercom.contacts.unarchive(contact)
 # Delete a contact permanently
 intercom.contacts.delete(contact)
 
+# Deletes an archived contact permanently
+contact.delete_archived_contact("124")
+
 # List all contacts
 contacts = intercom.contacts.all
 contacts.each { |contact| p contact.name }
@@ -312,6 +315,13 @@ tag = intercom.tags.tag(name: 'blue', companies: [{company_id: "42ea2f1b93891f6a
 
 # Untag Companies
 tag = intercom.tags.untag(name: 'blue', companies: [{ company_id: "42ea2f1b93891f6a99000427" }])
+
+
+# Delete Tags
+
+# Note : If there any depedent objects for the tag we are trying to delete, then an error TagHasDependentObjects will be thrown.
+tag = intercom.tags.find(id:"123")
+intercom.tags.delete(tag)
 ```
 
 #### Notes

lib/intercom/errors.rb

@@ -99,6 +99,9 @@ class InvalidDocumentError < IntercomError; end
   # Raised when a merge is invalid
   class InvalidMergeError < IntercomError; end
 
+  # Raised when a tag has dependent objects
+  class TagHasDependentObjects < IntercomError; end
+
   #
   # Non-public errors (internal to the gem)
   #

lib/intercom/request.rb

@@ -222,6 +222,8 @@ def execute(target_base_url = nil, token:, read_timeout: 90, open_timeout: 30, a
         raise Intercom::ApiVersionInvalid.new(error_details['message'], error_context)
       when 'scroll_exists'
         raise Intercom::ScrollAlreadyExistsError.new(error_details['message'], error_context)
+      when 'tag_has_dependent_objects'
+        raise Intercom::TagHasDependentObjects.new(error_details['message'], error_context)
       when nil, ''
         raise Intercom::UnexpectedError.new(message_for_unexpected_error_without_type(error_details, parsed_http_code), error_context)
       else

lib/intercom/service/contact.rb

@@ -43,6 +43,10 @@ def unarchive(contact)
         contact
       end
 
+      def delete_archived_contact(id)
+        @client.delete("/#{collection_name}/#{id}", {})
+      end
+
       private def raise_invalid_merge_error
         raise Intercom::InvalidMergeError, 'Merging can only be performed on a lead into a user'
       end

spec/unit/intercom/contact_spec.rb

@@ -260,6 +260,12 @@
     client.contacts.unarchive(contact)
   end
 
+  it 'deletes an archived contact' do
+    contact = Intercom::Contact.new('id' => '1','archived' =>true)
+    client.expects(:delete).with('/contacts/1', {})
+    client.contacts.delete_archived_contact("1")
+  end
+
   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') }

spec/unit/intercom/request_spec.rb

@@ -124,6 +124,9 @@ def execute!
     let(:uri) {"https://api.intercom.io/conversations/reply"}
     let(:req) { Intercom::Request.put(uri, {}) }
 
+    let(:tag_uri) {"https://api.intercom.io/tags/"}
+    let(:del_req) { Intercom::Request.delete(tag_uri, {}) }
+
     it 'should raise ResourceNotUniqueError error on resource_conflict code' do
       stub_request(:put, uri).to_return(
         status: [409, "Resource Already Exists"],
@@ -153,5 +156,15 @@ def execute!
 
       expect { execute! }.must_raise(Intercom::ResourceNotFound)
     end
+
+    it 'should raise TagHasDependentObjects error on tag_has_dependent_objects code' do
+      stub_request(:delete, tag_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: "tag_has_dependent_objects" ] }.to_json
+      )
+
+      expect { del_req.execute(tag_uri, token: 'test-token') }.must_raise(Intercom::TagHasDependentObjects)
+    end
   end
 end

spec/unit/intercom/tag_spec.rb

@@ -28,4 +28,10 @@
     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
+
+  it 'delete tags' do
+    tag = Intercom::Tag.new('id' => '1')
+    client.expects(:delete).with('/tags/1', {}).returns(tag)
+    client.tags.delete(tag)
+  end
 end