Skip to content

Commit

Permalink
Remove unnecessary logic
Browse files Browse the repository at this point in the history
  • Loading branch information
kriszyp committed Aug 18, 2010
1 parent 719a61b commit 4170455
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions lib/jsgi/media.js
Expand Up @@ -90,7 +90,8 @@ function Deserialize(mediaSelector, nextApp){
function Serialize(mediaSelector, nextApp){
return function(request){
return when(nextApp(request), function(response){
if(response.body === undefined){
var body = response.body;
if(body === undefined){
if(request.method === "GET"){
response.status = 404;
response.body = request.pathInfo + " not found";
Expand All @@ -102,22 +103,19 @@ function Serialize(mediaSelector, nextApp){
return response;
}
}
var responseMedia = mediaSelector(response.body, request.headers["accept"]);
var headers = response.headers;
var responseMedia = mediaSelector(body, request.headers["accept"]);
if(!responseMedia){
//TODO: List acceptable media types
return {status: 406, headers: {}, body:["The Accept header did not contain an acceptable media type"]};
}
var headers = response.headers;
headers.vary = (headers.vary ? headers.vary + "," : "") + "Accept" + request.variedOn;
if (!headers["content-type"] || headers['content-type']!=responseMedia.mediaType) {
headers["content-type"] = responseMedia.media.mediaType + "; charset=UTF-8";
var body = response.body;
var schema = body && body.schema;
if(schema && schema.schema){
headers["content-type"] += "; profile=" + request.scriptName + "/Class/" + schema.schema.getId(schema);
}
response.body = responseMedia.media.serialize(body, responseMedia.parameters, request, response);
headers["content-type"] = responseMedia.media.mediaType + "; charset=UTF-8";
var schema = body && body.schema;
if(schema && schema.schema){
headers["content-type"] += "; profile=" + request.scriptName + "/Class/" + schema.schema.getId(schema);
}
response.body = responseMedia.media.serialize(body, responseMedia.parameters, request, response);
return response;
});
};
Expand Down

0 comments on commit 4170455

Please sign in to comment.