Updating fork with latest from master

.gitignore

@@ -12,3 +12,4 @@ test/dummy/log/*.log
 test/dummy/tmp/
 .rbx/
 spec/javascripts/generated/
+tmp/rspec_guard_result

.travis.yml

@@ -6,3 +6,8 @@ before_script:
   - "sh -e /etc/init.d/xvfb start"
 services:
   - redis-server
+notifications:
+  irc:
+    channels: 
+      - "chat.freenode.net#websocket-rails"
+    on_success: change

CHANGELOG.md

@@ -1,5 +1,9 @@
 # WebsocketRails Change Log
 
+## UNRELEASED
+
+* Convert controller's `action_name` to a string to get AbstractController::Callbacks (`before_action`) working properly [fixes #150]
+
 ## Version 0.6.2
 
 September 8 2013

Gemfile.lock

@@ -8,6 +8,7 @@ PATH
       rack
       rails
       redis
+      redis-objects
       thin
 
 GEM
@@ -41,7 +42,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
+    arel (4.0.1)
     atomic (1.1.10)
     atomic (1.1.10-java)
     builder (3.1.4)
@@ -100,7 +101,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.25)
     minitest (4.7.5)
     multi_json (1.7.7)
     polyglot (0.3.3)
@@ -135,7 +136,9 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
-    redis (3.0.4)
+    redis (3.0.5)
+    redis-objects (0.7.0)
+      redis (>= 3.0.2)
     ref (1.0.5)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -172,7 +175,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -191,7 +194,7 @@ GEM
     thread_safe (0.1.0)
       atomic
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)

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

@@ -0,0 +1,45 @@
+###
+ Abstract Interface for the WebSocketRails client.
+###
+class WebSocketRails.AbstractConnection
+
+  constructor: (url, @dispatcher) ->
+    @message_queue   = []
+
+  close: ->
+
+  trigger: (event) ->
+    if @dispatcher.state != 'connected'
+      @message_queue.push event
+    else
+      @send_event event
+
+  send_event: (event) ->
+    # Events queued before connecting do not have the correct
+    # connection_id set yet. We need to update it before dispatching.
+    event.connection_id = @connection_id if @connection_id?
+
+    # ...
+
+  on_close: (event) ->
+    if @dispatcher && @dispatcher._conn == @
+      close_event = new WebSocketRails.Event(['connection_closed', event])
+      @dispatcher.state = 'disconnected'
+      @dispatcher.dispatch close_event
+
+  on_error: (event) ->
+    if @dispatcher && @dispatcher._conn == @
+      error_event = new WebSocketRails.Event(['connection_error', event])
+      @dispatcher.state = 'disconnected'
+      @dispatcher.dispatch error_event
+
+  on_message: (event_data) ->
+    if @dispatcher && @dispatcher._conn == @
+      @dispatcher.new_message event_data
+
+  setConnectionId: (@connection_id) ->
+
+  flush_queue: ->
+    for event in @message_queue
+      @trigger event
+    @message_queue = []

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

@@ -9,41 +9,42 @@ For instance:
 ###
 class WebSocketRails.Channel
 
-  constructor: (@name,@_dispatcher,@is_private) ->
+  constructor: (@name, @_dispatcher, @is_private = false, @on_success, @on_failure) ->
+    @_callbacks = {}
+    @_token = undefined
+    @_queue = []
     if @is_private
       event_name = 'websocket_rails.subscribe_private'
     else
       event_name = 'websocket_rails.subscribe'
 
-    event = new WebSocketRails.Event( [event_name, {data: {channel: @name}},@_dispatcher.connection_id], @_success_launcher, @_failure_launcher)
+    @connection_id = @_dispatcher._conn?.connection_id
+    event = new WebSocketRails.Event( [event_name, {data: {channel: @name}}, @connection_id], @_success_launcher, @_failure_launcher)
     @_dispatcher.trigger_event event
-    @_callbacks = {}
-    @_token = undefined
-    @_queue = []
 
-  destroy: () =>
-    event_name = 'websocket_rails.unsubscribe'
-    event =  new WebSocketRails.Event( [event_name, {data: {channel: @name}}, @_dispatcher.connection_id] )
-    @_dispatcher.trigger_event event
+  destroy: ->
+    if @connection_id == @_dispatcher._conn?.connection_id
+      event_name = 'websocket_rails.unsubscribe'
+      event =  new WebSocketRails.Event( [event_name, {data: {channel: @name}}, @connection_id] )
+      @_dispatcher.trigger_event event
     @_callbacks = {}
 
-  bind: (event_name, callback) =>
+  bind: (event_name, callback) ->
     @_callbacks[event_name] ?= []
     @_callbacks[event_name].push callback
 
-  trigger: (event_name, message) =>
-    event = new WebSocketRails.Event( [event_name, {channel: @name, data: message, token: @_token}, @_dispatcher.connection_id] )
+  trigger: (event_name, message) ->
+    event = new WebSocketRails.Event( [event_name, {channel: @name, data: message, token: @_token}, @connection_id] )
     if !@_token
       @_queue.push event
     else
       @_dispatcher.trigger_event event
 
-  dispatch: (event_name, message) =>
+  dispatch: (event_name, message) ->
     if event_name == 'websocket_rails.channel_token'
+      @connection_id = @_dispatcher._conn?.connection_id
       @_token = message['token']
-      for event in @_queue
-        @_dispatcher.trigger_event event
-      @_queue = []
+      @flush_queue()
     else
       return unless @_callbacks[event_name]?
       for callback in @_callbacks[event_name]
@@ -56,3 +57,8 @@ class WebSocketRails.Channel
   # using this method because @on_failure will not be defined when the constructor is executed
   _failure_launcher: (data) =>
     @on_failure(data) if @on_failure?
+
+  flush_queue: ->
+    for event in @_queue
+      @_dispatcher.trigger_event event
+    @_queue = []

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

@@ -4,7 +4,7 @@ The Event object stores all the relevant event information.
 
 class WebSocketRails.Event
 
-  constructor: (data,@success_callback,@failure_callback) ->
+  constructor: (data, @success_callback, @failure_callback) ->
     @name    = data[0]
     attr     = data[1]
     if attr?
@@ -17,26 +17,26 @@ class WebSocketRails.Event
         @result  = true
         @success = attr.success
 
-  is_channel: =>
+  is_channel: ->
     @channel?
 
-  is_result: =>
-    @result == true
+  is_result: ->
+    typeof @result != 'undefined'
 
-  is_ping: =>
+  is_ping: ->
     @name == 'websocket_rails.ping'
 
-  serialize: =>
+  serialize: ->
       JSON.stringify [@name, @attributes()]
 
-  attributes: =>
+  attributes: ->
     id: @id,
     channel: @channel,
     data: @data
     token: @token
 
-  run_callbacks: (success,data) =>
-    if success == true
-      @success_callback?(data)
+  run_callbacks: (@success, @result) ->
+    if @success == true
+      @success_callback?(@result)
     else
-      @failure_callback?(data)
+      @failure_callback?(@result)

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

@@ -1,67 +1,66 @@
 ###
  HTTP Interface for the WebSocketRails client.
 ###
-class WebSocketRails.HttpConnection
-  httpFactories: -> [
+class WebSocketRails.HttpConnection extends WebSocketRails.AbstractConnection
+  connection_type: 'http'
+
+  _httpFactories: -> [
+    -> new XDomainRequest(),
     -> new XMLHttpRequest(),
     -> new ActiveXObject("Msxml2.XMLHTTP"),
     -> new ActiveXObject("Msxml3.XMLHTTP"),
     -> new ActiveXObject("Microsoft.XMLHTTP")
   ]
 
-  createXMLHttpObject: =>
-    xmlhttp   = false
-    factories = @httpFactories()
-    for factory in factories
-      try
-        xmlhttp = factory()
-      catch e
-        continue
-      break
-    xmlhttp
-
-  constructor: (@url, @dispatcher) ->
-    @_url          = @url
-    @_conn         = @createXMLHttpObject()
+  constructor: (url, @dispatcher) ->
+    super
+    @_url          = "http://#{url}"
+    @_conn         = @_createXMLHttpObject()
     @last_pos      = 0
-    @message_queue = []
-    @_conn.onreadystatechange = @parse_stream
-    @_conn.addEventListener("load", @connectionClosed, false)
+    try
+      @_conn.onreadystatechange = => @_parse_stream()
+      @_conn.addEventListener("load", @on_close, false)
+    catch e
+      @_conn.onprogress = => @_parse_stream()
+      @_conn.onload = @on_close
+      # set this as 3 always for parse_stream as the object does not have this property at all
+      @_conn.readyState = 3
     @_conn.open "GET", @_url, true
     @_conn.send()
 
-  parse_stream: =>
-    if @_conn.readyState == 3
-      data         = @_conn.responseText.substring @last_pos
-      @last_pos    = @_conn.responseText.length
-      data = data.replace( /\]\]\[\[/g, "],[" )
-      decoded_data = JSON.parse data
-      @dispatcher.new_message decoded_data
+  close: ->
+    @_conn.abort()
 
-  trigger: (event) =>
-    if @dispatcher.state != 'connected'
-      @message_queue.push event
-    else
-      @post_data @dispatcher.connection_id, event.serialize()
+  send_event: (event) ->
+    super
+    @_post_data event.serialize()
 
-  post_data: (connection_id, payload) ->
+  _post_data: (payload) ->
     $.ajax @_url,
       type: 'POST'
       data:
-        client_id: connection_id
+        client_id: @connection_id
         data: payload
       success: ->
 
-  flush_queue: (connection_id) =>
-    for event in @message_queue
-      # Events queued before connecting do not have the correct
-      # connection_id set yet. We need to update it before dispatching.
-      if connection_id?
-        event.connection_id = @dispatcher.connection_id
-      @trigger event
-    @message_queue = []
+  _createXMLHttpObject: ->
+    xmlhttp   = false
+    factories = @_httpFactories()
+    for factory in factories
+      try
+        xmlhttp = factory()
+      catch e
+        continue
+      break
+    xmlhttp
 
-  connectionClosed: (event) =>
-    close_event = new WebSocketRails.Event(['connection_closed', event])
-    @dispatcher.state = 'disconnected'
-    @dispatcher.dispatch close_event
+  _parse_stream: ->
+    if @_conn.readyState == 3
+      data         = @_conn.responseText.substring @last_pos
+      @last_pos    = @_conn.responseText.length
+      data = data.replace( /\]\]\[\[/g, "],[" )
+      try
+        event_data = JSON.parse data
+        @on_message(event_data)
+      catch e
+        # just ignore if it cannot be parsed, probably whitespace

lib/assets/javascripts/websocket_rails/main.js

@@ -1,5 +1,6 @@
 //= require ./websocket_rails
 //= require ./event
+//= require ./abstract_connection
 //= require ./http_connection
 //= require ./websocket_connection
 //= require ./channel