RubyGems - websocket - Versions diffs - 1.2.5 → 1.2.7 - Mend

websocket 1.2.5 → 1.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

checksums.yaml +5 -5
data/.codeclimate.yml +1 -0
data/.rubocop.yml +4 -1
data/.travis.yml +1 -5
data/CHANGELOG.md +8 -0
data/Gemfile +5 -3
data/Rakefile +3 -1
data/lib/websocket.rb +3 -1
data/lib/websocket/error.rb +2 -0
data/lib/websocket/exception_handler.rb +2 -0
data/lib/websocket/frame.rb +2 -0
data/lib/websocket/frame/base.rb +2 -0
data/lib/websocket/frame/data.rb +3 -1
data/lib/websocket/frame/handler.rb +2 -0
data/lib/websocket/frame/handler/base.rb +4 -2
data/lib/websocket/frame/handler/handler03.rb +5 -4
data/lib/websocket/frame/handler/handler04.rb +1 -0
data/lib/websocket/frame/handler/handler05.rb +1 -0
data/lib/websocket/frame/handler/handler07.rb +2 -1
data/lib/websocket/frame/handler/handler75.rb +2 -1
data/lib/websocket/frame/incoming.rb +2 -0
data/lib/websocket/frame/incoming/client.rb +2 -0
data/lib/websocket/frame/incoming/server.rb +2 -0
data/lib/websocket/frame/outgoing.rb +2 -0
data/lib/websocket/frame/outgoing/client.rb +2 -0
data/lib/websocket/frame/outgoing/server.rb +2 -0
data/lib/websocket/handshake.rb +2 -0
data/lib/websocket/handshake/base.rb +12 -3
data/lib/websocket/handshake/client.rb +2 -0
data/lib/websocket/handshake/handler.rb +2 -0
data/lib/websocket/handshake/handler/base.rb +2 -0
data/lib/websocket/handshake/handler/client.rb +2 -0
data/lib/websocket/handshake/handler/client01.rb +2 -0
data/lib/websocket/handshake/handler/client04.rb +4 -2
data/lib/websocket/handshake/handler/client11.rb +2 -0
data/lib/websocket/handshake/handler/client75.rb +4 -2
data/lib/websocket/handshake/handler/client76.rb +4 -2
data/lib/websocket/handshake/handler/server.rb +2 -0
data/lib/websocket/handshake/handler/server04.rb +4 -2
data/lib/websocket/handshake/handler/server75.rb +4 -2
data/lib/websocket/handshake/handler/server76.rb +2 -0
data/lib/websocket/handshake/server.rb +2 -0
data/lib/websocket/nice_inspect.rb +2 -0
data/lib/websocket/version.rb +3 -1
data/spec/frame/incoming_03_spec.rb +18 -16
data/spec/frame/incoming_04_spec.rb +18 -16
data/spec/frame/incoming_05_spec.rb +20 -18
data/spec/frame/incoming_07_spec.rb +22 -20
data/spec/frame/incoming_75_spec.rb +11 -9
data/spec/frame/incoming_common_spec.rb +1 -0
data/spec/frame/masking_spec.rb +1 -0
data/spec/frame/outgoing_03_spec.rb +10 -8
data/spec/frame/outgoing_04_spec.rb +10 -8
data/spec/frame/outgoing_05_spec.rb +10 -8
data/spec/frame/outgoing_07_spec.rb +11 -9
data/spec/frame/outgoing_75_spec.rb +6 -4
data/spec/frame/outgoing_common_spec.rb +1 -0
data/spec/handshake/client_04_spec.rb +6 -4
data/spec/handshake/client_11_spec.rb +3 -1
data/spec/handshake/client_75_spec.rb +4 -2
data/spec/handshake/client_76_spec.rb +4 -2
data/spec/handshake/server_04_spec.rb +4 -2
data/spec/handshake/server_75_spec.rb +4 -2
data/spec/handshake/server_76_spec.rb +4 -2
data/spec/spec_helper.rb +2 -0
data/spec/support/all_client_drafts.rb +2 -0
data/spec/support/all_server_drafts.rb +2 -0
data/spec/support/frames_base.rb +2 -0
data/spec/support/handshake_requests.rb +65 -63
data/spec/support/incoming_frames.rb +2 -0
data/spec/support/outgoing_frames.rb +2 -0
data/spec/support/overwrites.rb +2 -0
data/websocket.gemspec +2 -2
metadata +3 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1beb710905d152c983423d7119156b054b515c3
-  data.tar.gz: e74c5149d1ff19ff7b5ed25a499c0d2b2d3bef4b
+SHA256:
+  metadata.gz: 9fa1e04675b3abf21352767a5b1075b77de4dff1670d6644d65b17d09daef059
+  data.tar.gz: dbef4fe08a9ba610b68cd6ab92f2674ab18a4833874040207cac63742ead0100
 SHA512:
