websocket 1.2.5 → 1.2.7

data/spec/frame/outgoing_07_spec.rb

@@ -1,9 +1,11 @@
 # encoding: binary
+# frozen_string_literal: true
 
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 07' do
   subject { frame }
+
   let(:version) { 7 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type, code: close_code) }
   let(:decoded_text) { '' }
@@ -13,7 +15,7 @@ RSpec.describe 'Outgoing frame draft 07' do
   let(:require_sending) { true }
   let(:error) { nil }
 
-  it_should_behave_like 'valid_outgoing_frame'
+  it_behaves_like 'valid_outgoing_frame'
 
   context 'should properly encode close frame without close code' do
     let(:frame_type) { :close }
@@ -21,7 +23,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x88\x07\x03\xE8" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode close frame with close code' do
@@ -31,7 +33,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x88\x07\x03\xE9" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode ping frame' do
@@ -40,7 +42,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x89\x05" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode pong frame' do
@@ -49,7 +51,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x8a\x05" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode text frame' do
@@ -57,7 +59,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x81\x05" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode 256 bytes binary frame' do
@@ -66,7 +68,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x82\x7E\x01\x00" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode 64KiB binary frame' do
@@ -75,7 +77,7 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:encoded_text) { "\x82\x7F\x00\x00\x00\x00\x00\x01\x00\x00" + decoded_text }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should return error for unknown frame type' do
@@ -85,6 +87,6 @@ RSpec.describe 'Outgoing frame draft 07' do
     let(:error) { :unknown_frame_type }
     let(:require_sending) { false }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 end

data/spec/frame/outgoing_75_spec.rb

@@ -1,9 +1,11 @@
 # encoding: binary
+# frozen_string_literal: true
 
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 75' do
   subject { frame }
