websocket-driver 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 547ad558c91b225fb330155dfda3c4b80fce0ffe
-  data.tar.gz: 87efd4c7a99f2a765badd12237966e6c000e7581
+  metadata.gz: 1a13b9adf6ecd4d2e375153c60898f884fb60de1
+  data.tar.gz: adf67dbc8b4eb9f4c582531f026b03c029a596cd
 SHA512:
-  metadata.gz: 1dc8274a20b011cb8caf5d5acb8b96a0c0e4312c1e1f7f722de8304124b7249b97eee978e84f110ac4d6988bfcb098709e4430d890f9dc442f809806d0a0a034
-  data.tar.gz: c4780127df20fbb47c9c3c5fedbc33df99fbed323a1b52cf5b4d1dd0e5a812e0fcd11515dcacd6494214759c035a01e657029cbbfac5bd20d98e2138573f9e04
+  metadata.gz: 40a8dffd61f2aeb1ebb28ca1d368a6bbbc66ab6422d4a7ba68afec740e456d2bf20a783353ce3c0bda0f43dbbbb9a42d68cd61c5c43744647ce544b0049daadd
+  data.tar.gz: 1b93c39aaa658aaf9c736307a4a7e3866768e7c1703aa981b9603a50e76798297aecfc7c20a09699cf96e9d2eb0e24257db90a245bc11ecf9898549ea6211a1a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.5 / 2014-10-04
+
+* Fix bug where the `Server` driver doesn't pass `ping` callbacks to its delegate
+* Fix an arity error when calling `fail_request`
+* Allow `close` to be called before `start` to close the driver
+
 ### 0.3.4 / 2014-07-06
 
 * Don't hold references to frame buffers after a message has been emitted

data/README.md

@@ -1,4 +1,4 @@
-# websocket-driver [![Build Status](https://travis-ci.org/faye/websocket-driver-ruby.png)](https://travis-ci.org/faye/websocket-driver-ruby)
+# websocket-driver [![Build Status](https://travis-ci.org/faye/websocket-driver-ruby.svg)](https://travis-ci.org/faye/websocket-driver-ruby)
 
 This module provides a complete implementation of the WebSocket protocols that
 can be hooked up to any TCP library. It aims to simplify things by decoupling

data/lib/websocket/driver/hybi.rb

@@ -181,17 +181,16 @@ module WebSocket
         reason ||= ''
         code   ||= ERRORS[:normal_closure]
 
-        case @ready_state
-          when 0 then
-            @ready_state = 3
-            emit(:close, CloseEvent.new(code, reason))
-            true
-          when 1 then
-            frame(reason, :close, code)
-            @ready_state = 2
-            true
-          else
-            false
+        if @ready_state <= 0
+          @ready_state = 3
+          emit(:close, CloseEvent.new(code, reason))
+          true
+        elsif @ready_state == 1
+          frame(reason, :close, code)
+          @ready_state = 2
+          true
+        else
+          false
         end
       end
 

data/lib/websocket/driver/server.rb

@@ -23,11 +23,11 @@ module WebSocket
       end
 
       %w[set_header start state frame text binary ping close].each do |method|
-        define_method(method) do |*args|
+        define_method(method) do |*args, &block|
           if @delegate
-            @delegate.__send__(method, *args)
+            @delegate.__send__(method, *args, &block)
           else
-            @queue << [method, args]
+            @queue << [method, args, block]
             true
           end
         end
@@ -61,14 +61,14 @@ module WebSocket
 
     private
 
-      def fail_request
+      def fail_request(message)
         emit(:error, ProtocolError.new(message))
         emit(:close, CloseEvent.new(Hybi::ERRORS[:protocol_error], message))
       end
 
       def open
-        @queue.each do |message|
-          @delegate.__send__(message[0], *message[1])
+        @queue.each do |method, args, block|
+          @delegate.__send__(method, *args, &block)
         end
         @queue = []
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine