Merge pull request #125 from intercom/jo/raise-on-html-response

josler · josler · commit a9d10cc9e719 · 2014-10-21T14:35:03.000+01:00
raise errors on html response
diff --git a/lib/intercom/request.rb b/lib/intercom/request.rb
@@ -62,11 +62,8 @@ def execute(target_base_url=nil)
           begin
             response = http.request(net_http_method)
             set_rate_limit_details(response)
-            decoded = decode(response['content-encoding'], response.body)
-            unless decoded.strip.empty?
-              parsed_body = JSON.parse(decoded)
-              raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'
-            end
+            decoded_body = decode_body(response)
+            parsed_body = parse_body(decoded_body, response)
             raise_errors_on_failure(response)
             parsed_body
           rescue Timeout::Error
@@ -77,6 +74,23 @@ def execute(target_base_url=nil)
         raise Intercom::ServiceConnectionError.new('Failed to connect to service [connection attempt timed out]')
       end
     end
+    
+    def decode_body(response)
+      decode(response['content-encoding'], response.body)
+    end
+
+    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'
+      end
+      parsed_body
+    end
 
     def set_rate_limit_details(response)
       rate_limit_details = {}
diff --git a/spec/unit/intercom/request_spec.rb b/spec/unit/intercom/request_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe 'Intercom::Request' do
+  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)
+  end
+end
diff --git a/spec/unit/intercom/user_spec.rb b/spec/unit/intercom/user_spec.rb
@@ -219,32 +219,5 @@
   it "returns the total number of users" do
     Intercom::Count.expects(:user_count).returns('count_info')
     Intercom::User.count
-  end
-
- ##TODO: Investigate
-  #it "converts company created_at values to unix timestamps" do
-  #  time = Time.now
-
-  #  user = Intercom::User.new("companies" => [
-  #    { "created_at" => time },
-  #    { "created_at" => time.to_i }
-  #  ])
-
-  #  as_hash = user.to_hash
-  #  require 'ruby-debug' ; debugger
-  #  first_company_as_hash = as_hash["companies"][0]
-  #  second_company_as_hash = as_hash["companies"][1]
-
-  #  first_company_as_hash["created_at"].must_equal time.to_i
-  #  second_company_as_hash["created_at"].must_equal time.to_i
-  #end
-  
-#  it "tracks events" do
-#    user = Intercom::User.new("email" => "jim@example.com", :user_id => "12345", :created_at => Time.now, :name => "Jim Bob")
-#    Intercom::Event.expects(:create).with(:event_name => 'registration', :user => user)
-#    event = user.track_event('registration')
-    
-#    Intercom::Event.expects(:create).with(:event_name => 'another', :user => user, :created_at => 1391691571)
-#    event = user.track_event("another", {:created_at => 1391691571})
-#  end
+  end  
 end
