websocket 1.2.2 → 1.2.3

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

@@ -3,7 +3,6 @@ module WebSocket
     module Handler
       # This class and it's descendants are included in client or server handshake in order to extend basic functionality
       class Base
-
         def initialize(handshake)
           @handshake = handshake
         end
@@ -42,7 +41,6 @@ module WebSocket
         def finishing_line
           ''
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Handshake
     module Handler
       class Client < Base
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#header_line
@@ -16,7 +15,6 @@ module WebSocket
         def handshake_keys
           super + @handshake.headers.to_a
         end
-
       end
     end
   end

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

@@ -4,7 +4,6 @@ module WebSocket
   module Handshake
     module Handler
       class Client01 < Client76
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
@@ -13,7 +12,6 @@ module WebSocket
           keys << ['Sec-WebSocket-Draft', @handshake.version]
           keys
         end
-
       end
     end
   end

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

@@ -5,7 +5,6 @@ module WebSocket
   module Handshake
     module Handler
       class Client04 < Client
-
         # @see WebSocket::Handshake::Base#valid?
         def valid?
           super && verify_accept
@@ -16,8 +15,8 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           keys = [
-            ['Upgrade', 'websocket'],
-            ['Connection', 'Upgrade']
+            %w(Upgrade websocket),
+            %w(Connection Upgrade)
           ]
           host = @handshake.host
           host += ":#{@handshake.port}" if @handshake.port
@@ -44,10 +43,9 @@ module WebSocket
         # Verify if received header Sec-WebSocket-Accept matches generated one.
         # @return [Boolean] True if accept is matching. False otherwise(appropriate error is set)
         def verify_accept
-          raise WebSocket::Error::Handshake::InvalidAuthentication unless @handshake.headers['sec-websocket-accept'] == accept
+          fail WebSocket::Error::Handshake::InvalidAuthentication unless @handshake.headers['sec-websocket-accept'] == accept
           true
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Handshake
     module Handler
       class Client11 < Client04
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
@@ -15,7 +14,6 @@ module WebSocket
             end
           end
         end
-
       end
     end
   end

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

@@ -2,14 +2,13 @@ module WebSocket
   module Handshake
     module Handler
       class Client75 < Client
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           keys = [
-            ['Upgrade', 'WebSocket'],
-            ['Connection', 'Upgrade']
+            %w(Upgrade WebSocket),
+            %w(Connection Upgrade)
           ]
           host = @handshake.host
           host += ":#{@handshake.port}" if @handshake.port
@@ -18,7 +17,6 @@ module WebSocket
           keys += super
           keys
         end
-
       end
     end
   end

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

@@ -4,7 +4,6 @@ module WebSocket
   module Handshake
     module Handler
       class Client76 < Client75
-
         # @see WebSocket::Handshake::Base#valid?
         def valid?
           super && verify_challenge
@@ -57,17 +56,17 @@ module WebSocket
                 [@key2_number].pack('N*') +
                 key3
 
-          @challenge = Digest::MD5.digest(sum)
+          @challenge = Digest::MD5.digest(sum).strip
         end
 
         # Verify if challenge sent by server match generated one
         # @return [Boolena] True if challenge matches, false otherwise(sets appropriate error)
         def verify_challenge
-          raise WebSocket::Error::Handshake::InvalidAuthentication unless @handshake.leftovers == challenge
+          fail WebSocket::Error::Handshake::InvalidAuthentication unless @handshake.leftovers == challenge
           true
         end
 
-        NOISE_CHARS = ("\x21".."\x2f").to_a() + ("\x3a".."\x7e").to_a()
+        NOISE_CHARS = ("\x21".."\x2f").to_a + ("\x3a".."\x7e").to_a
 
         # Generate Sec-WebSocket-Key1 and Sec-WebSocket-Key2
         # @param [String] name of key. Will be used to set number variable needed later. Valid values: key1, key2
@@ -78,23 +77,22 @@ module WebSocket
           number = rand(max + 1)
           instance_variable_set("@#{key}_number", number)
           key = (number * spaces).to_s
-          (1 + rand(12)).times() do
+          (1 + rand(12)).times do
             char = NOISE_CHARS[rand(NOISE_CHARS.size)]
             pos = rand(key.size + 1)
             key[pos...pos] = char
           end
