Better error messages.

Author: ioquatix

lib/protocol/http1/connection.rb

@@ -211,12 +211,12 @@ def close(error = nil)
 			end
 
 			def open!
-				if @state == :idle
-					@state = :open
-				else
+				unless @state == :idle
 					raise ProtocolError, "Cannot open connection in state: #{@state}!"
 				end
 
+				@state = :open
+				
 				return self
 			end
 
@@ -231,7 +231,7 @@ def write_request(authority, method, path, version, headers)
 
 			def write_response(version, status, headers, reason = Reason::DESCRIPTIONS[status])
 				unless @state == :open or @state == :half_closed_remote
-					raise ProtocolError, "Cannot write response in #{@state}!"
+					raise ProtocolError, "Cannot write response in state: #{@state}!"
 				end
 
 				# Safari WebSockets break if no reason is given:
@@ -242,7 +242,7 @@ def write_response(version, status, headers, reason = Reason::DESCRIPTIONS[statu
 
 			def write_interim_response(version, status, headers, reason = Reason::DESCRIPTIONS[status])
 				unless @state == :open or @state == :half_closed_remote
-					raise ProtocolError, "Cannot write interim response in #{@state}!"
+					raise ProtocolError, "Cannot write interim response in state: #{@state}!"
 				end
 
 				@stream.write("#{version} #{status} #{reason}\r\n")
@@ -336,7 +336,7 @@ def read_response_line
 
 			def read_response(method)
 				unless @state == :open or @state == :half_closed_local
-					raise ProtocolError, "Cannot read response in #{@state}!"
+					raise ProtocolError, "Cannot read response in state: #{@state}!"
 				end
 
 				version, status, reason = read_response_line
@@ -381,7 +381,7 @@ def send_end_stream!
 				elsif @state == :half_closed_remote
 					self.close!
 				else
-					raise ProtocolError, "Cannot send end stream in #{@state}!"
+					raise ProtocolError, "Cannot send end stream in state: #{@state}!"
 				end
 			end
 
@@ -590,7 +590,7 @@ def receive_end_stream!
 				elsif @state == :half_closed_local
 					self.close!
 				else
-					raise ProtocolError, "Cannot receive end stream in #{@state}!"
+					raise ProtocolError, "Cannot receive end stream in state: #{@state}!"
 				end
 			end