websocket-driver 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a069093c87a31c96d30a911bf3855fec2efc384
-  data.tar.gz: ea4afb6bcd928bdd6075e68da402875d9470b2f9
+  metadata.gz: f1bf44c48fb73c1472cc8c5752bc87cd38f545bf
+  data.tar.gz: 9a95a47349ec213020574596650c27d50db93fa7
 SHA512:
-  metadata.gz: 01272dedc949458909b2b6dc3acab09a12812ac5de1b0e1d44796d8406678de2445cfe11cdc47e52d447022c0ea5f86acae8aa592ed5c2575073f2c065411e1a
-  data.tar.gz: 9bd6c3e39ede403a35a3388b1593a8866e3b3dc851e15f86f1799f9a1abe8887fd4888733c35573faf13dd603487110928fbd91fd0f2de61aac8c43a5dbf8131
+  metadata.gz: ddf6c23ad1b0f2a9f9c5f4f67978efbec3916bb26754941008da6a488ea5b151ddd504664699cbf1bcee422aaea2b860955af9ccd5f257266be33e7f344be2fd
+  data.tar.gz: cf55f6a6e0c62790f8b40efa7af9fdb174e354b8a2d14c218a6421f3258c8c2237c38449eb100e53c650191da8df8df35039e6456acf3c783ba2eeccbe79e70a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.2 / 2015-07-18
+
+* When the peer sends a close frame with no error code, emit 1000
+
 ### 0.6.1 / 2015-07-13
 
 * Fix how events are stored in `EventEmitter` to fix a backward-compatibility

data/lib/websocket/driver/hybi.rb

@@ -47,6 +47,7 @@ module WebSocket
       }
 
       ERROR_CODES        = ERRORS.values
+      DEFAULT_ERROR_CODE = 1000
       MIN_RESERVED_ERROR = 3000
       MAX_RESERVED_ERROR = 4999
 
@@ -354,7 +355,7 @@ module WebSocket
             @message << frame
 
           when OPCODES[:close] then
-            code   = (bytesize >= 2) ? 256 * bytes[0] + bytes[1] : nil
+            code   = (bytesize >= 2) ? payload.unpack(PACK_FORMATS[2]).first : nil
             reason = (bytesize > 2)  ? Driver.encode(bytes[2..-1] || [], :utf8) : nil
 
             unless (bytesize == 0) or
@@ -367,7 +368,7 @@ module WebSocket
               code = ERRORS[:protocol_error]
             end
 
-            shutdown(code, reason || '')
+            shutdown(code || DEFAULT_ERROR_CODE, reason || '')
 
           when OPCODES[:ping] then
             frame(payload, :pong)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions