Merge pull request #124 from intercom/jo/throw-error-on-nil-response

add logic to throw error when unexpected nil received

Author: josler

README.md

@@ -343,6 +343,7 @@ Intercom::BadRequestError
 Intercom::RateLimitExceeded
 Intercom::AttributeNotSetError # Raised when you try to call a getter that does not exist on an object
 Intercom::MultipleMatchingUsersError
+Intercom::HttpError # Raised when response object is unexpectedly nil
 ```
 
 ### Rate Limiting

lib/intercom/api_operations/find.rb

@@ -10,6 +10,7 @@ def find(params)
           else
             response = Intercom.get("/#{collection_name}", params)
           end
+          raise Intercom::HttpError.new('Http Error - No response entity returned') unless response
           from_api(response)
         end
       end

lib/intercom/api_operations/load.rb

@@ -8,6 +8,7 @@ def load
         else
           raise "Cannot load #{self.class} as it does not have a valid id."
         end
+        raise Intercom::HttpError.new('Http Error - No response entity returned') unless response
         from_response(response)
       end
     end

lib/intercom/collection_proxy.rb

@@ -21,6 +21,7 @@ def each(&block)
         else
           response_hash = Intercom.get(@finder_url, @finder_params)
         end
+        raise Intercom::HttpError.new('Http Error - No response entity returned') unless response_hash
         deserialize_response_hash(response_hash, block)
         next_page = extract_next_link(response_hash)
         break if next_page.nil?

lib/intercom/errors.rb

@@ -43,6 +43,9 @@ 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
+  
+  # Raised when unexpected nil returned from server
+  class Intercom::HttpError < IntercomError ; end
 
   #
   # Non-public errors (internal to the gem)

spec/unit/intercom/company_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Intercom::Company do
+  
+  describe 'when no response raises error' do
+    it 'on find' do
+      Intercom.expects(:get).with("/companies", {:company_id => '4'}).returns(nil)
+      proc {company = Intercom::Company.find(:company_id => '4')}.must_raise Intercom::HttpError
+    end
+    
+    it 'on find_all' do
+      Intercom.expects(:get).with("/companies", {}).returns(nil)
+      proc {Intercom::Company.all.each {|company| }}.must_raise Intercom::HttpError
+    end
+    
+    it 'on load' do
+      Intercom.expects(:get).with("/companies", {:company_id => '4'}).returns({'type' =>'user', 'id' =>'aaaaaaaaaaaaaaaaaaaaaaaa', 'company_id' => '4', 'name' => 'MyCo'})
+      company = Intercom::Company.find(:company_id => '4')
+      Intercom.expects(:get).with('/companies/aaaaaaaaaaaaaaaaaaaaaaaa', {}).returns(nil)
+      proc {company.load}.must_raise Intercom::HttpError
+    end
+  end
+end