From 84ac2eaa8bd16e44420abf660420698f76ad5473 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 23 Jul 2010 11:34:16 -0700 Subject: rename parse_range => make_range! It's a destructive method, and it does more than just parsing. --- lib/rainbows/base.rb | 2 +- lib/rainbows/fiber/rev.rb | 2 +- lib/rainbows/response.rb | 2 +- lib/rainbows/response/range.rb | 2 +- lib/rainbows/rev/client.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/rainbows/base.rb b/lib/rainbows/base.rb index 63abdd2..e6524e1 100644 --- a/lib/rainbows/base.rb +++ b/lib/rainbows/base.rb @@ -73,7 +73,7 @@ module Rainbows::Base if hp.headers? headers = HH.new(headers) - range = parse_range(env, status, headers) and status = range.shift + range = make_range!(env, status, headers) and status = range.shift env = false unless hp.keepalive? && G.alive headers[CONNECTION] = env ? KEEP_ALIVE : CLOSE client.write(response_header(status, headers)) diff --git a/lib/rainbows/fiber/rev.rb b/lib/rainbows/fiber/rev.rb index d837c01..c23d844 100644 --- a/lib/rainbows/fiber/rev.rb +++ b/lib/rainbows/fiber/rev.rb @@ -100,7 +100,7 @@ module Rainbows::Fiber if hp.headers? headers = HH.new(headers) - range = parse_range(env, status, headers) and status = range.shift + range = make_range!(env, status, headers) and status = range.shift headers[CONNECTION] = if hp.keepalive? && G.alive KEEP_ALIVE else diff --git a/lib/rainbows/response.rb b/lib/rainbows/response.rb index 44be30f..36ecbe2 100644 --- a/lib/rainbows/response.rb +++ b/lib/rainbows/response.rb @@ -52,7 +52,7 @@ module Rainbows::Response module NoRange # dummy method if we can't send range responses - def parse_range(env, status, headers) + def make_range!(env, status, headers) end end end diff --git a/lib/rainbows/response/range.rb b/lib/rainbows/response/range.rb index 4c0d4a1..5d8f01e 100644 --- a/lib/rainbows/response/range.rb +++ b/lib/rainbows/response/range.rb @@ -7,7 +7,7 @@ module Rainbows::Response::Range # This does not support multipart responses (does anybody actually # use those?) +headers+ is always a Rack::Utils::HeaderHash - def parse_range(env, status, headers) + def make_range!(env, status, headers) if 200 == status.to_i && (clen = headers[Content_Length]) && /\Abytes=(\d+-\d*|\d*-\d+)\z/ =~ env[HTTP_RANGE] diff --git a/lib/rainbows/rev/client.rb b/lib/rainbows/rev/client.rb index e2095bb..4d88b7b 100644 --- a/lib/rainbows/rev/client.rb +++ b/lib/rainbows/rev/client.rb @@ -85,7 +85,7 @@ module Rainbows if st.file? offset, count = 0, st.size if headers - if range = parse_range(@env, status, headers) + if range = make_range!(@env, status, headers) status, offset, count = range end write(response_header(status, headers)) -- cgit v1.2.3-24-ge0c7