Merge branch 'feature-protocol-version'

Author: Paulo Silva

src/parser.coffee

@@ -23,6 +23,7 @@ parseResponse = (responseString) ->
   lines = responseString.split('\r\n')
 
   parsedStatusLine = parseStatusLine lines.shift()
+  response['protocolVersion'] = parsedStatusLine['protocol']
   response['statusCode'] = parsedStatusLine['statusCode']
   response['statusMessage'] = parsedStatusLine['statusMessage']
 

test/integration/curl-trace-parser-test.coffee

@@ -7,23 +7,23 @@ curl = require 'curl-trace-parser'
 describe "Parse output from curl trace parser", () ->
   traceFilePath = "./test/fixtures/post/tracefile"
   parsedCurlStrings = {}
-  
+
 
   before (done) ->
     fs.readFile traceFilePath, 'utf8', (err, trace) ->
       done err if err
       parsedCurlStrings = curl.parse trace
       done()
-  
+
   describe "request", () ->
     request = {}
-    
+
     before () ->
       request = parser.parseRequest parsedCurlStrings['request']
-    
+
     it "should parse string to expected object", () ->
       expectedObject =
-        headers: 
+        headers:
           'User-Agent': 'curl/7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0 OpenSSL/0.9.8x zlib/1.2.5'
           'Host': 'curltraceparser.apiary.io'
           'Accept':'*/*'
@@ -32,20 +32,21 @@ describe "Parse output from curl trace parser", () ->
         body: '{ \"product\":\"1AB23ORM\", \"quantity\": 2 }'
         method: 'POST'
         uri: '/shopping-cart'
-      
-      assert.deepEqual request, expectedObject 
-  
+
+      assert.deepEqual request, expectedObject
+
   describe "response", () ->
     response = {}
-    
+
     before () ->
       response = parser.parseResponse parsedCurlStrings['response']
-    
+
     it "should parse string to expected object", () ->
       expectedObject =
+        protocolVersion: "HTTP/1.1"
         statusCode: "201"
         statusMessage: "Created"
-        headers: 
+        headers:
           'Content-Type': 'application/json'
           'Content-Length': '39'
           'Date': 'Sun, 21 Jul 2013 14:51:09 GMT'
@@ -56,6 +57,3 @@ describe "Parse output from curl trace parser", () ->
         body: '{ "status": "created", "url": "/shopping-cart/2" }'
 
       assert.deepEqual response, expectedObject
-
-
-

test/unit/parser-test.coffee

@@ -175,10 +175,19 @@ describe "parser module", () ->
       before () ->
         output = parser.parseResponse(responseString)
 
-      ['statusCode', 'statusMessage', 'headers', 'body'].forEach (key) ->
+      ['protocolVersion', 'statusCode', 'statusMessage', 'headers', 'body'].forEach (key) ->
         it 'should have key "'+ key + '"', () ->
           assert.include Object.keys(output), key
 
+      describe "protocolVersion", () ->
+        subject = ""
+
+        before () ->
+          subject = output['protocolVersion']
+
+        it 'should contain "HTTP/1.1"', () ->
+          assert.equal subject, "HTTP/1.1"
+
       describe "statusCode", () ->
         subject = ""