Merge pull request #372 from intercom/sofia/resource_not_unique_error

siwS · web-flow · commit c275eca3e33a · 2017-12-04T17:08:28.000Z
added new error for specific error code "resource_conflict"
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ This version of the gem is compatible with `Ruby 2.1` and above.
 
 Using bundler:
 
-    gem 'intercom', '~> 3.5.22'
+    gem 'intercom', '~> 3.5.23'
 
 ## Basic Usage
 
diff --git a/changes.txt b/changes.txt
@@ -1,3 +1,6 @@
+3.5.23
+ - New type of error (ResourceNotUniqueError). Thrown when trying to create a resource that already exists in Intercom
+
 3.5.22
  - Return object type
 
diff --git a/lib/intercom/errors.rb b/lib/intercom/errors.rb
@@ -41,7 +41,10 @@ class ServiceConnectionError < IntercomError; end
 
   # Raised when requesting resources on behalf of a user that doesn't exist in your application on Intercom.
   class ResourceNotFound < IntercomError; end
-  
+
+  # Raised when trying to create a resource that already exists in Intercom.
+  class ResourceNotUniqueError < IntercomError; end
+
   # Raised when the request has bad syntax
   class BadRequestError < IntercomError; end
 
diff --git a/lib/intercom/request.rb b/lib/intercom/request.rb
@@ -163,6 +163,8 @@ def raise_application_errors_on_failure(error_list_details, http_code)
         raise Intercom::ServiceUnavailableError.new(error_details['message'], error_context)
       when 'conflict', 'unique_user_constraint'
         raise Intercom::MultipleMatchingUsersError.new(error_details['message'], error_context)
+      when 'resource_conflict'
+        raise Intercom::ResourceNotUniqueError.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
diff --git a/spec/unit/intercom/request_spec.rb b/spec/unit/intercom/request_spec.rb
@@ -7,13 +7,13 @@
   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)
+    proc {req.parse_body('<html>something</html>', response)}.must_raise(Intercom::ServerError)
   end
 
   it 'raises a RateLimitExceeded error when the response code is 429' do
     response = OpenStruct.new(:code => 429)
     req = Intercom::Request.new('path/', 'GET')
-    proc {req.parse_body('<html>somethjing</html>', response)}.must_raise(Intercom::RateLimitExceeded)
+    proc {req.parse_body('<html>something</html>', response)}.must_raise(Intercom::RateLimitExceeded)
   end
 
   it 'parse_body raises an error if the decoded_body is "null"' do
@@ -23,8 +23,8 @@
   end
 
   describe 'Intercom::Client' do
-    let (:client) { Intercom::Client.new(token: 'foo', handle_rate_limit: true) }
-    let (:uri) {"https://api.intercom.io/users"}
+    let(:client) { Intercom::Client.new(token: 'foo', handle_rate_limit: true) }
+    let(:uri) {"https://api.intercom.io/users"}
 
     it 'should have handle_rate_limit set' do
        client.handle_rate_limit.must_equal(true)
@@ -63,6 +63,18 @@
 
   end
 
+
+  describe "Application errors on failure" do
+    let(:uri) {"https://api.intercom.io/conversations/reply"}
+    it 'should raise ResourceNotUniqueError error on resource_conflict code' do
+      # Use webmock to mock the HTTP request
+      stub_request(:put, uri).\
+      to_return(status: [409, "Resource Already Exists"], headers: { 'X-RateLimit-Reset' => Time.now.utc + 10 }, body: {type: "error.list", errors: [ code: "resource_conflict" ]}.to_json)
+      req = Intercom::Request.put(uri, "")
+      expect { req.execute(target_base_url=uri, username: "ted", secret: "") }.must_raise(Intercom::ResourceNotUniqueError)
+    end
+  end
+
   it 'parse_body returns nil if decoded_body is nil' do
     response = OpenStruct.new(:code => 500)
     req = Intercom::Request.new('path/', 'GET')

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +3.5.23
 + - New type of error (ResourceNotUniqueError). Thrown when trying to create a resource that already exists in Intercom
++
 .5.22
  - Return object type