+
   let(:version) { 75 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
@@ -12,14 +14,14 @@ RSpec.describe 'Outgoing frame draft 75' do
   let(:require_sending) { true }
   let(:error) { nil }
 
-  it_should_behave_like 'valid_outgoing_frame'
+  it_behaves_like 'valid_outgoing_frame'
 
   context 'should properly encode text frame' do
     let(:decoded_text) { 'abc' }
     let(:encoded_text) { "\x00abc\xFF" }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should properly encode close frame' do
@@ -28,7 +30,7 @@ RSpec.describe 'Outgoing frame draft 75' do
     let(:encoded_text) { "\xFF\x00" }
     let(:require_sending) { true }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 
   context 'should return error for unknown frame type' do
@@ -38,6 +40,6 @@ RSpec.describe 'Outgoing frame draft 75' do
     let(:error) { :unknown_frame_type }
     let(:require_sending) { false }
 
-    it_should_behave_like 'valid_outgoing_frame'
+    it_behaves_like 'valid_outgoing_frame'
   end
 end

data/spec/frame/outgoing_common_spec.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 
 require 'spec_helper'
 

data/spec/handshake/client_04_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Client draft 4 handshake' do
@@ -7,7 +9,7 @@ RSpec.describe 'Client draft 4 handshake' do
   let(:client_request) { client_handshake_04({ key: handshake.handler.send(:key), version: version }.merge(@request_params || {})) }
   let(:server_response) { server_handshake_04({ accept: handshake.handler.send(:accept) }.merge(@request_params || {})) }
 
-  it_should_behave_like 'all client drafts'
+  it_behaves_like 'all client drafts'
 
   it 'disallows client with invalid challenge' do
     @request_params = { accept: 'invalid' }
@@ -22,7 +24,7 @@ RSpec.describe 'Client draft 4 handshake' do
     let(:handshake) { WebSocket::Handshake::Client.new(uri: 'ws://example.com/demo', origin: 'http://example.com', version: version, protocols: protocols) }
 
     context 'single protocol requested' do
-      let(:protocols) { %w(binary) }
+      let(:protocols) { %w[binary] }
 
       it 'returns a valid handshake' do
         @request_params = { headers: { 'Sec-WebSocket-Protocol' => 'binary' } }
@@ -34,7 +36,7 @@ RSpec.describe 'Client draft 4 handshake' do
     end
 
     context 'multiple protocols requested' do
-      let(:protocols) { %w(binary xmpp) }
+      let(:protocols) { %w[binary xmpp] }
 
       it 'returns with a valid handshake' do
         @request_params = { headers: { 'Sec-WebSocket-Protocol' => 'xmpp' } }
@@ -46,7 +48,7 @@ RSpec.describe 'Client draft 4 handshake' do
     end
 
     context 'unsupported protocol requested' do
-      let(:protocols) { %w(binary xmpp) }
+      let(:protocols) { %w[binary xmpp] }
 
       it 'fails with an unsupported protocol error' do
         @request_params = { headers: { 'Sec-WebSocket-Protocol' => 'generic' } }

data/spec/handshake/client_11_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Client draft 11 handshake' do
@@ -7,7 +9,7 @@ RSpec.describe 'Client draft 11 handshake' do
   let(:client_request) { client_handshake_11({ key: handshake.handler.send(:key), version: version }.merge(@request_params || {})) }
   let(:server_response) { server_handshake_11({ accept: handshake.handler.send(:accept) }.merge(@request_params || {})) }
 
-  it_should_behave_like 'all client drafts'
+  it_behaves_like 'all client drafts'
 
   it 'disallows client with invalid challenge' do
     @request_params = { accept: 'invalid' }

data/spec/handshake/client_75_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Client draft 75 handshake' do
@@ -7,10 +9,10 @@ RSpec.describe 'Client draft 75 handshake' do
   let(:client_request) { client_handshake_75(@request_params || {}) }
   let(:server_response) { server_handshake_75(@request_params || {}) }
 
-  it_should_behave_like 'all client drafts'
+  it_behaves_like 'all client drafts'
 
   context 'protocol header specified' do
-    let(:handshake) { WebSocket::Handshake::Client.new(uri: 'ws://example.com/demo', origin: 'http://example.com', version: version, protocols: %w(binary)) }
+    let(:handshake) { WebSocket::Handshake::Client.new(uri: 'ws://example.com/demo', origin: 'http://example.com', version: version, protocols: %w[binary]) }
 
     context 'supported' do
       it 'returns a valid handshake' do

data/spec/handshake/client_76_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Client draft 76 handshake' do
@@ -7,7 +9,7 @@ RSpec.describe 'Client draft 76 handshake' do
   let(:client_request) { client_handshake_76({ key1: handshake.handler.send(:key1), key2: handshake.handler.send(:key2), key3: handshake.handler.send(:key3) }.merge(@request_params || {})) }
   let(:server_response) { server_handshake_76({ challenge: handshake.handler.send(:challenge) }.merge(@request_params || {})) }
 
-  it_should_behave_like 'all client drafts'
+  it_behaves_like 'all client drafts'
 
   it 'disallows client with invalid challenge' do
     @request_params = { challenge: 'invalid' }
@@ -19,7 +21,7 @@ RSpec.describe 'Client draft 76 handshake' do
   end
 
   context 'protocol header specified' do
-    let(:handshake) { WebSocket::Handshake::Client.new(uri: 'ws://example.com/demo', origin: 'http://example.com', version: version, protocols: %w(binary)) }
+    let(:handshake) { WebSocket::Handshake::Client.new(uri: 'ws://example.com/demo', origin: 'http://example.com', version: version, protocols: %w[binary]) }
 
     context 'supported' do
       it 'returns a valid handshake' do

data/spec/handshake/server_04_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Server draft 04 handshake' do
@@ -6,7 +8,7 @@ RSpec.describe 'Server draft 04 handshake' do
   let(:client_request) { client_handshake_04(@request_params || {}) }
   let(:server_response) { server_handshake_04(@request_params || {}) }
 
-  it_should_behave_like 'all server drafts'
+  it_behaves_like 'all server drafts'
 
   it 'disallows request without Sec-WebSocket-Key' do
     handshake << client_request.gsub(/^Sec-WebSocket-Key:.*\n/, '')
@@ -17,7 +19,7 @@ RSpec.describe 'Server draft 04 handshake' do
   end
 
   context 'protocol header specified' do
-    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w(binary xmpp)) }
+    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w[binary xmpp]) }
 
     context 'single protocol requested' do
       it 'returns with the same protocol' do

data/spec/handshake/server_75_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Server draft 75 handshake' do
@@ -7,10 +9,10 @@ RSpec.describe 'Server draft 75 handshake' do
   let(:client_request) { client_handshake_75(@request_params || {}) }
   let(:server_response) { server_handshake_75(@request_params || {}) }
 
-  it_should_behave_like 'all server drafts'
+  it_behaves_like 'all server drafts'
 
   context 'protocol header specified' do
-    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w(binary)) }
+    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w[binary]) }
 
     context 'supported' do
       it 'returns with the same protocol' do

data/spec/handshake/server_76_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Server draft 76 handshake' do
@@ -6,7 +8,7 @@ RSpec.describe 'Server draft 76 handshake' do
   let(:client_request) { client_handshake_76(@request_params || {}) }
   let(:server_response) { server_handshake_76(@request_params || {}) }
 
-  it_should_behave_like 'all server drafts'
+  it_behaves_like 'all server drafts'
 
   it 'disallows request without spaces in key 1' do
     @request_params = { key1: '4@146546xW%0l15' }
