websocket 1.2.2 → 1.2.3

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

@@ -4,13 +4,13 @@ module WebSocket
   module Frame
     module Handler
       class Handler04 < Handler03
-
         private
 
         # The only difference between draft 03 framing and draft 04 framing is
         # that the MORE bit has been changed to a FIN bit
-        def fin; true; end
-
+        def fin
+          true
+        end
       end
     end
   end

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

@@ -4,10 +4,10 @@ module WebSocket
   module Frame
     module Handler
       class Handler05 < Handler04
-
         # Since handler 5 masking should be enabled by default
-        def masking?; true; end
-
+        def masking?
+          true
+        end
       end
     end
   end

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

@@ -4,7 +4,6 @@ module WebSocket
   module Frame
     module Handler
       class Handler07 < Handler05
-
         # Hash of frame names and it's opcodes
         FRAME_TYPES = {
           continuation: 0,
@@ -12,7 +11,7 @@ module WebSocket
           binary: 2,
           close: 8,
           ping: 9,
-          pong: 10,
+          pong: 10
         }
 
         # Hash of frame opcodes and it's names
@@ -21,7 +20,7 @@ module WebSocket
         def encode_frame
           if @frame.type == :close
             code = @frame.code || 1000
-            raise WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(code)
+            fail WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(code)
             @frame.data = Data.new([code].pack('n') + @frame.data.to_s)
             @frame.code = nil
           end
@@ -30,11 +29,11 @@ module WebSocket
 
         def decode_frame
           result = super
-          if has_close_code?(result)
+          if close_code?(result)
             code = result.data.slice!(0..1)
             result.code = code.unpack('n').first
-            raise WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(result.code)
-            raise WebSocket::Error::Frame::InvalidPayloadEncoding unless valid_encoding?(result.data)
+            fail WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(result.code)
+            fail WebSocket::Error::Frame::InvalidPayloadEncoding unless valid_encoding?(result.data)
           end
           result
         end
@@ -53,7 +52,7 @@ module WebSocket
           false
         end
 
-        def has_close_code?(frame)
+        def close_code?(frame)
           frame && frame.type == :close && !frame.data.empty?
         end
 
@@ -62,7 +61,7 @@ module WebSocket
         # @return [Integer] opcode or nil
         # @raise [WebSocket::Error] if frame opcode is not known
         def type_to_opcode(frame_type)
-          FRAME_TYPES[frame_type] || raise(WebSocket::Error::Frame::UnknownFrameType)
+          FRAME_TYPES[frame_type] || fail(WebSocket::Error::Frame::UnknownFrameType)
         end
 
         # Convert frame opcode to type name
@@ -70,9 +69,8 @@ module WebSocket
         # @return [Symbol] Frame type name or nil
         # @raise [WebSocket::Error] if frame type name is not known
         def opcode_to_type(opcode)
-          FRAME_TYPES_INVERSE[opcode] || raise(WebSocket::Error::Frame::UnknownOpcode)
+          FRAME_TYPES_INVERSE[opcode] || fail(WebSocket::Error::Frame::UnknownOpcode)
         end
-
       end
     end
   end

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

@@ -4,7 +4,6 @@ module WebSocket
   module Frame
     module Handler
       class Handler75 < Base
-
         # @see WebSocket::Frame::Base#supported_frames
         def supported_frames
           [:text, :close]
@@ -13,12 +12,12 @@ module WebSocket
         # @see WebSocket::Frame::Handler::Base#encode_frame
         def encode_frame
           case @frame.type
-            when :close then "\xff\x00"
-            when :text then
-              ary = ["\x00", @frame.data, "\xff"]
-              ary.map { |s| s.encode('UTF-8', 'UTF-8', invalid: :replace) }
-              ary.join
-            else raise WebSocket::Error::Frame::UnknownFrameType
+          when :close then "\xff\x00"
+          when :text then
+            ary = ["\x00", @frame.data, "\xff"]
+            ary.map { |s| s.encode('UTF-8', 'UTF-8', invalid: :replace) }
+            ary.join
+          else fail WebSocket::Error::Frame::UnknownFrameType
           end
         end
 
@@ -43,9 +42,9 @@ module WebSocket
               break unless (b & 0x80) == 0x80
             end
 
-            raise WebSocket::Error::Frame::TooLong if length > ::WebSocket.max_frame_size
+            fail WebSocket::Error::Frame::TooLong if length > ::WebSocket.max_frame_size
 
-            unless @frame.data.getbyte(pointer + length - 1) == nil
+            unless @frame.data.getbyte(pointer + length - 1).nil?
               # Straight from spec - I'm sure this isn't crazy...
               # 6. Read /length/ bytes.
               # 7. Discard the read bytes.
@@ -59,10 +58,10 @@ module WebSocket
           else
             # If the high-order bit of the /frame type/ byte is _not_ set
 
-            raise WebSocket::Error::Frame::Invalid if @frame.data.getbyte(0) != 0x00
+            fail WebSocket::Error::Frame::Invalid if @frame.data.getbyte(0) != 0x00
 
             # Addition to the spec to protect against malicious requests
-            raise WebSocket::Error::Frame::TooLong if @frame.data.size > ::WebSocket.max_frame_size
+            fail WebSocket::Error::Frame::TooLong if @frame.data.size > ::WebSocket.max_frame_size
 
             msg = @frame.data.slice!(/\A\x00[^\xff]*\xff/)
             if msg
@@ -72,7 +71,6 @@ module WebSocket
             end
           end
         end
-
       end
     end
   end

data/lib/websocket/frame/incoming.rb

@@ -9,7 +9,6 @@ module WebSocket
     #   frame.next # "Hello"
     #   frame.next # "world!""
     class Incoming < Base
-
       autoload :Client, "#{::WebSocket::ROOT}/websocket/frame/incoming/client"
       autoload :Server, "#{::WebSocket::ROOT}/websocket/frame/incoming/server"
 
@@ -46,7 +45,6 @@ module WebSocket
       def to_s
         @data
       end
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Frame
     class Incoming
       class Client < Incoming
-
         def incoming_masking?
           false
         end
@@ -10,7 +9,6 @@ module WebSocket
         def outgoing_masking?
           @handler.masking?
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Frame
     class Incoming
       class Server < Incoming
-
         def incoming_masking?
           @handler.masking?
         end
@@ -10,7 +9,6 @@ module WebSocket
         def outgoing_masking?
           false
         end
-
       end
     end
   end

data/lib/websocket/frame/outgoing.rb

@@ -7,7 +7,6 @@ module WebSocket
     #   frame = WebSocket::Frame::Outgoing::Server.new(version: @handshake.version, data: "Hello", type: :text)
     #   frame.to_s # "\x81\x05\x48\x65\x6c\x6c\x6f"
     class Outgoing < Base
-
       autoload :Client, "#{::WebSocket::ROOT}/websocket/frame/outgoing/client"
       autoload :Server, "#{::WebSocket::ROOT}/websocket/frame/outgoing/server"
 
@@ -25,11 +24,10 @@ module WebSocket
 
       # Return raw frame formatted for sending.
       def to_s
-        raise WebSocket::Error::Frame::UnknownFrameType unless supported?
+        fail WebSocket::Error::Frame::UnknownFrameType unless supported?
         @handler.encode_frame
       end
       rescue_method :to_s
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Frame
     class Outgoing
       class Client < Outgoing
-
         def incoming_masking?
           false
         end
@@ -10,7 +9,6 @@ module WebSocket
         def outgoing_masking?
           @handler.masking?
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module WebSocket
   module Frame
     class Outgoing
       class Server < Outgoing
-
         def incoming_masking?
           @handler.masking?
         end
@@ -10,7 +9,6 @@ module WebSocket
         def outgoing_masking?
           false
         end
-
       end
     end
   end

data/lib/websocket/handshake.rb

@@ -1,10 +1,8 @@
 module WebSocket
   module Handshake
-
     autoload :Base,    "#{::WebSocket::ROOT}/websocket/handshake/base"
     autoload :Client,  "#{::WebSocket::ROOT}/websocket/handshake/client"
     autoload :Handler, "#{::WebSocket::ROOT}/websocket/handshake/handler"
     autoload :Server,  "#{::WebSocket::ROOT}/websocket/handshake/server"
-
   end
 end

data/lib/websocket/handshake/base.rb

@@ -9,16 +9,18 @@ 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) }
+
         @state = :new
         @handler = nil
 
         @data = ''
-        @headers = {}
+        @headers ||= {}
       end
 
       # @abstract Add data to handshake
       def <<(data)
-        raise NotImplementedError
+        @data << data
       end
 
       # Return textual representation of handshake request or response
@@ -30,8 +32,8 @@ module WebSocket
 
       # Recreate inspect as #to_s was overwritten
       def inspect
-        vars = self.instance_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(', ')
-        insp = "#{self.class}:0x%08x" % (self.__id__ * 2)
+        vars = instance_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(', ')
+        insp = Kernel.format("#{self.class}:0x%08x", __id__)
         "<#{insp} #{vars}>"
       end
 
@@ -44,19 +46,19 @@ module WebSocket
       # Is parsed data valid?
       # @return [Boolean] False if some errors occured. Reason for error could be found in error method
       def valid?
-        finished? && @error == nil && @handler && @handler.valid?
+        finished? && @error.nil? && @handler && @handler.valid?
       end
       rescue_method :valid?, return: false
 
       # @abstract Should send data after parsing is finished?
       def should_respond?
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       # Data left from parsing. Sometimes data that doesn't belong to handshake are added - use this method to retrieve them.
       # @return [String] String if some data are available. Nil otherwise
       def leftovers
