Fix handling of optional compression. (#17)

Author: ioquatix

lib/protocol/websocket/extension/compression/deflate.rb

@@ -54,21 +54,29 @@ def to_s
 					attr :context_takeover
 
 					def pack_text_frame(buffer, compress: true, **options)
-						buffer = self.deflate(buffer)
+						if compress
+							buffer = self.deflate(buffer)
+						end
 
 						frame = @parent.pack_text_frame(buffer, **options)
 
-						frame.flags |= Frame::RSV1
+						if compress
+							frame.flags |= Frame::RSV1
+						end
 
 						return frame
 					end
 
 					def pack_binary_frame(buffer, compress: false, **options)
-						buffer = self.deflate(buffer)
+						if compress
+							buffer = self.deflate(buffer)
+						end
 
 						frame = @parent.pack_binary_frame(buffer, **options)
 
-						frame.flags |= Frame::RSV1
+						if compress
+							frame.flags |= Frame::RSV1
+						end
 
 						return frame
 					end

lib/protocol/websocket/extension/compression/inflate.rb

@@ -54,12 +54,11 @@ def unpack_frames(frames, **options)
 
 						frame = frames.first
 
-						if frame.flags & Frame::RSV1
+						if frame.flag?(Frame::RSV1)
 							buffer = self.inflate(buffer)
+							frame.flags &= ~Frame::RSV1
 						end
 
-						frame.flags &= ~Frame::RSV1
-						
 						return buffer
 					end
 

lib/protocol/websocket/frame.rb

@@ -34,6 +34,10 @@ def initialize(finished = true, payload = nil, flags: 0, opcode: self.class::OPC
 				@payload = payload
 			end
 
+			def flag?(value)
+				@flags & value != 0
+			end
+			
 			def <=> other
 				to_ary <=> other.to_ary
 			end

test/protocol/websocket/extension/compression.rb

@@ -43,12 +43,36 @@
 			end
 		end
 
+		it "can send and receive a text message without compression" do
+			Async::WebSocket::Client.connect(endpoint) do |client|
+				expect(client.writer).to be_a(Protocol::WebSocket::Extension::Compression::Deflate)
+				expect(client.reader).to be_a(Protocol::WebSocket::Extension::Compression::Inflate)
+				
+				client.send_text("Hello World", compress: false)
+				client.flush
+				
+				expect(client.read).to be == "Hello World"
+			end
+		end
+		
 		it "can send and receive a binary message using compression" do
 			Async::WebSocket::Client.connect(endpoint) do |client|
 				expect(client.writer).to be_a(Protocol::WebSocket::Extension::Compression::Deflate)
 				expect(client.reader).to be_a(Protocol::WebSocket::Extension::Compression::Inflate)
 
-				client.send_binary("Hello World")
+				client.send_binary("Hello World", compress: true)
+				client.flush
+				
+				expect(client.read).to be == "Hello World"
+			end
+		end
+		
+		it "can send and receive a binary message without compression" do
+			Async::WebSocket::Client.connect(endpoint) do |client|
+				expect(client.writer).to be_a(Protocol::WebSocket::Extension::Compression::Deflate)
+				expect(client.reader).to be_a(Protocol::WebSocket::Extension::Compression::Inflate)
+				
+				client.send_binary("Hello World", compress: false)
 				client.flush
 
 				expect(client.read).to be == "Hello World"