websocket 1.2.3 → 1.2.9

data/spec/frame/incoming_05_spec.rb

@@ -1,23 +1,26 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 05' do
+  subject { frame }
+
   let(:version) { 5 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
-  it_should_behave_like 'valid_incoming_frame'
+  it_behaves_like 'valid_incoming_frame'
 
   context 'should properly decode close frame' do
     let(:encoded_text) { "\x81\x05" + decoded_text }
     let(:frame_type) { :close }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode ping frame' do
@@ -25,7 +28,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type) { :ping }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode pong frame' do
@@ -33,7 +36,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type) { :pong }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame' do
@@ -41,7 +44,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:decoded_text) { 'Hello' }
     let(:frame_type) { :text }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode masked text frame' do
@@ -49,7 +52,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:decoded_text) { 'Hello' }
     let(:frame_type) { :text }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame with continuation' do
@@ -57,7 +60,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type)   { :text }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode masked text frame with continuation' do
@@ -65,15 +68,15 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type)   { :text }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x04\x03Hel\x83\x03abc\x80\x02lo" }
-    let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { %w(abc Hello) }
+    let(:frame_type)   { %i[pong text] }
+    let(:decoded_text) { %w[abc Hello] }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should not return unfinished more frame' do
@@ -81,7 +84,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type)   { :pong }
     let(:decoded_text) { 'abc' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode 256 bytes binary frame' do
@@ -89,7 +92,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type) { :binary }
     let(:decoded_text) { 'a' * 256 }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode 64KiB binary frame' do
@@ -97,14 +100,14 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:frame_type) { :binary }
     let(:decoded_text) { 'a' * 65_536 }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should wait with incomplete frame' do
     let(:encoded_text) { "\x84\x06Hello" }
     let(:decoded_text) { nil }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with invalid opcode' do
@@ -112,7 +115,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::UnknownOpcode }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with too long frame' do
@@ -120,7 +123,7 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::TooLong }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with continuation frame without more frame earlier' do
@@ -128,6 +131,6 @@ RSpec.describe 'Incoming frame draft 05' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::UnexpectedContinuationFrame }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 end

data/spec/frame/incoming_07_spec.rb

@@ -1,16 +1,19 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 07' do
+  subject { frame }
+
   let(:version) { 7 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
-  it_should_behave_like 'valid_incoming_frame'
+  it_behaves_like 'valid_incoming_frame'
 
   context 'should properly decode close frame' do
     let(:encoded_text) { "\x88\x07\x03\xE8" + decoded_text }
@@ -18,7 +21,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { 'Hello' }
     let(:close_code) { 1000 }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with invalid close code' do
@@ -26,7 +29,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::UnknownCloseCode }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode close frame with invalid UTF-8 message' do
@@ -34,7 +37,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::InvalidPayloadEncoding }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode ping frame' do
@@ -42,7 +45,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type) { :ping }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode pong frame' do
@@ -50,7 +53,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type) { :pong }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame' do
@@ -58,7 +61,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { 'Hello' }
     let(:frame_type) { :text }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode masked text frame' do
@@ -66,7 +69,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { 'Hello' }
     let(:frame_type) { :text }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame with continuation' do
@@ -74,7 +77,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type)   { :text }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode masked text frame with continuation' do
@@ -82,15 +85,15 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type)   { :text }
     let(:decoded_text) { 'Hello' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x01\x03Hel\x8a\x03abc\x80\x02lo" }
-    let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { %w(abc Hello) }
+    let(:frame_type)   { %i[pong text] }
+    let(:decoded_text) { %w[abc Hello] }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should not return unfinished more frame' do
@@ -98,7 +101,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type)   { :pong }
     let(:decoded_text) { 'abc' }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode 256 bytes binary frame' do
@@ -106,7 +109,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type) { :binary }
     let(:decoded_text) { 'a' * 256 }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should properly decode 64KiB binary frame' do
@@ -114,14 +117,14 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:frame_type) { :binary }
     let(:decoded_text) { 'a' * 65_536 }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should wait with incomplete frame' do
     let(:encoded_text) { "\x81\x06Hello" }
     let(:decoded_text) { nil }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with invalid opcode' do
