websocket 1.2.4 → 1.2.5

data/spec/support/all_server_drafts.rb

@@ -1,3 +1,5 @@
+require 'webrick'
+
 RSpec.shared_examples_for 'all server drafts' do
   def validate_request
     handshake << client_request
@@ -8,7 +10,7 @@ RSpec.shared_examples_for 'all server drafts' do
     expect(handshake.to_s).to eql(server_response)
   end
 
-  it 'should be valid' do
+  it 'is valid' do
     handshake << client_request
 
     expect(handshake.error).to be_nil
@@ -16,86 +18,87 @@ RSpec.shared_examples_for 'all server drafts' do
     expect(handshake).to be_valid
   end
 
-  it 'should return valid version' do
+  it 'returns valid version' do
     handshake << client_request
 
     expect(handshake.version).to eql(version)
   end
 
-  it 'should return valid host' do
+  it 'returns valid host' do
     @request_params = { host: 'www.test.cc' }
     handshake << client_request
 
     expect(handshake.host).to eql('www.test.cc')
   end
 
-  it 'should return valid path' do
+  it 'returns valid path' do
     @request_params = { path: '/custom' }
     handshake << client_request
 
     expect(handshake.path).to eql('/custom')
   end
 
-  it 'should return valid query' do
+  it 'returns valid query' do
     @request_params = { path: '/custom?aaa=bbb' }
     handshake << client_request
 
     expect(handshake.query).to eql('aaa=bbb')
   end
 
-  it 'should return valid port' do
+  it 'returns valid port' do
     @request_params = { port: 123 }
     handshake << client_request
 
     expect(handshake.port).to eql('123')
   end
 
-  it 'should return valid response' do
+  it 'returns valid response' do
     validate_request
   end
 
-  it 'should allow custom path' do
+  it 'allows custom path' do
     @request_params = { path: '/custom' }
     validate_request
   end
 
-  it 'should allow query in path' do
+  it 'allows query in path' do
     @request_params = { path: '/custom?test=true' }
     validate_request
   end
 
-  it 'should allow custom port' do
+  it 'allows custom port' do
     @request_params = { port: 123 }
     validate_request
   end
 
-  it 'should recognize unfinished requests' do
+  it 'recognizes unfinished requests' do
     handshake << client_request[0..-10]
 
     expect(handshake).not_to be_finished
     expect(handshake).not_to be_valid
   end
 
-  it 'should disallow requests with invalid request method' do
+  it 'disallows requests with invalid request method' do
     handshake << client_request.gsub('GET', 'POST')
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:get_request_required)
+    expect(handshake.error).to be(:get_request_required)
   end
 
-  it 'should parse a rack request' do
+  it 'parses a rack request' do
     request = WEBrick::HTTPRequest.new(ServerSoftware: 'rspec')
     expect(request.parse(StringIO.new(client_request))).to be true
     rest = client_request.slice((request.to_s.length..-1))
 
     handshake.from_rack(request.meta_vars.merge(
-                          'rack.input' => StringIO.new(rest)
+                          'rack.input' => StringIO.new(rest),
+                          :random_key => :random_value
     ))
     validate_request
   end
 
-  it 'should parse a hash request' do
+  it 'parses a hash request' do
     request = WEBrick::HTTPRequest.new(ServerSoftware: 'rspec')
     expect(request.parse(StringIO.new(client_request))).to be true
     body = client_request.slice((request.to_s.length..-1))

data/spec/support/incoming_frames.rb

@@ -2,14 +2,31 @@ 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 'should have specified number of returned frames' do
+  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 '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 +40,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,10 +51,10 @@ 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 }
+    before { WebSocket.should_raise = true }
+    after { WebSocket.should_raise = false }
 
-    it 'should have specified number of returned frames' do
+    it 'has specified number of returned frames' do
       if error
         expect do
           decoded_text_array.each_with_index do |da, index|

data/spec/support/outgoing_frames.rb

@@ -1,13 +1,33 @@
 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/websocket.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'websocket/version'
 
@@ -18,8 +19,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'rubocop'
+  s.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2017-11-14 00:00:00.000000000 Z
+dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
 - bernard.potocki@imanel.org
@@ -73,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -115,6 +60,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
@@ -157,7 +103,7 @@ 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:
   - - ">="
@@ -165,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol