Merge pull request #130 from intercom/jo/nil-guard-on-decoded_body

josler · josler · commit 49f292d717f4 · 2014-11-12T17:30:33.000Z
nil guard on decoded body
diff --git a/lib/intercom/request.rb b/lib/intercom/request.rb
@@ -81,14 +81,13 @@ def decode_body(response)
 
     def parse_body(decoded_body, response)
       parsed_body = nil
-      unless decoded_body.strip.empty?
-        begin
-          parsed_body = JSON.parse(decoded_body)
-        rescue JSON::ParserError => e
-          raise_errors_on_failure(response)
-        end
-        raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'
+      return parsed_body if decoded_body.nil? || decoded_body.strip.empty?
+      begin
+        parsed_body = JSON.parse(decoded_body)
+      rescue JSON::ParserError => e
+        raise_errors_on_failure(response)
       end
+      raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'
       parsed_body
     end
 
diff --git a/spec/unit/intercom/request_spec.rb b/spec/unit/intercom/request_spec.rb
@@ -7,4 +7,10 @@
     req = Intercom::Request.new('path/', 'GET')
     proc {req.parse_body('<html>somethjing</html>', response)}.must_raise(Intercom::ServerError)
   end
-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)
+  end
+end