-  metadata.gz: 2ec8c925807edd84216c70bfdc7947f9d24c5f37d9ca4eb11274f8f32d99bd0e405b7fe3ad405d1ad835318a18ef9aaf0256bf4d0996ef6bedbdf89455b2b6e0
-  data.tar.gz: 8a64ac2c2bb7da84c15afe43df803abc14d90a6d7e65d358f7a52b909c663a2fab1641c14e0d2666ed5d712f2e6c0bae97dd1ce31818fd48dbde77184bf7e855
+  metadata.gz: 9874d45a9b3bd2e773bc05540de06f1b2e710fa32bc0ac7da582e77f8e20f79f7d3e9863be9bea590e0b6b741e5f8692f39d483061570398cdae3303fb160ac4
+  data.tar.gz: bac88133308b1f2ce15f27de62ff74309189f2f9ccc9fd9ba006aaa3b936fc13a8e51f92bc2728c1ce52216df4ec2ac9845f8e31a2ef8217dc6e368ae98db515

data/.codeclimate.yml CHANGED

@@ -9,6 +9,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
+    channel: rubocop-0-52
 ratings:
   paths:
   - "**.rb"

data/.rubocop.yml CHANGED

@@ -2,7 +2,7 @@ require: rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
 # Target: 15
 Metrics/AbcSize:
@@ -40,6 +40,9 @@ Metrics/PerceivedComplexity:
     - lib/websocket/frame/handler/handler75.rb
     - spec/support/handshake_requests.rb
+RSpec/ContextWording:
+  Enabled: false
 RSpec/DescribeClass:
   Enabled: false

data/.travis.yml CHANGED

@@ -2,10 +2,9 @@ dist: trusty
 language: ruby
 script: "bundle exec rake"
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - ruby-head
   - jruby-9.1.9.0 # https://github.com/travis-ci/travis-ci/issues/8446
   - jruby-head
@@ -16,6 +15,3 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx-3
-before_install:
-  - gem update bundler

data/CHANGELOG.md CHANGED

@@ -1,5 +1,13 @@
 # Changelog
+## 1.2.7
+- fix bug in previous version for Ruby 2.3
+## 1.2.6
+- duplicate variables passed in initializers to avoid changing them
 ## 1.2.5
 - make handshake server resilient to non-string Rack env keys

data/Gemfile CHANGED

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
 source 'http://rubygems.org'
 group :development do
   gem 'rake'
-  gem 'rspec', '~> 3.0'
+  gem 'rspec', '~> 3.7'
   # Use same version as Code Climate for consistency with CI
   # https://github.com/codeclimate/codeclimate-rubocop/blob/master/Gemfile.lock
-  gem 'rubocop', '0.46.0', require: false
-  gem 'rubocop-rspec', '1.8.0', require: false
+  gem 'rubocop', '0.52.1', require: false
+  gem 'rubocop-rspec', '1.21.0', require: false
 end
 gemspec

