websocket 1.2.3 → 1.2.9

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,27 +1,29 @@
+# frozen_string_literal: true
+
 def client_handshake_75(args = {})
-  <<-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
-  EOF
+  REQUEST
 end
 
 def server_handshake_75(args = {})
-  <<-EOF
+  <<-REQUEST
 HTTP/1.1 101 Web Socket Protocol Handshake\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
-WebSocket-Origin: http://example.com\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
 end
 
 def client_handshake_76(args = {})
-  request = <<-EOF
+  request = <<-REQUEST
 GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
@@ -31,25 +33,25 @@ Origin: http://example.com\r
 Sec-WebSocket-Key2: #{args[:key2] || '12998 5 Y3 1  .P00'}\r
 \r
 #{args[:key3] || '^n:ds[4U'}
-  EOF
+  REQUEST
   request[0..-2]
 end
 
 def server_handshake_76(args = {})
-  request = <<-EOF
+  request = <<-REQUEST
 HTTP/1.1 101 WebSocket Protocol Handshake\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
-Sec-WebSocket-Origin: http://example.com\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[0..-2]
 end
 
 def client_handshake_04(args = {})
-  <<-EOF
+  <<-REQUEST
 GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: websocket\r
 Connection: Upgrade\r
@@ -58,21 +60,21 @@ Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
 Sec-WebSocket-Version: #{args[:version] || '4'}\r
 Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
 \r
-  EOF
+  REQUEST
 end
 
 def server_handshake_04(args = {})
-  <<-EOF
+  <<-REQUEST
 HTTP/1.1 101 Switching Protocols\r
 Upgrade: websocket\r
 Connection: Upgrade\r
-Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
+#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
 \r
-  EOF
+  REQUEST
 end
 
 def client_handshake_11(args = {})
-  <<-EOF
+  <<-REQUEST
 GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: websocket\r
 Connection: Upgrade\r
@@ -81,7 +83,7 @@ Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
 Sec-WebSocket-Version: #{args[:version] || '4'}\r
 Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
 \r
-  EOF
+  REQUEST
 end
 
 def server_handshake_11(args = {})

data/spec/support/incoming_frames.rb

@@ -1,15 +1,34 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for 'valid_incoming_frame' do
   let(:decoded_text_array) { Array(decoded_text) }
   let(:frame_type_array) { Array(frame_type) }
 
-  its(:class) { is_expected.to eql(WebSocket::Frame::Incoming) }
-  its(:data) { is_expected.to eql(encoded_text || '') }
-  its(:version) { is_expected.to eql(version) }
-  its(:type) { is_expected.to be_nil }
-  its(:decoded?) { is_expected.to be false }
-  its(:to_s) { is_expected.to eql(encoded_text || '') }
+  it 'is incoming frame' do
+    expect(subject.class).to be WebSocket::Frame::Incoming
+  end
+
+  it 'is in proper verions' do
+    expect(subject.version).to eql version
+  end
 
-  it 'should have specified number of returned frames' do
+  it 'does not have type set' do
+    expect(subject.type).to be nil
+  end
+
+  it 'is not decoded' do
+    expect(subject.decoded?).to be false
+  end
+
+  it 'contains encoded data' do
+    expect(subject.data).to eql(encoded_text || '')
+  end
+
+  it 'returns data as to_s' do
+    expect(subject.to_s).to eql(encoded_text || '')
+  end
+
+  it 'has specified number of returned frames' do
     decoded_text_array.each_with_index do |da, index|
       n = subject.next
       expect(n).not_to be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
@@ -23,7 +42,7 @@ RSpec.shared_examples_for 'valid_incoming_frame' do
     end
   end
 
-  it 'should return valid decoded frame for each specified decoded texts' do
+  it 'returns valid decoded frame for each specified decoded texts' do
     decoded_text_array.each_with_index do |da, index|
       f = subject.next
       expect(f.decoded?).to be true
@@ -34,23 +53,25 @@ RSpec.shared_examples_for 'valid_incoming_frame' do
   end
 
   context 'with raising' do
-    before(:each) { WebSocket.should_raise = true }
-    after(:each) { WebSocket.should_raise = false }
-
-    it 'should have specified number of returned frames' do
-      expect do
-        decoded_text_array.each_with_index do |da, index|
-          n = subject.next
-          expect(n).not_to be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
-          expect(n.class).to eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
-        end
-        expect(subject.next).to be_nil
-        if error.is_a?(Class)
-          expect(subject.error).to eql(error.new.message)
-        else
-          expect(subject.error).to eql(error)
-        end
-      end.to raise_error(error) if error
+    before { WebSocket.should_raise = true }
+    after { WebSocket.should_raise = false }
+
+    it 'has specified number of returned frames' do
+      if error
+        expect do
+          decoded_text_array.each_with_index do |da, index|
+            n = subject.next
+            expect(n).not_to be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
+            expect(n.class).to eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
+          end
+          expect(subject.next).to be_nil
+          if error.is_a?(Class)
+            expect(subject.error).to eql(error.new.message)
+          else
+            expect(subject.error).to eql(error)
+          end
+        end.to raise_error(error)
+      end
     end
   end
 end

data/spec/support/outgoing_frames.rb

@@ -1,13 +1,35 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for 'valid_outgoing_frame' do
-  its(:class) { is_expected.to eql(WebSocket::Frame::Outgoing) }
-  its(:version) { is_expected.to eql(version) }
-  its(:type) { is_expected.to eql(frame_type) }
-  its(:data) { is_expected.to eql(decoded_text) }
-  its(:to_s) { is_expected.to eql(encoded_text) }
+  it 'is outgoing frame' do
+    expect(subject.class).to be WebSocket::Frame::Outgoing
+  end
+
+  it 'is in proper verions' do
+    expect(subject.version).to eql version
+  end
+
+  it 'has proper type set' do
+    expect(subject.type).to eql frame_type
+  end
+
+  it 'contains decoded data' do
+    expect(subject.data).to eql(decoded_text)
+  end
+
+  it 'returns encoded data as to_s' do
+    expect(subject.to_s).to eql(encoded_text)
+  end
 
   context 'after parsing' do
-    before(:each) { subject.to_s }
-    its(:error) { is_expected.to eql(error) }
-    its(:require_sending?) { is_expected.to eql(require_sending) }
+    before { subject.to_s }
+
+    it 'has valid errors set' do
+      expect(subject.error).to eql error
+    end
+
+    it 'requires sending' do
+      expect(subject.require_sending?).to eql require_sending
+    end
   end
 end

data/spec/support/overwrites.rb

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

data/websocket.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'websocket/version'
 
@@ -17,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
+
+  s.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.9
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
@@ -17,6 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -59,6 +61,7 @@ files:
 - lib/websocket/handshake/handler/server75.rb
 - lib/websocket/handshake/handler/server76.rb
 - lib/websocket/handshake/server.rb
+- lib/websocket/nice_inspect.rb
 - lib/websocket/version.rb
 - spec/frame/incoming_03_spec.rb
 - spec/frame/incoming_04_spec.rb
@@ -101,15 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol