Improve consistency of method names/usage.

Author: ioquatix

lib/protocol/http/body/buffered.rb

@@ -17,19 +17,28 @@ class Buffered < Readable
 				#
 				# @parameter body [String | Array(String) | Readable | nil] the body to wrap.
 				# @returns [Readable | nil] the wrapped body or nil if nil was given.
-				def self.wrap(body)
+				def self.for(body)
 					if body.is_a?(Readable)
 						return body
 					elsif body.is_a?(Array)
 						return self.new(body)
 					elsif body.is_a?(String)
 						return self.new([body])
 					elsif body
-						return self.for(body)
+						return self.read(body)
 					end
 				end
 
-				def self.for(body)
+				# @deprecated Use {#for} instead.
+				def self.wrap(body)
+					self.for(body)
+				end
+				
+				# Read the entire body into a buffered representation.
+				#
+				# @parameter body [Readable] the body to read.
+				# @returns [Buffered] the buffered body.
+				def self.read(body)
 					chunks = []
 
 					body.each do |chunk|

lib/protocol/http/body/readable.rb

@@ -66,7 +66,7 @@ def call(stream)
 				# @returns [Buffered] The buffered body.
 				def finish
 					# Internally, this invokes `self.each` which then invokes `self.close`.
-					Buffered.for(self)
+					Buffered.read(self)
 				end
 
 				# Enumerate all chunks until finished, then invoke `#close`.

lib/protocol/http/body/rewindable.rb

@@ -11,6 +11,14 @@ module HTTP
 		module Body
 			# A body which buffers all it's contents as it is `#read`.
 			class Rewindable < Wrapper
+				def self.for(body)
+					if body.rewindable?
+						body
+					else
+						self.new(body)
+					end
+				end
+				
 				def initialize(body)
 					super(body)
 

test/protocol/http/body/inflate.rb

@@ -14,7 +14,7 @@
 	let(:sample) {"The quick brown fox jumps over the lazy dog."}
 	let(:chunks) {[sample] * 1024}
 
-	let(:body) {Protocol::HTTP::Body::Buffered.for(chunks)}
+	let(:body) {Protocol::HTTP::Body::Buffered.new(chunks)}
 	let(:deflate_body) {Protocol::HTTP::Body::Deflate.for(body)}
 	let(:compressed_chunks) {deflate_body.join.each_char.to_a}
 	let(:compressed_body_chunks) {compressed_chunks}