lib/saorin/server/base.rb in saorin-0.3.2 vs lib/saorin/server/base.rb in saorin-0.4.0
- old
+ new
@@ -1,9 +1,10 @@
require 'saorin/error'
require 'saorin/request'
require 'saorin/response'
require 'saorin/server'
+require 'multi_json'
module Saorin
module Server
module Base
attr_reader :handler, :allowed_methods
@@ -32,16 +33,20 @@
end
rescue Saorin::Error => e
Response.new(:error => e)
end
- response && MultiJson.dump(response)
+ dump_response response if response
end
def parse_request(content)
- MultiJson.decode content
+ MultiJson.load content
rescue MultiJson::LoadError
raise Saorin::ParseError
+ end
+
+ def dump_response(response)
+ MultiJson.dump response
end
def handle_request(hash)
begin
request = Request.from_hash(hash)