lib/websocket/handshake/base.rb in websocket-1.1.4 vs lib/websocket/handshake/base.rb in websocket-1.2.0

@@ -10,11 +10,11 @@
       # Initialize new WebSocket Handshake and set it's state to :new
       def initialize(args = {})
         @state = :new
         @handler = nil
 
-        @data = ""
+        @data = ''
         @headers = {}
       end
 
       # @abstract Add data to handshake
       def <<(data)
@@ -22,17 +22,17 @@
       end
 
       # Return textual representation of handshake request or response
       # @return [String] text of response
       def to_s
-        @handler ? @handler.to_s : ""
+        @handler ? @handler.to_s : ''
       end
-      rescue_method :to_s, :return => ""
+      rescue_method :to_s, return: ''
 
       # Recreate inspect as #to_s was overwritten
       def inspect
-        vars = self.instance_variables.map{|v| "#{v}=#{instance_variable_get(v).inspect}"}.join(", ")
+        vars = self.instance_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(', ')
         insp = "#{self.class}:0x%08x" % (self.__id__ * 2)
         "<#{insp} #{vars}>"
       end
 
       # Is parsing of data finished?
@@ -44,28 +44,28 @@
       # 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?
       end
-      rescue_method :valid?, :return => false
+      rescue_method :valid?, return: false
 
       # @abstract Should send data after parsing is finished?
       def should_respond?
         raise 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.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines]
+        @leftovers.to_s.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines]
       end
 
       # URI of request.
       # @return [String] Full URI with protocol
       # @example
       #   @handshake.uri #=> "ws://example.com/path?query=true"
       def uri
-        uri =  secure ? "wss://" : "ws://"
+        uri =  secure ? 'wss://' : 'ws://'
         uri << host
         uri << ":#{port}" if port
         uri << path
         uri << "?#{query}" if query
         uri