-          spaces.times() do
+          spaces.times do
             pos = 1 + rand(key.size - 1)
             key[pos...pos] = ' '
           end
-          return key
+          key
         end
 
         # Generate third key
         def generate_key3
           [rand(0x100000000)].pack('N') + [rand(0x100000000)].pack('N')
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Handshake
     module Handler
       class Server < Base
-
       end
     end
   end

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

@@ -5,7 +5,6 @@ module WebSocket
   module Handshake
     module Handler
       class Server04 < Server
-
         # @see WebSocket::Handshake::Base#valid?
         def valid?
           super && verify_key
@@ -21,8 +20,8 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           [
-            ['Upgrade', 'websocket'],
-            ['Connection', 'Upgrade'],
+            %w(Upgrade websocket),
+            %w(Connection Upgrade),
             ['Sec-WebSocket-Accept', signature]
           ]
         end
@@ -36,14 +35,13 @@ module WebSocket
         end
 
         def verify_key
-          raise WebSocket::Error::Handshake::InvalidAuthentication unless key
+          fail WebSocket::Error::Handshake::InvalidAuthentication unless key
           true
         end
 
         def key
           @handshake.headers['sec-websocket-key']
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Handshake
     module Handler
       class Server75 < Server
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#header_line
@@ -13,13 +12,12 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           [
-            ['Upgrade', 'WebSocket'],
-            ['Connection', 'Upgrade'],
+            %w(Upgrade WebSocket),
+            %w(Connection Upgrade),
             ['WebSocket-Origin', @handshake.headers['origin']],
             ['WebSocket-Location', @handshake.uri]
           ]
         end
-
       end
     end
   end

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

@@ -4,10 +4,9 @@ module WebSocket
   module Handshake
     module Handler
       class Server76 < Server
-
         # @see WebSocket::Handshake::Base#valid?
         def valid?
-          super && !!finishing_line
+          super && !finishing_line.nil?
         end
 
         private
@@ -25,8 +24,8 @@ module WebSocket
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           [
-            ['Upgrade', 'WebSocket'],
-            ['Connection', 'Upgrade'],
+            %w(Upgrade WebSocket),
+            %w(Connection Upgrade),
             ['Sec-WebSocket-Origin', @handshake.headers['origin']],
             ['Sec-WebSocket-Location', @handshake.uri]
           ]
@@ -61,18 +60,17 @@ module WebSocket
 
           spaces = string.scan(/ /).size
           # As per 5.2.5, abort the connection if spaces are zero.
-          raise WebSocket::Error::Handshake::InvalidAuthentication if spaces == 0
+          fail WebSocket::Error::Handshake::InvalidAuthentication if spaces == 0
 
           # As per 5.2.6, abort if numbers is not an integral multiple of spaces
-          raise WebSocket::Error::Handshake::InvalidAuthentication if numbers % spaces != 0
+          fail WebSocket::Error::Handshake::InvalidAuthentication if numbers % spaces != 0
 
           quotient = numbers / spaces
 
-          raise WebSocket::Error::Handshake::InvalidAuthentication if quotient > 2**32 - 1
+          fail WebSocket::Error::Handshake::InvalidAuthentication if quotient > 2**32 - 1
 
-          return quotient
+          quotient
         end
-
       end
     end
   end

data/lib/websocket/handshake/server.rb

@@ -30,7 +30,6 @@ module WebSocket
     #                   # Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
     #
     class Server < Base
-
       # Initialize new WebSocket Server
       #
       # @param [Hash] args Arguments for server
@@ -41,7 +40,7 @@ module WebSocket
       #   Websocket::Handshake::Server.new(secure: true)
       def initialize(args = {})
         super
-        @secure = !!args[:secure]
+        @secure ||= false
       end
 
       # Add text of request from Client. This method will parse content immediately and update version, state and error(if neccessary)
@@ -60,7 +59,7 @@ module WebSocket
       #
       #   EOF
       def <<(data)
-        @data << data
+        super
         set_version if parse_data
       end
       rescue_method :<<
@@ -71,12 +70,9 @@ module WebSocket
       # @example
       #   @handshake.from_rack(env)
       def from_rack(env)
-        @headers = env.select do |key, value|
-          key =~ /\AHTTP_/
-        end.reduce({}) do |memo, tuple|
+        @headers = env.select { |key, _value| key =~ /\AHTTP_/ }.each_with_object({}) do |tuple, memo|
           key, value = tuple
-          memo[key.gsub(/\AHTTP_/, '').gsub('_', '-').downcase] = value
-          memo
+          memo[key.gsub(/\AHTTP_/, '').tr('_', '-').downcase] = value
         end
 
         @path      = env['REQUEST_PATH']
@@ -90,13 +86,13 @@ module WebSocket
         # Better safe than sorry...
         if @version == 76
           input = env['rack.input']
-          @leftovers =  if input.respond_to?(:readpartial)
-                          input.readpartial
-                        elsif input.respond_to?(:read)
-                          input.read
-                        else
-                          input.to_s
-                        end
+          @leftovers = if input.respond_to?(:readpartial)
+                         input.readpartial
+                       elsif input.respond_to?(:read)
+                         input.read
+                       else
+                         input.to_s
+                       end
         end
 
         @state = :finished
@@ -154,28 +150,27 @@ module WebSocket
       # @return [Boolean] false if protocol number is unknown, otherwise true
       def include_version
         @handler = case @version
-          when 75 then Handler::Server75.new(self)
-          when 76, 0..3 then Handler::Server76.new(self)
-          when 4..17 then Handler::Server04.new(self)
-          else raise WebSocket::Error::Handshake::UnknownVersion
-        end
+                   when 75 then Handler::Server75.new(self)
+                   when 76, 0..3 then Handler::Server76.new(self)
+                   when 4..17 then Handler::Server04.new(self)
+                   else fail WebSocket::Error::Handshake::UnknownVersion
+                   end
       end
 
-      PATH = /^(\w+) (\/[^\s]*) HTTP\/1\.1$/
+      PATH = %r{^(\w+) (\/[^\s]*) HTTP\/1\.1$}
 
       # Parse first line of Client response.
       # @param [String] line Line to parse
       # @return [Boolean] True if parsed correctly. False otherwise
       def parse_first_line(line)
         line_parts = line.match(PATH)
-        raise WebSocket::Error::Handshake::InvalidHeader unless line_parts
+        fail WebSocket::Error::Handshake::InvalidHeader unless line_parts
         method = line_parts[1].strip
-        raise WebSocket::Error::Handshake::GetRequestRequired unless method == 'GET'
+        fail WebSocket::Error::Handshake::GetRequestRequired unless method == 'GET'
 
         resource_name = line_parts[2].strip
         @path, @query = resource_name.split('?', 2)
       end
-
     end
   end
 end

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/spec/frame/incoming_03_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe 'Incoming frame draft 03' do
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x84\x03Hel\x03\x03abc\x00\x02lo" }
     let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { ['abc', 'Hello'] }
+    let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'
   end
@@ -114,5 +114,4 @@ RSpec.describe 'Incoming frame draft 03' do
 
     it_should_behave_like 'valid_incoming_frame'
   end
-
 end

data/spec/frame/incoming_04_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe 'Incoming frame draft 04' do
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x04\x03Hel\x83\x03abc\x80\x02lo" }
     let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { ['abc', 'Hello'] }
+    let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'
   end
@@ -114,5 +114,4 @@ RSpec.describe 'Incoming frame draft 04' do
 
     it_should_behave_like 'valid_incoming_frame'
   end
-
 end

data/spec/frame/incoming_05_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe 'Incoming frame draft 05' do
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x04\x03Hel\x83\x03abc\x80\x02lo" }
     let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { ['abc', 'Hello'] }
+    let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'
   end
@@ -130,5 +130,4 @@ RSpec.describe 'Incoming frame draft 05' do
 
     it_should_behave_like 'valid_incoming_frame'
   end
-
 end

data/spec/frame/incoming_07_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe 'Incoming frame draft 07' do
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x01\x03Hel\x8a\x03abc\x80\x02lo" }
     let(:frame_type)   { [:pong, :text] }
-    let(:decoded_text) { ['abc', 'Hello'] }
+    let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'
   end
@@ -147,5 +147,4 @@ RSpec.describe 'Incoming frame draft 07' do
 
     it_should_behave_like 'valid_incoming_frame'
   end
-
 end