websocket 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.4
+
+- nicer inspect - handful during debugging
+
 ## 1.0.3
 
 - improve pure ruby implementation performance by ~30%

data/README.md

@@ -33,14 +33,14 @@ gem "websocket"
 
 # Parse client request
 @handshake << <<EOF
-GET /demo HTTP/1.1
-Upgrade: websocket
-Connection: Upgrade
-Host: example.com
-Sec-WebSocket-Origin: http://example.com
-Sec-WebSocket-Version: 17
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-
+GET /demo HTTP/1.1\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Host: example.com\r
+Sec-WebSocket-Origin: http://example.com\r
+Sec-WebSocket-Version: 13\r
+Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r
+\r
 EOF
 
 # All data received?
@@ -67,16 +67,16 @@ EOF
                 # Connection: Upgrade
                 # Host: example.com
                 # Sec-WebSocket-Origin: http://example.com
-                # Sec-WebSocket-Version: 17
+                # Sec-WebSocket-Version: 13
                 # Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
 
 # Parse server response
 @handshake << <<EOF
-HTTP/1.1 101 Switching Protocols
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-
+HTTP/1.1 101 Switching Protocols\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r
+\r
 EOF
 
 # All data received?

data/autobahn-server.json

@@ -3,8 +3,8 @@
   "outdir": "./autobahn/server",
 
   "servers": [
-    {"agent": "WebSocket-Ruby<br>(1.0.3 Pure)", "url": "ws://localhost:9001", "options": {"version": 18}},
-    {"agent": "WebSocket-Ruby<br>(1.0.3 Native)", "url": "ws://localhost:9002", "options": {"version": 18}},
+    {"agent": "WebSocket-Ruby<br>(1.0.4 Pure)", "url": "ws://localhost:9001", "options": {"version": 18}},
+    {"agent": "WebSocket-Ruby<br>(1.0.4 Native)", "url": "ws://localhost:9002", "options": {"version": 18}},
     {"agent": "Faye-WebSocket<br>(0.4.6 Thin)", "url": "ws://localhost:7000", "options": {"version": 18}},
     {"agent": "EM-WebSocket<br>(0.3.8)", "url": "ws://localhost:8080", "options": {"version": 18}}
   ],

data/lib/websocket/frame/base.rb

@@ -33,6 +33,13 @@ module WebSocket
         raise NotImplementedError
       end
 
+      # 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)
+        "<#{insp} #{vars}>"
+      end
+
       private
 
       # Include set of methods for selected protocol version

data/lib/websocket/handshake/base.rb

@@ -25,6 +25,13 @@ module WebSocket
         ""
       end
 
+      # 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)
+        "<#{insp} #{vars}>"
+      end
+
       # Is parsing of data finished?
       # @return [Boolena] True if request was completely parsed or error occured. False otherwise
       def finished?

data/lib/websocket/handshake/client.rb

@@ -13,16 +13,16 @@ module WebSocket
     #                   # Connection: Upgrade
     #                   # Host: example.com
     #                   # Sec-WebSocket-Origin: http://example.com
-    #                   # Sec-WebSocket-Version: 17
+    #                   # Sec-WebSocket-Version: 13
     #                   # Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
     #
     #   # Parse server response
     #   @handshake << <<EOF
-    #   HTTP/1.1 101 Switching Protocols
-    #   Upgrade: websocket
-    #   Connection: Upgrade
-    #   Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-    #
+    #   HTTP/1.1 101 Switching Protocols\r
+    #   Upgrade: websocket\r
+    #   Connection: Upgrade\r
+    #   Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r
+    #   \r
     #   EOF
     #
     #   # All data received?

data/lib/websocket/handshake/server.rb

@@ -7,14 +7,14 @@ module WebSocket
     #
     #   # Parse client request
     #   @handshake << <<EOF
-    #   GET /demo HTTP/1.1
-    #   Upgrade: websocket
-    #   Connection: Upgrade
-    #   Host: example.com
-    #   Sec-WebSocket-Origin: http://example.com
-    #   Sec-WebSocket-Version: 17
-    #   Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-    #
+    #   GET /demo HTTP/1.1\r
+    #   Upgrade: websocket\r
+    #   Connection: Upgrade\r
+    #   Host: example.com\r
+    #   Sec-WebSocket-Origin: http://example.com\r
+    #   Sec-WebSocket-Version: 13\r
+    #   Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r
+    #   \r
     #   EOF
     #
     #   # All data received?

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -119,18 +119,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 159948745568353421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 159948745568353421
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24