-        (@leftovers.to_s.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines] || "").strip
+        (@leftovers.to_s.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines] || '').strip
       end
 
       # URI of request.
@@ -82,7 +84,7 @@ module WebSocket
 
       # Changes state to error and sets error message
       # @param [String] message Error message to set
-      def set_error(message)
+      def error=(message)
         @state = :error
         super
       end
@@ -108,7 +110,6 @@ module WebSocket
         @state = :finished
         true
       end
-
     end
   end
 end

data/lib/websocket/handshake/client.rb

@@ -32,7 +32,6 @@ module WebSocket
     #   @handshake.valid?
     #
     class Client < Base
-
       attr_reader :origin, :headers
 
       # Initialize new WebSocket Client
@@ -55,28 +54,19 @@ module WebSocket
       def initialize(args = {})
         super
 
-        @version = args[:version] || DEFAULT_VERSION
-        @origin = args[:origin]
-        @headers = args[:headers] || {}
-
-        if args[:url] || args[:uri]
-          uri     = URI.parse(args[:url] || args[:uri])
-          @secure = (uri.scheme == 'wss')
-          @host   = uri.host
-          @port   = uri.port
-          @path   = uri.path
-          @query  = uri.query
+        if @url || @uri
+          uri = URI.parse(@url || @uri)
+          @secure ||= (uri.scheme == 'wss')
+          @host ||= uri.host
+          @port ||= uri.port
+          @path ||= uri.path
+          @query ||= uri.query
         end
 
-        @secure = args[:secure] if args[:secure]
-        @host   = args[:host]   if args[:host]
-        @port   = args[:port]   if args[:port]
-        @path   = args[:path]   if args[:path]
-        @query  = args[:query]  if args[:query]
+        @path = '/' if @path.nil? || @path.empty?
+        @version ||= DEFAULT_VERSION
 
-        @path   = '/'           if @path.nil? || @path.empty?
-
-        raise WebSocket::Error::Handshake::NoHostProvided unless @host
+        fail WebSocket::Error::Handshake::NoHostProvided unless @host
 
         include_version
       end
@@ -95,10 +85,8 @@ module WebSocket
       #
       #   EOF
       def <<(data)
-        @data << data
-        if parse_data
-
-        end
+        super
+        parse_data
       end
       rescue_method :<<
 
@@ -114,27 +102,26 @@ module WebSocket
       # @return [Boolean] false if protocol number is unknown, otherwise true
       def include_version
         @handler = case @version
-          when 75 then Handler::Client75.new(self)
-          when 76, 0 then Handler::Client76.new(self)
-          when 1..3  then Handler::Client01.new(self)
-          when 4..10 then Handler::Client04.new(self)
-          when 11..17 then Handler::Client11.new(self)
-          else raise WebSocket::Error::Handshake::UnknownVersion
-        end
+                   when 75 then Handler::Client75.new(self)
+                   when 76, 0 then Handler::Client76.new(self)
+                   when 1..3  then Handler::Client01.new(self)
+                   when 4..10 then Handler::Client04.new(self)
+                   when 11..17 then Handler::Client11.new(self)
+                   else fail WebSocket::Error::Handshake::UnknownVersion
+                   end
       end
 
-      FIRST_LINE = /^HTTP\/1\.1 (\d{3})[\w\s]*$/
+      FIRST_LINE = %r{^HTTP\/1\.1 (\d{3})[\w\s]*$}
 
       # Parse first line of Server response.
       # @param [String] line Line to parse
       # @return [Boolean] True if parsed correctly. False otherwise
       def parse_first_line(line)
         line_parts = line.match(FIRST_LINE)
-        raise WebSocket::Error::Handshake::InvalidHeader unless line_parts
+        fail WebSocket::Error::Handshake::InvalidHeader unless line_parts
         status = line_parts[1]
-        raise WebSocket::Error::Handshake::InvalidStatusCode unless status == '101'
+        fail WebSocket::Error::Handshake::InvalidStatusCode unless status == '101'
       end
-
     end
   end
 end

data/lib/websocket/handshake/handler.rb

@@ -1,7 +1,6 @@
 module WebSocket
   module Handshake
     module Handler
-
       autoload :Base,     "#{::WebSocket::ROOT}/websocket/handshake/handler/base"
 
       autoload :Client,   "#{::WebSocket::ROOT}/websocket/handshake/handler/client"
@@ -15,7 +14,6 @@ module WebSocket
       autoload :Server04, "#{::WebSocket::ROOT}/websocket/handshake/handler/server04"
       autoload :Server75, "#{::WebSocket::ROOT}/websocket/handshake/handler/server75"
       autoload :Server76, "#{::WebSocket::ROOT}/websocket/handshake/handler/server76"
-
     end
   end
 end