@@ -45,7 +47,7 @@ RSpec.describe 'Server draft 76 handshake' do
   end
 
   context 'protocol header specified' do
-    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w(binary)) }
+    let(:handshake) { WebSocket::Handshake::Server.new(protocols: %w[binary]) }
 
     context 'supported' do
       it 'returns with the same protocol' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 
 require 'websocket'

data/spec/support/all_client_drafts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for 'all client drafts' do
   def validate_request
     expect(handshake.to_s).to eql(client_request)

data/spec/support/all_server_drafts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'webrick'
 
 RSpec.shared_examples_for 'all server drafts' do

data/spec/support/frames_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebSocket
   module Frame
     class Base

data/spec/support/handshake_requests.rb

@@ -1,87 +1,89 @@
+# frozen_string_literal: true
+
 def client_handshake_75(args = {})
-  <<-EOF
-GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
-Upgrade: WebSocket\r
-Connection: Upgrade\r
-Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
-Origin: http://example.com\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}\r
-  EOF
+  <<~REQUEST
+    GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+    Upgrade: WebSocket\r
+    Connection: Upgrade\r
+    Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+    Origin: http://example.com\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}\r
+  REQUEST
 end
 
 def server_handshake_75(args = {})
-  <<-EOF
-HTTP/1.1 101 Web Socket Protocol Handshake\r
-Upgrade: WebSocket\r
-Connection: Upgrade\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}WebSocket-Origin: http://example.com\r
-WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
-\r
-  EOF
+  <<~REQUEST
+    HTTP/1.1 101 Web Socket Protocol Handshake\r
+    Upgrade: WebSocket\r
+    Connection: Upgrade\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}WebSocket-Origin: http://example.com\r
+    WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
+    \r
+  REQUEST
 end
 
 def client_handshake_76(args = {})
-  request = <<-EOF
-GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
-Upgrade: WebSocket\r
-Connection: Upgrade\r
-Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
-Origin: http://example.com\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Key1: #{args[:key1] || '4 @1  46546xW%0l 1 5'}\r
-Sec-WebSocket-Key2: #{args[:key2] || '12998 5 Y3 1  .P00'}\r
-\r
-#{args[:key3] || '^n:ds[4U'}
-  EOF
+  request = <<~REQUEST
+    GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+    Upgrade: WebSocket\r
+    Connection: Upgrade\r
+    Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+    Origin: http://example.com\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Key1: #{args[:key1] || '4 @1  46546xW%0l 1 5'}\r
+    Sec-WebSocket-Key2: #{args[:key2] || '12998 5 Y3 1  .P00'}\r
+    \r
+    #{args[:key3] || '^n:ds[4U'}
+  REQUEST
   request[0..-2]
 end
 
 def server_handshake_76(args = {})
-  request = <<-EOF
-HTTP/1.1 101 WebSocket Protocol Handshake\r
-Upgrade: WebSocket\r
-Connection: Upgrade\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Origin: http://example.com\r
-Sec-WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
-\r
-#{args[:challenge] || "8jKS'y:G*Co,Wxa-"}
-  EOF
+  request = <<~REQUEST
+    HTTP/1.1 101 WebSocket Protocol Handshake\r
+    Upgrade: WebSocket\r
+    Connection: Upgrade\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Origin: http://example.com\r
+    Sec-WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
+    \r
+    #{args[:challenge] || "8jKS'y:G*Co,Wxa-"}
+  REQUEST
   request[0..-2]
 end
 
 def client_handshake_04(args = {})
-  <<-EOF
-GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Origin: http://example.com\r
-Sec-WebSocket-Version: #{args[:version] || '4'}\r
-Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
-\r
-  EOF
+  <<~REQUEST
+    GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+    Upgrade: websocket\r
+    Connection: Upgrade\r
+    Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Origin: http://example.com\r
+    Sec-WebSocket-Version: #{args[:version] || '4'}\r
+    Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
+    \r
+  REQUEST
 end
 
 def server_handshake_04(args = {})
-  <<-EOF
-HTTP/1.1 101 Switching Protocols\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
-\r
-  EOF
+  <<~REQUEST
+    HTTP/1.1 101 Switching Protocols\r
+    Upgrade: websocket\r
+    Connection: Upgrade\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
+    \r
+  REQUEST
 end
 
 def client_handshake_11(args = {})
-  <<-EOF
-GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
-#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Origin: http://example.com\r
-Sec-WebSocket-Version: #{args[:version] || '4'}\r
-Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
-\r
-  EOF
+  <<~REQUEST
+    GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+    Upgrade: websocket\r
+    Connection: Upgrade\r
+    Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+    #{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Origin: http://example.com\r
+    Sec-WebSocket-Version: #{args[:version] || '4'}\r
+    Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
+    \r
+  REQUEST
 end
 
 def server_handshake_11(args = {})