websocket-eventmachine-base 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75ada130e34ec2730b2d8571091ce6d97370851
-  data.tar.gz: e6e1c3ec4d8b19f62a7b1124d93a103c76f84126
+  metadata.gz: ab8f99614a55d645b702a55b57adf360d77a7f2d
+  data.tar.gz: c1e0876073fb7ddc122d3e35264989600dc18396
 SHA512:
-  metadata.gz: 7e09acc073f641a7d4ae024fa40c86aaf7f3e72d92a7fef213ae31ffe074e9d7e98b665b3caa04153cd5b9f8f201b59eec81d3f280a5ca173cc337e6855a4906
-  data.tar.gz: fab4a0281c5369c0555bfa165f0d20707d1b19fe45d340b23e923c62376743e52b95c76997e0d53477e5b9ee6bfc0b650c6310cad5be566928f2159f2c1e9b9b
+  metadata.gz: 789fd5bd8667a5664932b564f501a19ea5f99ee7b3f2f6af5c906d2d8b8836a7a4b68bd26487620322cb6727a4c133bdd8551e31aec8c8348de13395fce99a5b
+  data.tar.gz: 6f95f5a175c97bd7ed6c63d4b27400a1bc16fd8049d1c10d2fa67ca163287e5fe5cbe60edd2a6eb0234ed020bd31b93c871c30d7726cdd9932cba1be3c6ab2ea

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0
+
+- return status code and message instead of just message in on_close callback (@Sumo-MBryant)
+- you can now pass custom headers for client handshake (@Sumo-MBryant)
+
 ## 1.0.3
 
 - return proper close codes

data/lib/websocket/eventmachine/base.rb

@@ -25,7 +25,9 @@ module WebSocket
       def onopen(&blk);     @onopen = blk;    end
 
       # Called when connection is closed.
-      # No parameters are passed to block
+      # Two parameters are passed to block:
+      #   code - status code
+      #   reason - optional reason for closure
       def onclose(&blk);    @onclose = blk;   end
 
       # Called when error occurs.
@@ -120,7 +122,7 @@ module WebSocket
         unless @state == :closed
           @state = :closed
           close
-          trigger_onclose('')
+          trigger_onclose(1002, '')
         end
       end
 
@@ -137,13 +139,20 @@ module WebSocket
         end
       end
 
-      ['onerror', 'onping', 'onpong', 'onclose'].each do |m|
+      ['onerror', 'onping', 'onpong'].each do |m|
         define_method "trigger_#{m}" do |data|
           callback = instance_variable_get("@#{m}")
           callback.call(data) if callback
         end
       end
 
+      ['onclose'].each do |m|
+        define_method "trigger_#{m}" do |code, reason|
+          callback = instance_variable_get("@#{m}")
+          callback.call(code, reason) if callback
+        end
+      end
+
       def trigger_onmessage(data, type)
         @onmessage.call(data, type) if @onmessage
       end
@@ -158,7 +167,7 @@ module WebSocket
           trigger_onopen
           handle_open(@handshake.leftovers) if @handshake.leftovers
         else
-          trigger_onerror(@handshake.error)
+          trigger_onerror(@handshake.error.to_s)
           close
         end
       end
@@ -171,7 +180,7 @@ module WebSocket
             when :close
               @state = :closing
               close
-              trigger_onclose(frame.to_s)
+              trigger_onclose(frame.code, frame.data)
             when :ping
               pong(frame.to_s)
               trigger_onping(frame.to_s)
@@ -194,6 +203,7 @@ module WebSocket
           when :invalid_payload_encoding then 1007
           else 1002
         end
+        trigger_onerror(error.to_s)
         close(error_code)
         unbind
       end
@@ -202,7 +212,7 @@ module WebSocket
         unless @state == :closed
           @state = :closed
           close
-          trigger_onclose('')
+          trigger_onclose(1000, '')
         end
       end
 

data/lib/websocket/eventmachine/base/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module EventMachine
     class Base
-      VERSION = '1.0.3'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-eventmachine-base
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket