Merge pull request websocket-rails#100 from imton/master

on_close and on_error events fixed

Author: DanKnox

Gemfile.lock

@@ -82,6 +82,7 @@ GEM
     headless (0.3.1)
     hike (1.2.1)
     hiredis (0.4.5)
+    hiredis (0.4.5-java)
     i18n (0.6.1)
     jasmine (1.2.1)
       jasmine-core (>= 1.2.0)

lib/assets/javascripts/websocket_rails/websocket_connection.js.coffee

@@ -22,11 +22,11 @@ class WebSocketRails.WebSocketConnection
     @dispatcher.new_message data
 
   on_close: (event) =>
-    close_event = new WebSocketRails.Event(['connection_closed',{}])
+    close_event = new WebSocketRails.Event(['connection_closed', event])
     @dispatcher.dispatch close_event
 
   on_error: (event) =>
-    error_event = new WebSocketRails.Event(['connection_error',event?.data])
+    error_event = new WebSocketRails.Event(['connection_error', event])
     @dispatcher.dispatch error_event
 
   flush_queue: =>

spec/javascripts/support/jasmine.yml

@@ -10,7 +10,7 @@
 #
 src_dir: spec/javascripts
 src_files:
-    - support/vendor/sinon-1.3.4.js
+    - support/vendor/sinon-1.7.1.js
     - generated/assets/websocket_rails.js
     - generated/assets/*.js