faye-websocket 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 533cb535f3f41818edec87a9b712fd0c2ba24765
-  data.tar.gz: ce5b4afbd01902a09b3cd18329d0d8cd430cec71
+  metadata.gz: e55b90e0392792e40296464c5bfb0419042dac2a
+  data.tar.gz: 6d7a46c812d1c98cf23b5fe4f5b7c82149ae2144
 SHA512:
-  metadata.gz: 7171c36500ce120c2c629ba343f61d7a76b71e83a6306c7f3c16c0f92916344f28ff7b7aa61d8cf9f1bddec8d7ba2f5c16f1ae33d09103af9bc4afef8d4e0445
-  data.tar.gz: 897610520dbabadc000077d7b585de835ace6e7222cca7a7c207861d7533b221fd492d24e8a726c289a60776d0e64bc57cb9e77d88ef07219d4b592f8b032c53
+  metadata.gz: 807a1837ccc7d7817f611c21aeeb05d7d8e64795e10b83aaf6bb93145044e956626b27feeef228dca7ea21b7930c544caf11f6d37f95d5b6c463d3d300b6e2b4
+  data.tar.gz: eefb00619befa06948f8d2752b6c670d16ed2ae1da71809780b7c3b0400b799118fd241758afd9c6565b8916a8b17af3f222afd3480e2c185776b7de1779beca

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.9.2 / 2014-12-21
+
+* Only emit `error` once, and don't emit it after `close`
+
+
 ### 0.9.1 / 2014-12-18
 
 * Check that all options to the WebSocket constructor are recognized

data/lib/faye/websocket.rb

@@ -83,7 +83,7 @@ module Faye
 
     class Stream < RackStream
       def fail
-        @socket_object.__send__(:finalize, '', 1006)
+        @socket_object.__send__(:finalize_close)
       end
 
       def receive(data)

data/lib/faye/websocket/api.rb

@@ -36,12 +36,10 @@ module Faye
 
         @driver.on(:open)    { |e| open }
         @driver.on(:message) { |e| receive_message(e.data) }
-        @driver.on(:close)   { |e| finalize(e.reason, e.code) }
+        @driver.on(:close)   { |e| begin_close(e.reason, e.code) }
 
         @driver.on(:error) do |error|
-          event = Event.create('error', :message => error.message)
-          event.init_event('error', false, false)
-          dispatch_event(event)
+          emit_error(error.message)
         end
 
         if @ping
@@ -52,6 +50,34 @@ module Faye
         end
       end
 
+      def write(data)
+        @stream.write(data)
+      end
+
+      def send(message)
+        return false if @ready_state > OPEN
+        case message
+          when Numeric then @driver.text(message.to_s)
+          when String  then @driver.text(message)
+          when Array   then @driver.binary(message)
+          else false
+        end
+      end
+
+      def ping(message = '', &callback)
+        return false if @ready_state > OPEN
+        @driver.ping(message, &callback)
+      end
+
+      def close
+        @ready_state = CLOSING unless @ready_state == CLOSED
+        @driver.close
+      end
+
+      def protocol
+        @driver.protocol || ''
+      end
+
     private
 
       def open
@@ -69,49 +95,43 @@ module Faye
         dispatch_event(event)
       end
 
-      def finalize(reason = nil, code = nil)
-        return if @ready_state == CLOSED
-        @ready_state = CLOSED
-        EventMachine.cancel_timer(@ping_timer) if @ping_timer
-        @stream.close_connection_after_writing if @stream
-        event = Event.create('close', :code => code || 1000, :reason => reason || '')
-        event.init_event('close', false, false)
-        dispatch_event(event)
-      end
+      def emit_error(message)
+        return if @ready_state >= CLOSING
 
-      def parse(data)
-        worker = @proxy || @driver
-        worker.parse(data)
+        event = Event.create('error', :message => message)
+        event.init_event('error', false, false)
+        dispatch_event(event)
       end
 
-    public
-
-      def write(data)
-        @stream.write(data)
-      end
+      def begin_close(reason, code)
+        return if @ready_state == CLOSED
+        @ready_state = CLOSING
 
-      def send(message)
-        return false if @ready_state > OPEN
-        case message
-          when Numeric then @driver.text(message.to_s)
-          when String  then @driver.text(message)
-          when Array   then @driver.binary(message)
-          else false
+        if @stream
+          @stream.close_connection_after_writing
+        else
+          finalize_close
         end
+        @close_params = [reason, code]
       end
 
-      def ping(message = '', &callback)
-        return false if @ready_state > OPEN
-        @driver.ping(message, &callback)
-      end
+      def finalize_close
+        return if @ready_state == CLOSED
+        @ready_state = CLOSED
 
-      def close
-        @ready_state = CLOSING unless @ready_state == CLOSED
-        @driver.close
+        EventMachine.cancel_timer(@ping_timer) if @ping_timer
+
+        reason = @close_params ? @close_params[0] : ''
+        code   = @close_params ? @close_params[1] : 1006
+
+        event = Event.create('close', :code => code, :reason => reason)
+        event.init_event('close', false, false)
+        dispatch_event(event)
       end
 
-      def protocol
-        @driver.protocol || ''
+      def parse(data)
+        worker = @proxy || @driver
+        worker.parse(data)
       end
     end
 

data/lib/faye/websocket/client.rb

@@ -50,19 +50,17 @@ module Faye
         end
 
         EventMachine.connect(endpoint.host, port, Connection) do |conn|
-          @stream = conn
           conn.parent = self
         end
       rescue => error
-        event = Event.create('error', :message => "Network error: #{url}: #{error.message}")
-        event.init_event('error', false, false)
-        dispatch_event(event)
-        finalize('', 1006)
+        emit_error("Network error: #{url}: #{error.message}")
+        finalize_close
       end
 
     private
 
-      def on_connect()
+      def on_connect(stream)
+        @stream = stream
         @stream.start_tls(@socket_tls) if @secure
         worker = @proxy || @driver
         worker.start
@@ -72,7 +70,7 @@ module Faye
         attr_accessor :parent
 
         def connection_completed
-          parent.__send__(:on_connect)
+          parent.__send__(:on_connect, self)
         end
 
         def receive_data(data)
@@ -80,7 +78,7 @@ module Faye
         end
 
         def unbind
-          parent.__send__(:finalize, '', 1006)
+          parent.__send__(:finalize_close)
         end
 
         def write(data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine