aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/live.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-31 18:40:10 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-31 18:40:10 -0700
commitddd804e8181e0ca6b6b865a636284f7aae911987 (patch)
tree5a38ddb8117e72a7c827c5e8ccbcc385d177b469 /actionpack/lib/action_controller/metal/live.rb
parentb6ab4417720e03f1551abda2f1e4bd0a392dd04e (diff)
parent5906881c960f8466efef71da3a3394fde445d47c (diff)
downloadrails-ddd804e8181e0ca6b6b865a636284f7aae911987.tar.gz
rails-ddd804e8181e0ca6b6b865a636284f7aae911987.tar.bz2
rails-ddd804e8181e0ca6b6b865a636284f7aae911987.zip
Merge pull request #7204 from frodsan/update_conventions
Follow code conventions in metal/live
Diffstat (limited to 'actionpack/lib/action_controller/metal/live.rb')
-rw-r--r--actionpack/lib/action_controller/metal/live.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index e6ada0c106..43a9e3aa9d 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -47,13 +47,13 @@ module ActionController
def each
while str = @buf.pop
- yield str
+ yield(str)
end
end
def close
super
- @buf.push nil
+ @buf.push(nil)
end
end
@@ -78,7 +78,7 @@ module ActionController
end
def initialize(status = 200, header = {}, body = [])
- header = Header.new self, header
+ header = Header.new(self, header)
super(status, header, body)
end
@@ -89,11 +89,11 @@ module ActionController
private
- def build_buffer(response, body)
- buf = Live::Buffer.new response
- body.each { |part| buf.write part }
- buf
- end
+ def build_buffer(response, body)
+ buf = Live::Buffer.new(response)
+ body.each { |part| buf.write(part) }
+ buf
+ end
end
def process(name)