[CLIENT] Fixed an error where exception was raised too late for error…

… responses

Closes #40

elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb

@@ -215,19 +215,19 @@ def perform_request(method, path, params={}, body=nil, &block)
             raise e
           end
 
+          if response.status.to_i >= 300
+            __log_failed response if logger
+            __raise_transport_error response
+          end
+
           json     = serializer.load(response.body) if response.headers && response.headers["content-type"] =~ /json/
           took     = (json['took'] ? sprintf('%.3fs', json['took']/1000.0) : 'n/a') rescue 'n/a' if logger || tracer
           duration = Time.now-start if logger || tracer
 
           __log   method, path, params, body, url, response, json, took, duration if logger
           __trace method, path, params, body, url, response, json, took, duration if tracer
 
-          if response.status.to_i >= 300
-            __log_failed response if logger
-            __raise_transport_error response
-          else
-            Response.new response.status, json || response.body, response.headers
-          end
+          Response.new response.status, json || response.body, response.headers
         ensure
           @last_request_at = Time.now
         end

elasticsearch-transport/test/unit/transport_base_test.rb

@@ -181,6 +181,15 @@ def initialize(*); end
       end
     end
 
+    should "raise an error for HTTP status 404 with application/json content type" do
+      @transport.expects(:get_connection).returns(stub_everything :failures => 1)
+      assert_raise Elasticsearch::Transport::Transport::Errors::NotFound do
+        @transport.perform_request 'GET', '/' do
+          Elasticsearch::Transport::Transport::Response.new 404, 'NOT FOUND', {"content-type" => 'application/json'}
+        end
+      end
+    end
+
     should "raise an error on server failure" do
       @transport.expects(:get_connection).returns(stub_everything :failures => 1)
       assert_raise Elasticsearch::Transport::Transport::Errors::InternalServerError do