intercom 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e9fc89a1afe0812e99ba788f34abb10a2efee6
-  data.tar.gz: 22a8b523d0118dca4f92f9429ddc046ab3126d1d
+  metadata.gz: 7fa96a0842530f56baae6d4a78782fc99dbdfb5d
+  data.tar.gz: aab9881adb19557ed2e03d2edf4e8007aa5e7c18
 SHA512:
-  metadata.gz: 06825933a4db65f7ea657c6525bc350d9df83cb3ad84a5baf4bb7043f061f32ccd8d7480d8a0bbe73614dda861375f4bd990c80d140f5b6feb90b60bab99ea94
-  data.tar.gz: f7059cecea4a6add02f0fcf1d28ea717a78829631393ed7f6d4e017e342e366da481affe6c9d4bf0aa95fa37f5d94f106f723126a30999f60e0594848d8c6e88
+  metadata.gz: 46ff0d47d1be82494ab2b76b2ed90a73798f7e9465634e19e305495b7b27fd9c8887364906a0ecca0bc63267b2fb8ac2b7c4610ab0e302fd4b3a90b2729ea263
+  data.tar.gz: 4e47ecae6dea2a440d4580b7597ce91ec471d01f51f2f426ba043267a95a236964f0723735884b9b5c96b7c1517f5e932c464dad4de565941285f693020eaceb

data/README.md

@@ -19,7 +19,7 @@ Additionally, the new version uses Ruby 2.
 
 Using bundler:
 
-    gem 'intercom', "~> 2.2.3"
+    gem 'intercom', "~> 2.2.4"
 
 ## Basic Usage
 
@@ -342,6 +342,7 @@ Intercom::ResourceNotFound
 Intercom::BadRequestError
 Intercom::RateLimitExceeded
 Intercom::AttributeNotSetError # Raised when you try to call a getter that does not exist on an object
+Intercom::MultipleMatchingUsersError
 ```
 
 ### Rate Limiting

data/changes.txt

@@ -1,3 +1,6 @@
+2.2.4
+ - Add Intercom::MultipleMatchingUsersError
+
 2.2.3
  - Add rate limiting details to Intercom.rate_limiting_details
 

data/lib/intercom/errors.rb

@@ -37,6 +37,9 @@ module Intercom
 
   # Raised when the request throws an error not accounted for
   class UnexpectedError < IntercomError; end
+  
+  # Raised when multiple users match the query (typically duplicate email addresses)
+  class MultipleMatchingUsersError < IntercomError; end
 
   # Raised when you try to call a non-setter method that does not exist on an object
   class Intercom::AttributeNotSetError < IntercomError ; end

data/lib/intercom/request.rb

@@ -127,6 +127,8 @@ module Intercom
         raise Intercom::RateLimitExceeded.new(error_details['message'], error_context)
       when 'service_unavailable'
         raise Intercom::ServiceUnavailableError.new(error_details['message'], error_context)
+      when 'conflict'
+        raise Intercom::MultipleMatchingUsersError.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

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/spec/unit/intercom_spec.rb

@@ -16,6 +16,11 @@ describe Intercom do
       Intercom.app_api_key = nil
       proc { Intercom.target_base_url }.must_raise ArgumentError, "You must set both Intercom.app_id and Intercom.app_api_key to use this client. See https://github.com/intercom/intercom-ruby for usage examples."
     end
+    
+    it 'raises an Intercom::MultipleMatchingUsers error when receiving a conflict' do
+      multiple_matching_error = { 'type' => 'error.list', 'errors' => [{ 'code' => 'conflict', 'message' => 'Multiple existing users match this email address - must be more specific using user_id' }]}
+      proc {Intercom::Request.new('/users', :get).raise_application_errors_on_failure(multiple_matching_error, 400)}.must_raise(Intercom::MultipleMatchingUsersError)
+    end
 
     it "returns the app_id and app_api_key previously set" do
       Intercom.app_id.must_equal "abc123"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest