websocket 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa1e04675b3abf21352767a5b1075b77de4dff1670d6644d65b17d09daef059
-  data.tar.gz: dbef4fe08a9ba610b68cd6ab92f2674ab18a4833874040207cac63742ead0100
+  metadata.gz: dc36fa232460616657d774b6ae0d21bac79c8123730812ac1032d185a4fa090a
+  data.tar.gz: 125432097dd592f40606fd4e2d7fb30f1b029b794b832eda0d2f0e9f4b1d824a
 SHA512:
-  metadata.gz: 9874d45a9b3bd2e773bc05540de06f1b2e710fa32bc0ac7da582e77f8e20f79f7d3e9863be9bea590e0b6b741e5f8692f39d483061570398cdae3303fb160ac4
-  data.tar.gz: bac88133308b1f2ce15f27de62ff74309189f2f9ccc9fd9ba006aaa3b936fc13a8e51f92bc2728c1ce52216df4ec2ac9845f8e31a2ef8217dc6e368ae98db515
+  metadata.gz: 825c8e711023468f699cf0cf0a0f9e1ce462a81bc2ca5ea1a1523b079548bd21d9ac9bc0938d47d154a3e4706c23ff71e9abd93612ec9e83f3b1063651e7e7bb
+  data.tar.gz: 66a68866a9c231658d7cdd203250a4c1cab1d860b4fe2523343d77fd7969f48fc86471cc0920795fe52499ee3aa93825294a1651ab6968ca76839ee2ec34d200

data/.rubocop.yml

@@ -2,7 +2,14 @@ require: rubocop-rspec
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.1
+
+# New version of Rubocop does not support 2.0
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Layout/IndentHeredoc:
+  Enabled: false
 
 # Target: 15
 Metrics/AbcSize:

data/.travis.yml

@@ -2,6 +2,8 @@ dist: trusty
 language: ruby
 script: "bundle exec rake"
 rvm:
+  - 2.1
+  - 2.2
   - 2.3
   - 2.4
   - 2.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.8
+
+- restore support for Ruby 2.0+
+
 ## 1.2.7
 
 - fix bug in previous version for Ruby 2.3

data/lib/websocket/frame/handler/handler03.rb

@@ -90,14 +90,14 @@ module WebSocket
         def encode_header
           mask = @frame.outgoing_masking? ? 0b10000000 : 0b00000000
 
-          output = +''
+          output = String.new('')
           output << (type_to_opcode(@frame.type) | (fin ? 0b10000000 : 0b00000000)) # since more, rsv1-3 are 0 and 0x80 for Draft 4
           output << encode_payload_length(@frame.data.size, mask)
           output
         end
 
         def encode_payload_length(length, mask)
-          output = +''
+          output = String.new('')
           if length <= 125
             output << (length | mask) # since rsv4 is 0
           elsif length < 65_536 # write 2 byte length
@@ -198,7 +198,7 @@ module WebSocket
         end
 
         def decode_continuation_frame(application_data, frame_type)
-          @application_data_buffer ||= +''
+          @application_data_buffer ||= String.new('')
           @application_data_buffer << application_data
           @frame_type ||= frame_type
         end

data/lib/websocket/handshake/base.rb

@@ -25,7 +25,7 @@ module WebSocket
         @state = :new
         @handler = nil
 
-        @data = +''
+        @data = String.new('')
         @headers ||= {}
         @protocols ||= []
       end

data/lib/websocket/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebSocket
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'.freeze
 end

data/spec/support/handshake_requests.rb

@@ -1,88 +1,88 @@
 # frozen_string_literal: true
 
 def client_handshake_75(args = {})
-  <<~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
+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 = {})
-  <<~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
+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 = <<~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
+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 = <<~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
+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 = {})
-  <<~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
+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 = {})
-  <<~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
+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 = {})
-  <<~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
+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
 

data/websocket.gemspec

@@ -19,5 +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.required_ruby_version = '>= 2.3'
+  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.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol