websocket 1.2.2 → 1.2.3

data/spec/frame/incoming_75_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'Incoming frame draft 75' do
 
   context 'with two frames' do
     let(:encoded_text) { "\x00abc\xFF\x00def\xFF" }
-    let(:decoded_text) { ['abc', 'def'] }
+    let(:decoded_text) { %w(abc def) }
     let(:frame_type)   { [:text, :text] }
 
     it_should_behave_like 'valid_incoming_frame'
@@ -56,5 +56,4 @@ RSpec.describe 'Incoming frame draft 75' do
 
     it_should_behave_like 'valid_incoming_frame'
   end
-
 end

data/spec/support/all_client_drafts.rb

@@ -43,7 +43,7 @@ RSpec.shared_examples_for 'all client drafts' do
 
   it 'should return valid headers' do
     @request_params = { headers: { 'aaa' => 'bbb' } }
-    expect(handshake.headers).to eql({ 'aaa' => 'bbb' })
+    expect(handshake.headers).to eql('aaa' => 'bbb')
   end
 
   it 'should parse uri' do

data/spec/support/all_server_drafts.rb

@@ -87,10 +87,10 @@ RSpec.shared_examples_for 'all server drafts' do
   it 'should parse 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))
+    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)
     ))
     validate_request
   end
@@ -102,17 +102,14 @@ RSpec.shared_examples_for 'all server drafts' do
 
     path = request.path
     query = request.query_string
-    headers = request.header.reduce({}) do |hash, header|
+    headers = request.header.each_with_object({}) do |header, hash|
       hash[header[0]] = header[1].first if header[0] && header[1]
-      hash
     end
 
-    handshake.from_hash({
-      headers: headers,
-      path: path,
-      query: query,
-      body: body
-    })
+    handshake.from_hash(headers: headers,
+                        path: path,
+                        query: query,
+                        body: body)
 
     validate_request
   end

data/spec/support/frames_base.rb

@@ -1,7 +1,6 @@
 module WebSocket
   module Frame
     class Base
-
       def incoming_masking?
         @handler.masking?
       end
@@ -9,7 +8,6 @@ module WebSocket
       def outgoing_masking?
         false
       end
-
     end
   end
 end

data/spec/support/handshake_requests.rb

@@ -5,7 +5,7 @@ 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
+#{(args[:headers] || {}).map { |key, value| "#{key}: #{value}\r\n" }.join('')}\r
   EOF
 end
 
@@ -27,7 +27,7 @@ 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
+#{(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'}
@@ -54,7 +54,7 @@ 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
+#{(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
@@ -77,7 +77,7 @@ 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
+#{(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

data/spec/support/outgoing_frames.rb

@@ -10,5 +10,4 @@ RSpec.shared_examples_for 'valid_outgoing_frame' do
     its(:error) { is_expected.to eql(error) }
     its(:require_sending?) { is_expected.to eql(require_sending) }
   end
-
 end

data/spec/support/overwrites.rb

@@ -1,9 +1,7 @@
 module WebSocket
-
   module Handshake
     class Base
       attr_reader :handler
     end
   end
-
 end

data/websocket.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "websocket/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'websocket/version'
 
 Gem::Specification.new do |s|
-  s.name        = "websocket"
+  s.name        = 'websocket'
   s.version     = WebSocket::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bernard Potocki"]
-  s.email       = ["bernard.potocki@imanel.org"]
-  s.homepage    = "http://github.com/imanel/websocket-ruby"
-  s.summary     = "Universal Ruby library to handle WebSocket protocol"
-  s.description = "Universal Ruby library to handle WebSocket protocol"
-  s.license     = "MIT"
+  s.authors     = ['Bernard Potocki']
+  s.email       = ['bernard.potocki@imanel.org']
+  s.homepage    = 'http://github.com/imanel/websocket-ruby'
+  s.summary     = 'Universal Ruby library to handle WebSocket protocol'
+  s.description = 'Universal Ruby library to handle WebSocket protocol'
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   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.require_paths = ['lib']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol