1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #7204 from frodsan/update_conventions

Follow code conventions in metal/live
This commit is contained in:
Rafael Mendonça França 2012-07-31 18:40:10 -07:00
commit ddd804e818

View file

@ -47,13 +47,13 @@ module ActionController
def each def each
while str = @buf.pop while str = @buf.pop
yield str yield(str)
end end
end end
def close def close
super super
@buf.push nil @buf.push(nil)
end end
end end
@ -78,7 +78,7 @@ module ActionController
end end
def initialize(status = 200, header = {}, body = []) def initialize(status = 200, header = {}, body = [])
header = Header.new self, header header = Header.new(self, header)
super(status, header, body) super(status, header, body)
end end
@ -89,11 +89,11 @@ module ActionController
private private
def build_buffer(response, body) def build_buffer(response, body)
buf = Live::Buffer.new response buf = Live::Buffer.new(response)
body.each { |part| buf.write part } body.each { |part| buf.write(part) }
buf buf
end end
end end
def process(name) def process(name)