data/Rakefile CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'bundler'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -11,7 +13,7 @@ end
 RuboCop::RakeTask.new
-task default: %i(spec rubocop)
+task default: %i[spec rubocop]
 namespace :autobahn do
   desc 'Run autobahn tests for client'

data/lib/websocket.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 # WebSocket protocol implementation in Ruby
 # This module does not provide a WebSocket server or client, but is made for using
 # in http servers or clients to provide WebSocket support.
@@ -6,7 +8,7 @@
 module WebSocket
   # Default WebSocket version to use
   DEFAULT_VERSION = 13
-  ROOT = File.expand_path(File.dirname(__FILE__))
+  ROOT = __dir__
   autoload :Error,            "#{ROOT}/websocket/error"
   autoload :ExceptionHandler, "#{ROOT}/websocket/exception_handler"

data/lib/websocket/error.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   class Error < RuntimeError
     class Frame < ::WebSocket::Error

data/lib/websocket/exception_handler.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module ExceptionHandler
     attr_accessor :error

data/lib/websocket/frame.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     autoload :Base,     "#{::WebSocket::ROOT}/websocket/frame/base"

data/lib/websocket/frame/base.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     # @abstract Subclass and override to implement custom frames

data/lib/websocket/frame/data.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     class Data < String
@@ -11,7 +13,7 @@ module WebSocket
       # Convert all arguments to ASCII-8BIT for easier traversing
       def convert_args(args)
-        args.each { |arg| arg.force_encoding('ASCII-8BIT') }
+        args.collect { |arg| arg.dup.force_encoding('ASCII-8BIT') }
       end
       # Extract mask from 4 first bytes according to spec

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     module Handler

data/lib/websocket/frame/handler/base.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     module Handler
@@ -24,14 +26,14 @@ module WebSocket
         # @param [Symbol] frame_type Frame type
         # @return [Boolean] True if given frame type is control frame
         def control_frame?(frame_type)
-          !%i(text binary continuation).include?(frame_type)
+          !%i[text binary continuation].include?(frame_type)
         end
         # Check if frame is one of data frames
         # @param [Symbol] frame_type Frame type
         # @return [Boolean] True if given frame type is data frame
         def data_frame?(frame_type)
-          %i(text binary).include?(frame_type)
+          %i[text binary].include?(frame_type)
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 require 'securerandom'
@@ -21,7 +22,7 @@ module WebSocket
         # @see WebSocket::Frame::Base#supported_frames
         def supported_frames
-          %i(text binary close ping pong)
+          %i[text binary close ping pong]
         end
         # @see WebSocket::Frame::Handler::Base#encode_frame
@@ -89,14 +90,14 @@ module WebSocket
         def encode_header
           mask = @frame.outgoing_masking? ? 0b10000000 : 0b00000000
-          output = ''
+          output = +''
           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 = +''
           if length <= 125
             output << (length | mask) # since rsv4 is 0
           elsif length < 65_536 # write 2 byte length
@@ -197,7 +198,7 @@ module WebSocket
         end
         def decode_continuation_frame(application_data, frame_type)
-          @application_data_buffer ||= ''
+          @application_data_buffer ||= +''
           @application_data_buffer << application_data
           @frame_type ||= frame_type
         end

data/lib/websocket/frame/handler/handler04.rb CHANGED

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 module WebSocket
   module Frame

data/lib/websocket/frame/handler/handler05.rb CHANGED

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 module WebSocket
   module Frame

data/lib/websocket/frame/handler/handler07.rb CHANGED

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 module WebSocket
   module Frame
@@ -48,7 +49,7 @@ module WebSocket
           return true if data.nil?
           data.encode('UTF-8')
           true
-        rescue
+        rescue StandardError
           false
         end

data/lib/websocket/frame/handler/handler75.rb CHANGED

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 module WebSocket
   module Frame
