don't try to decode a body containing only white-space

(workaround for Redmine)
LuaDist · Sep 4, 2011 · 4cd1a7f · 4cd1a7f
1 parent f9b83d1
commit 4cd1a7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Spore/Middleware/Format/JSON.lua b/src/Spore/Middleware/Format/JSON.lua
@@ -20,7 +20,7 @@ function m:call (req)
     end
     req.headers['accept'] = 'application/json'
     return  function (res)
-                if res.body and res.body ~= '' then
+                if type(res.body) == 'string' and not res.body:match'^%s*$' then
                     local r, msg = pcall(function ()
                         local decode = require 'json.decode'.decode
                         res.body = decode(res.body)

diff --git a/src/Spore/Middleware/Format/XML.lua b/src/Spore/Middleware/Format/XML.lua
@@ -141,7 +141,7 @@ function m:call (req)
     end
     req.headers['accept'] = 'text/xml'
     return  function (res)
-                if res.body and res.body ~= '' then
+                if type(res.body) == 'string' and not res.body:match'^%s*$' then
                     local r, msg = xml.parse(res.body)
                     if r then
                         res.body = { [r.tag] = collapse(r, self) }

diff --git a/src/Spore/Middleware/Format/YAML.lua b/src/Spore/Middleware/Format/YAML.lua
@@ -20,7 +20,7 @@ function m:call (req)
     end
     req.headers['accept'] = 'text/x-yaml'
     return  function (res)
-                if res.body and res.body ~= '' then
+                if type(res.body) == 'string' and not res.body:match'^%s*$' then
                     local r, msg = pcall(function ()
                         res.body = yaml.load(res.body)
                     end)