@@ -129,7 +132,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::UnknownOpcode }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with too long frame' do
@@ -137,7 +140,7 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::TooLong }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'should raise error with continuation frame without more frame earlier' do
@@ -145,6 +148,6 @@ RSpec.describe 'Incoming frame draft 07' do
     let(:decoded_text) { nil }
     let(:error) { WebSocket::Error::Frame::UnexpectedContinuationFrame }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 end

data/spec/frame/incoming_75_spec.rb

@@ -1,31 +1,34 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 75' do
+  subject { frame }
+
   let(:version) { 75 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
-  it_should_behave_like 'valid_incoming_frame'
+  it_behaves_like 'valid_incoming_frame'
 
   context 'with valid text frame' do
     let(:encoded_text) { "\x00abc\xFF" }
     let(:decoded_text) { 'abc' }
     let(:frame_type) { :text }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'with two frames' do
     let(:encoded_text) { "\x00abc\xFF\x00def\xFF" }
-    let(:decoded_text) { %w(abc def) }
-    let(:frame_type)   { [:text, :text] }
+    let(:decoded_text) { %w[abc def] }
+    let(:frame_type)   { %i[text text] }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'with close frame' do
@@ -33,27 +36,27 @@ RSpec.describe 'Incoming frame draft 75' do
     let(:decoded_text) { '' }
     let(:frame_type) { :close }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'with incomplete frame' do
     let(:encoded_text) { "\x00test" }
     let(:decoded_text) { nil }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'with invalid frame' do
     let(:encoded_text) { 'invalid' }
     let(:error) { WebSocket::Error::Frame::Invalid }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 
   context 'with too long frame' do
     let(:encoded_text) { "\x00" + 'a' * WebSocket.max_frame_size + "\xFF" }
     let(:error) { WebSocket::Error::Frame::TooLong }
 
-    it_should_behave_like 'valid_incoming_frame'
+    it_behaves_like 'valid_incoming_frame'
   end
 end

data/spec/frame/incoming_common_spec.rb

@@ -1,22 +1,32 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming common frame' do
   subject { WebSocket::Frame::Incoming.new }
 
-  its(:version) { is_expected.to eql(13) }
-  its(:decoded?) { is_expected.to be false }
-  its(:error?) { is_expected.to be false }
+  it 'is version 13' do
+    expect(subject.version).to be 13
+  end
+
+  it 'is not decoded' do
+    expect(subject.decoded?).to be false
+  end
+
+  it 'has no errors' do
+    expect(subject.error?).to be false
+  end
 
-  it 'should allow adding data via <<' do
-    expect(subject.data).to eql('')
+  it 'allows adding data via <<' do
+    expect(subject.data).to eql ''
     subject << 'test'
-    expect(subject.data).to eql('test')
+    expect(subject.data).to eql 'test'
   end
 
-  it 'should raise error on invalid version' do
+  it 'raises error on invalid version' do
     subject = WebSocket::Frame::Incoming.new(version: 70)
     expect(subject.error?).to be true
-    expect(subject.error).to eql(:unknown_protocol_version)
+    expect(subject.error).to be :unknown_protocol_version
   end
 end

data/spec/frame/masking_spec.rb

@@ -1,8 +1,10 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Masking frame draft 07' do
-  it 'should encode and decode masked frame correctly' do
+  it 'encodes and decode masked frame correctly' do
     outgoing_frame = WebSocket::Frame::Outgoing::Client.new(data: 'Hello World', type: 'text')
     outgoing_frame.to_s
     expect(outgoing_frame.error).to be_nil

data/spec/frame/outgoing_03_spec.rb

@@ -1,17 +1,20 @@
 # encoding: binary
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 03' do
-  let(:version) { 03 }
+  subject { frame }
+
+  let(:version) { 3 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
   let(:encoded_text) { "\x04\x00" }
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
-  it_should_behave_like 'valid_outgoing_frame'
+  it_behaves_like 'valid_outgoing_frame'
 
   context 'should properly encode close frame' do
     let(:frame_type) { :close }
@@ -19,7 +22,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x01\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 ping frame' do
@@ -28,7 +31,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x02\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
@@ -37,7 +40,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x03\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
@@ -45,7 +48,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x04\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
@@ -54,7 +57,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x05\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
@@ -63,7 +66,7 @@ RSpec.describe 'Outgoing frame draft 03' do
     let(:encoded_text) { "\x05\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
@@ -73,6 +76,6 @@ RSpec.describe 'Outgoing frame draft 03' 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