@@ -6,7 +7,7 @@ module WebSocket
       class Handler75 < Base
         # @see WebSocket::Frame::Base#supported_frames
         def supported_frames
-          %i(text close)
+          %i[text close]
         end
         # @see WebSocket::Frame::Handler::Base#encode_frame

data/lib/websocket/frame/incoming.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     # Construct or parse incoming WebSocket Frame.

data/lib/websocket/frame/incoming/client.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     class Incoming

data/lib/websocket/frame/incoming/server.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     class Incoming

data/lib/websocket/frame/outgoing.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     # Construct or parse incoming WebSocket Frame.

data/lib/websocket/frame/outgoing/client.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     class Outgoing

data/lib/websocket/frame/outgoing/server.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Frame
     class Outgoing

data/lib/websocket/handshake.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Handshake
     autoload :Base,    "#{::WebSocket::ROOT}/websocket/handshake/base"

data/lib/websocket/handshake/base.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Handshake
     # @abstract Subclass and override to implement custom handshakes
@@ -11,12 +13,19 @@ module WebSocket
       # Initialize new WebSocket Handshake and set it's state to :new
       def initialize(args = {})
-        args.each { |k, v| instance_variable_set("@#{k}", v) }
+        args.each do |k, v|
+          value = begin
+            v.dup
+          rescue TypeError
+            v
+          end
+          instance_variable_set("@#{k}", value)
+        end
         @state = :new
         @handler = nil
-        @data = ''
+        @data = +''
         @headers ||= {}
         @protocols ||= []
       end
@@ -62,7 +71,7 @@ module WebSocket
       # @example
       #   @handshake.uri #=> "ws://example.com/path?query=true"
       def uri
-        uri =  secure ? 'wss://' : 'ws://'
+        uri =  String.new(secure ? 'wss://' : 'ws://')
         uri << host
         uri << ":#{port}" if port
         uri << path

data/lib/websocket/handshake/client.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'uri'
 module WebSocket

data/lib/websocket/handshake/handler.rb CHANGED

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

data/lib/websocket/handshake/handler/base.rb CHANGED

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

data/lib/websocket/handshake/handler/client.rb CHANGED

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

data/lib/websocket/handshake/handler/client01.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'digest/md5'
 module WebSocket

data/lib/websocket/handshake/handler/client04.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'digest/sha1'
 require 'base64'
@@ -15,8 +17,8 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           keys = [
-            %w(Upgrade websocket),
-            %w(Connection Upgrade)
+            %w[Upgrade websocket],
+            %w[Connection Upgrade]
           ]
           host = @handshake.host
           host += ":#{@handshake.port}" if @handshake.port

data/lib/websocket/handshake/handler/client11.rb CHANGED

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

data/lib/websocket/handshake/handler/client75.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module WebSocket
   module Handshake
     module Handler
@@ -12,8 +14,8 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           keys = [
-            %w(Upgrade WebSocket),
-            %w(Connection Upgrade)
+            %w[Upgrade WebSocket],
+            %w[Connection Upgrade]
           ]
           host = @handshake.host
           host += ":#{@handshake.port}" if @handshake.port

data/lib/websocket/handshake/handler/client76.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'digest/md5'
 module WebSocket
@@ -72,12 +74,12 @@ module WebSocket
         # @param [String] name of key. Will be used to set number variable needed later. Valid values: key1, key2
         # @return [String] generated key
         def generate_key(key)
-          spaces = 1 + rand(12)
+          spaces = rand(1..12)
           max = 0xffffffff / spaces
           number = rand(max + 1)
           instance_variable_set("@#{key}_number", number)
           key = (number * spaces).to_s
-          (1 + rand(12)).times do
+          rand(1..12).times do
             char = NOISE_CHARS[rand(NOISE_CHARS.size)]
             pos = rand(key.size + 1)
             key[pos...pos] = char