deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #717 from bhollis/rack

Browse source 
Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3)
This commit is contained in:
Thomas Reynolds 2013-01-08 22:51:31 -08:00
parent 3ec36ce07b e3b9a41d3b
commit 3521b7527b
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
middleman-core/lib/middleman-core/util.rb
View file

@ -66,18 +66,12 @@ module Middleman
# @param response The response from #call # @param response The response from #call
# @return [String] The whole response as a string. # @return [String] The whole response as a string.
def self.extract_response_text(response) def self.extract_response_text(response)
case(response) # The rack spec states all response bodies must respond to each
when String result = ''
response response.each do |part, s|
when Array result << part
response.join
when Rack::Response
response.body.join
when Rack::File
File.read(response.path)
else
response.to_s
end end
result
end end
# Takes a matcher, which can be a literal string # Takes a matcher, which can be a literal string