websocket-rails 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # WebsocketRails Change Log
 
+## Version 0.1.5
+
+July 3 2012
+
+* Fixed bug in JavaScript client that caused Channels not to dispatch
+  correctly.
+* Rewrote JavaScript client in CoffeeScript.
+* Created project Wiki
+
 ## Version 0.1.4
 
 June 30 2012

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem "rspec-rails"
+gem "thin"
 gem "eventmachine", ">= 1.0.0.beta.3"
 gem "faye-websocket"
 gem "simplecov"

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

@@ -0,0 +1,26 @@
+###
+The channel object is returned when you subscribe to a channel.
+
+For instance:
+  var dispatcher = new WebSocketRails('localhost:3000/websocket');
+  var awesome_channel = dispatcher.subscribe('awesome_channel');
+  awesome_channel.bind('event', function(data) { console.log('channel event!'); });
+  awesome_channel.trigger('awesome_event', awesome_object);
+###
+class WebSocketRails.Channel
+
+  constructor: (@name,@dispatcher) ->
+    @dispatcher.trigger 'websocket_rails.subscribe', {channel: @name}
+    @callbacks = {}
+
+  bind: (event_name, callback) =>
+    @callbacks[event_name] ?= []
+    @callbacks[event_name].push callback
+
+  trigger: (event_name, message) =>
+    @dispatcher.trigger_channel @name, event_name, message
+
+  dispatch: (event_name, message) =>
+    return unless @callbacks[event_name]?
+    for callback in @callbacks[event_name]
+      callback message

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

@@ -0,0 +1,52 @@
+###
+ HTTP Interface for the WebSocketRails client.
+###
+class WebSocketRails.HttpConnection
+  httpFactories: -> [
+    -> 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) ->
+    @_conn    = @createXMLHttpObject()
+    @last_pos = 0
+    @_conn.onreadystatechange = @parse_stream
+    @_conn.open "GET", "/websocket", true
+    @_conn.send()
+
+  parse_stream: =>
+    if @_conn.readyState == 3
+      data         = @_conn.responseText.substring @last_pos
+      @last_pos    = @_conn.responseText.length
+      decoded_data = JSON.parse data
+      @dispatcher.new_message decoded_data
+
+  trigger: (event_name, data, connection_id) =>
+    payload = JSON.stringify [event_name, data]
+    @post_data connection_id, payload
+
+  trigger_channel: (channel_name, event_name, data, connection_id) =>
+    payload = JSON.stringify [channel_name, event_name, data]
+    @post_data connection_id, payload
+
+  post_data: (connection_id, payload) ->
+    $.ajax "/websocket",
+      type: 'POST'
+      data:
+        client_id: connection_id
+        data: payload
+      success: ->
+        console.log "success"

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

@@ -0,0 +1,25 @@
+###
+WebSocket Interface for the WebSocketRails client.
+###
+class WebSocketRails.WebSocketConnection
+
+  constructor: (@url,@dispatcher) ->
+    @_conn           = new WebSocket("ws://#{@url}")
+    @_conn.onmessage = @on_message
+    @_conn.onclose   = @on_close
+
+  trigger: (event_name, data, connection_id) =>
+    payload = JSON.stringify [event_name, data]
+    @_conn.send payload
+
+  trigger_channel: (channel_name, event_name, data, connection_id) =>
+    payload = JSON.stringify [channel_name, event_name, data]
+    @_conn.send payload
+
+  on_message: (event) =>
+    data = JSON.parse event.data
+    console.log data
+    @dispatcher.new_message data
+
+  on_close: (event) =>
+    @dispatcher.dispatch 'connection_close', {}

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

@@ -0,0 +1,81 @@
+###
+WebsocketRails JavaScript Client
+
+Setting up the dispatcher:
+  var dispatcher = new WebSocketRails('localhost:3000');
+  dispatcher.on_open = function() {
+    // trigger a server event immediately after opening connection
+    dispatcher.trigger('new_user',{user_name: 'guest'});
+  })
+
+Triggering a new event on the server
+  dispatcherer.trigger('event_name',object_to_be_serialized_to_json);
+
+Listening for new events from the server
+  dispatcher.bind('event_name', function(data) {
+    console.log(data.user_name);
+  });
+###
+class window.WebSocketRails
+  constructor: (@url, @use_websockets = true) ->
+    @state          = 'connecting'
+    @callbacks      = {}
+    @channels       = {}
+
+    unless @supports_websockets() and @use_websockets
+      @_conn = new WebSocketRails.HttpConnection url, @
+    else
+      @_conn = new WebSocketRails.WebSocketConnection url, @
+
+    @_conn.new_message = @new_message
+
+  new_message: (data) =>
+    for socket_message in data
+      if socket_message.length > 2
+        event_name = socket_message[1]
+        message    = socket_message[2]
+        @dispatch_channel socket_message...
+      else
+        event_name = socket_message[0]
+        message    = socket_message[1]
+        @dispatch socket_message...
+
+      if @state == 'connecting' and event_name == 'client_connected'
+        @connection_established message
+
+  connection_established: (data) =>
+    @state         = 'connected'
+    @connection_id = data.connection_id
+    if @on_open?
+      @on_open(data)
+
+  bind: (event_name, callback) =>
+    @callbacks[event_name] ?= []
+    @callbacks[event_name].push callback
+
+  trigger: (event_name, data) =>
+    @_conn.trigger event_name, data, @connection_id
+
+  dispatch: (event_name, data) =>
+    return unless @callbacks[event_name]?
+    for callback in @callbacks[event_name]
+      callback data
+
+  subscribe: (channel_name) =>
+    unless @channels[channel_name]?
+      channel = new WebSocketRails.Channel channel_name, @
+      @channels[channel_name] = channel
+      channel
+    else
+      @channels[channel_name]
+
+  trigger_channel: (channel, event_name, data) =>
+    @_conn.trigger_channel channel, event_name, @connection_id
+
+  dispatch_channel: (channel, event_name, message) =>
+    return unless @channels[channel]?
+    @channels[channel].dispatch event_name, message
+
+  supports_websockets: =>
+    (typeof(WebSocket) == "function" or typeof(WebSocket) == "object")
+

data/lib/websocket_rails/base_controller.rb

@@ -102,6 +102,10 @@ module WebsocketRails
       event = Event.new( event_name, message, options )
       @_dispatcher.broadcast_message event if @_dispatcher.respond_to?(:broadcast_message)
     end
+
+    def request
+      @_request
+    end
     
     # Provides access to the {DataStore} for the current controller. The {DataStore} provides convenience
     # methods for keeping track of data associated with active connections. See it's documentation for
@@ -123,6 +127,18 @@ module WebsocketRails
         instance_eval( &observer )
       end
     end
+
+    def delegate
+      connection.controller_delegate
+    end
+
+    def method_missing(method,*args,&block)
+      if delegate.respond_to? method
+        delegate.send method, *args, &block
+      else
+        super
+      end
+    end
     
   end
 end

data/lib/websocket_rails/channel.rb

@@ -25,7 +25,6 @@ module WebsocketRails
     private
 
     def send_data(event)
-      puts "sending channel event: #{event.serialize}"
       subscribers.each do |subscriber|
         subscriber.trigger event
       end

data/lib/websocket_rails/connection_adapters/web_socket.rb

@@ -6,9 +6,9 @@ module WebsocketRails
         Faye::WebSocket.websocket?( env )
       end
       
-      def initialize(env,dispatcher)
+      def initialize(request,dispatcher)
         super
-        @connection = Faye::WebSocket.new( env )
+        @connection = Faye::WebSocket.new( request.env )
         @connection.onmessage = method(:on_message)
         @connection.onerror   = method(:on_error)
         @connection.onclose   = method(:on_close)

data/lib/websocket_rails/connection_adapters.rb

@@ -9,9 +9,9 @@ module WebsocketRails
       @adapters.unshift adapter
     end
     
-    def self.establish_connection(env,dispatcher)
-      adapter = adapters.detect { |a| a.accepts?( env ) } || (raise InvalidConnectionError)
-      adapter.new env, dispatcher
+    def self.establish_connection(request,dispatcher)
+      adapter = adapters.detect { |a| a.accepts?( request.env ) } || (raise InvalidConnectionError)
+      adapter.new request, dispatcher
     end
     
     class Base
@@ -24,12 +24,16 @@ module WebsocketRails
         ConnectionAdapters.register adapter
       end
       
-      attr_reader :dispatcher, :queue
+      attr_reader :dispatcher, :queue, :env, :request
 
-      def initialize(env,dispatcher)
-        @env        = env
+      def initialize(request,dispatcher)
+        @env        = request.env.dup
+        @request    = request
         @queue      = EventQueue.new
         @dispatcher = dispatcher
+        @delegate   = DelegationController.new
+        @delegate.instance_variable_set(:@_env,request.env)
+        @delegate.instance_variable_set(:@_request,request)
       end
 
       def on_open(data=nil)
@@ -87,6 +91,10 @@ module WebsocketRails
         object_id.to_i
       end
 
+      def controller_delegate
+        @delegate
+      end
+
       private
 
       def dispatch(event)

data/lib/websocket_rails/connection_manager.rb

@@ -26,12 +26,12 @@ module WebsocketRails
     
     # Primary entry point for the Rack application
     def call(env)
-      request = Rack::Request.new env
+      request = ActionDispatch::Request.new env
 
       if request.post?
         response = parse_incoming_event request.params
       else
-        response = open_connection env
+        response = open_connection request
       end
       
       response
@@ -53,8 +53,8 @@ module WebsocketRails
     
     # Opens a persistent connection using the appropriate {ConnectionAdapter}. Stores
     # active connections in the {connections} array.
-    def open_connection(env)
-      connection = ConnectionAdapters.establish_connection( env, dispatcher )
+    def open_connection(request)
+      connection = ConnectionAdapters.establish_connection( request, dispatcher )
       connections << connection
       connection.rack_response
     end

data/lib/websocket_rails/dispatcher.rb

@@ -1,3 +1,5 @@
+#require 'actionpack/action_dispatch/request'
+
 module WebsocketRails
   class Dispatcher
     
@@ -27,12 +29,10 @@ module WebsocketRails
     end
     
     def send_message(event)
-      puts "sending message: #{event.serialize}"
       event.connection.trigger event
     end
   
     def broadcast_message(event)
-      puts "broadcasting message: #{event.serialize}"
       connection_manager.connections.map do |connection|
         connection.trigger event
       end

data/lib/websocket_rails/event_queue.rb

@@ -1,27 +1,29 @@
-class EventQueue
+module WebsocketRails
+  class EventQueue
 
-  attr_reader :queue
+    attr_reader :queue
 
-  def initialize
-    @queue = []
-  end
+    def initialize
+      @queue = []
+    end
 
-  def enqueue(event)
-    @queue << event
-  end
-  alias :<< :enqueue
+    def enqueue(event)
+      @queue << event
+    end
+    alias :<< :enqueue
 
-  def last
-    @queue.last
-  end
+    def last
+      @queue.last
+    end
 
-  def flush(&block)
-    unless block.nil?
-      @queue.each do |item|
-        block.call item
+    def flush(&block)
+      unless block.nil?
+        @queue.each do |item|
+          block.call item
+        end
       end
+      @queue = []
     end
-    @queue = []
-  end
 
+  end
 end

data/lib/websocket_rails/version.rb

@@ -1,3 +1,3 @@
 module WebsocketRails
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/dummy/log/test.log

@@ -632,3 +632,77 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/spec/integration/connection_manager_spec.rb

@@ -70,7 +70,7 @@ module WebsocketRails
           it "should subscribe the connection to the correct channel" do
             @server.call( env )
             channel = WebsocketRails[:awesome_channel]
-            #channel.should_receive(:subscribe).once.with(socket)
+            channel.should_receive(:subscribe).once.with(socket)
             Channel.any_instance.stub(:subscribe).and_raise(Exception)
             socket.on_message encoded_message
           end

data/spec/support/helper_methods.rb

@@ -10,6 +10,10 @@ module WebsocketRails
       end
     end
 
+    def mock_request
+      @_request ||= ActionDispatch::Request.new(env)
+    end
+
     def encoded_message
       ['test_event',{:user_name => 'Joe User'}].to_json
     end

data/spec/support/mock_web_socket.rb

@@ -4,6 +4,10 @@ module WebsocketRails
   
   class MockWebSocket
     attr_writer :onmessage, :onerror, :onclose
+
+    def env
+      env = Rack::MockRequest.env_for('/websocket')
+    end
     
     def onmessage(event=nil)
       @onmessage.call(event)

data/spec/unit/connection_adapters/http_spec.rb

@@ -4,7 +4,7 @@ module WebsocketRails
   module ConnectionAdapters
     describe Http do
       
-      subject { Http.new( env, double('Dispatcher').as_null_object ) }
+      subject { Http.new( mock_request, double('Dispatcher').as_null_object ) }
       
       it "should be a subclass of ConnectionAdapters::Base" do
         subject.class.superclass.should == ConnectionAdapters::Base

data/spec/unit/connection_adapters/web_socket_spec.rb

@@ -8,7 +8,7 @@ module WebsocketRails
       before do
         @socket = MockWebSocket.new
         Faye::WebSocket.stub(:new).and_return(@socket)
-        @adapter = WebSocket.new( env, double('Dispatcher').as_null_object )
+        @adapter = WebSocket.new( mock_request, double('Dispatcher').as_null_object )
       end
       
       context "#send" do

data/spec/unit/connection_adapters_spec.rb

@@ -19,7 +19,7 @@ module WebsocketRails
     
     context ".establish_connection" do
       it "should return the correct connection adapter instance" do
-        adapter = ConnectionAdapters.establish_connection( env, double('Dispatcher').as_null_object )
+        adapter = ConnectionAdapters.establish_connection( mock_request, double('Dispatcher').as_null_object )
         adapter.class.should == ConnectionAdapters::Test
       end
     end
@@ -32,7 +32,7 @@ module WebsocketRails
       let(:channel_manager) { double('ChannelManager').as_null_object }
       let(:event) { double('Event').as_null_object }
       before  { Event.stub(:new_from_json).and_return(event) }
-      subject { Base.new( env, dispatcher ) }
+      subject { Base.new( mock_request, dispatcher ) }
       
       context "new adapters" do
         it "should register themselves in the adapters array when inherited" do

data/spec/unit/connection_manager_spec.rb

@@ -17,7 +17,7 @@ module WebsocketRails
     
     before(:each) do
       ConnectionAdapters::Base.any_instance.stub(:send)
-      @mock_socket = ConnectionAdapters::Base.new(env,dispatcher)
+      @mock_socket = ConnectionAdapters::Base.new(mock_request,dispatcher)
       ConnectionAdapters.stub(:establish_connection).and_return(@mock_socket)
     end
     
@@ -38,7 +38,7 @@ module WebsocketRails
 
     context "new POST event" do
       before(:each) do
-        @mock_http = ConnectionAdapters::Http.new(env,dispatcher)
+        @mock_http = ConnectionAdapters::Http.new(mock_request,dispatcher)
         app.connections << @mock_http
       end
       
@@ -50,7 +50,7 @@ module WebsocketRails
     
     context "open connections" do
       before(:each) do
-        ConnectionAdapters.stub(:establish_connection).and_return(@mock_socket,ConnectionAdapters::Base.new(env,dispatcher))
+        ConnectionAdapters.stub(:establish_connection).and_return(@mock_socket,ConnectionAdapters::Base.new(mock_request,dispatcher))
         4.times { open_connection }
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,11 +117,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/assets/javascripts/websocket_rails/channel.js
-- lib/assets/javascripts/websocket_rails/http_connection.js
+- lib/assets/javascripts/websocket_rails/channel.js.coffee
+- lib/assets/javascripts/websocket_rails/http_connection.js.coffee
 - lib/assets/javascripts/websocket_rails/main.js
-- lib/assets/javascripts/websocket_rails/websocket_connection.js
-- lib/assets/javascripts/websocket_rails/websocket_rails.js
+- lib/assets/javascripts/websocket_rails/websocket_connection.js.coffee
+- lib/assets/javascripts/websocket_rails/websocket_rails.js.coffee
 - lib/generators/websocket_rails/install/install_generator.rb
 - lib/generators/websocket_rails/install/templates/events.rb
 - lib/websocket-rails.rb
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3091547921395116505
+      hash: -3272086084276613534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3091547921395116505
+      hash: -3272086084276613534
 requirements: []
 rubyforge_project: websocket-rails
 rubygems_version: 1.8.19

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

@@ -1,35 +0,0 @@
-/*
- * The channel object is returned when you subscribe to a channel.
- *
- * For instance:
- *   var dispatcher = new WebSocketRails('localhost:3000/websocket');
- *   var awesome_channel = dispatcher.subscribe('awesome_channel');
- *   awesome_channel.bind('event', function() { console.log('channel event!'); });
- *   awesome_channel.trigger('awesome_event', awesome_object);
- */
-
-WebSocketRails.Channel = function(name,dispatcher) {
-  var that = this;
-  that.name = name;
-
-  dispatcher.trigger('websocket_rails.subscribe',{channel: name})
-
-  var callbacks = {};
-
-  that.bind = function(event_name, callback) {
-    callbacks[event_name] = callbacks[event_name] || [];
-    callbacks[event_name].push(callback);
-  }
-
-  that.trigger = function(event_name, message) {
-    dispatcher.trigger_channel(that.name,event_name,message);
-  }
-
-  that.dispatch = function(event_name, message) {
-    var chain = callbacks[event_name];
-    if (typeof chain == 'undefined') return;
-    for(var i = 0; i < chain.length; i++) {
-      chain[i]( message );
-    }
-  }	
-}

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

@@ -1,68 +0,0 @@
-/*
- * HTTP Interface for the WebSocketRails client.
- */
-WebSocketRails.HttpConnection = function(url,dispatcher){
-  var that = this,
-      conn = WebSocketRails.createXMLHttpObject(),
-      lastPos = 0;
-
-  conn.onreadystatechange = function() {
-    if (conn.readyState == 3) {
-      var data = conn.responseText.substring(lastPos);
-      lastPos = conn.responseText.length;
-
-      console.log('raw data: '+data);
-      var json_data = JSON.parse(data);
-
-      console.log(json_data);
-      that.new_message(json_data);
-    }
-  }
-  conn.open("GET","/websocket",true);
-  conn.send();
-
-
-  that.trigger = function(event_name, data, client_id) {
-    var payload = JSON.stringify([event_name,data]);
-    $.ajax({
-      type: 'POST',
-      url: '/websocket',
-      data: {client_id: client_id, data: payload},
-      success: function(){console.log('success');}
-    });
-    return this;
-  }
-
-  that.trigger_channel = function(channel, event_name, data, client_id) {
-    var payload = JSON.stringify([channel,event_name,data]);
-    $.ajax({
-      type: 'POST',
-      url: '/websocket',
-      data: {client_id: client_id, data: payload},
-      success: function(){console.log('success');}
-    });
-    return this;
-  }
-}
-
-WebSocketRails.XMLHttpFactories = [
-  function () {return new XMLHttpRequest()},
-  function () {return new ActiveXObject("Msxml2.XMLHTTP")},
-  function () {return new ActiveXObject("Msxml3.XMLHTTP")},
-  function () {return new ActiveXObject("Microsoft.XMLHTTP")}
-];
-
-WebSocketRails.createXMLHttpObject = function() {
-  var xmlhttp = false,
-      factories = WebSocketRails.XMLHttpFactories;
-  for (var i=0;i<factories.length;i++) {
-    try {
-      xmlhttp = factories[i]();
-    }
-    catch (e) {
-      continue;
-    }
-    break;
-  }
-  return xmlhttp;
-}

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

@@ -1,38 +0,0 @@
-/*
- * WebSocket Interface for the WebSocketRails client.
- */
-WebSocketRails.WebSocketConnection = function(url,dispatcher){
-  var that = this,
-      conn = new WebSocket("ws://"+url);
-
-  that.trigger = function(event_name, data, client_id) {
-    var payload = JSON.stringify([event_name,data])
-    conn.send( payload )
-    return this;
-  }
-
-  that.trigger_channel = function(channel, event_name, data, client_id) {
-    var payload = JSON.stringify([channel,event_name,data])
-    conn.send( payload )
-    return this;
-  }
-
-  conn.onmessage = function(evt) {
-    var data = JSON.parse(evt.data);
-
-    console.log(data)
-    that.new_message(data);
-  }
-
-  conn.onclose = function(evt) {
-    dispatcher.dispatch('connection_closed', '')
-  }
-
-  var dispatch = function(event_name, message) {
-    var chain = callbacks[event_name]
-    if (typeof chain == 'undefined') return;
-    for(var i = 0; i < chain.length; i++) {
-      chain[i]( message )
-    }
-  }	
-}

data/lib/assets/javascripts/websocket_rails/websocket_rails.js

@@ -1,100 +0,0 @@
-/*
-* WebsocketRails JavaScript Client
-* 
-* Setting up the dispatcher:
-* 	var dispatcher = new WebSocketRails('localhost:3000');
-* 	dispatcher.on_open = function() {
-* 		// trigger a server event immediately after opening connection
-* 		dispatcher.trigger('new_user',{user_name: 'guest'});
-* 	})
-*
-* Triggering a new event on the server
-* 	dispatcher.trigger('event_name',object_to_be_serialized_to_json);
-*
-* Listening for new events from the server
-* 	dispatcher.bind('event_name', function(data) {
-* 		console.log(data.user_name);
-* 	})
-*/
-var WebSocketRails = function(url) {
-  var that = this,
-      client_id = 0;
-  
-  that.state = 'connecting';
-
-  if( typeof(WebSocket) != "function" && typeof(WebSocket) != "object" ) {
-    var conn = new WebSocketRails.HttpConnection(url);
-  } else {
-    var conn = new WebSocketRails.WebSocketConnection(url,that);
-  }
-
-  var on_open = function(data) {
-    that.state = 'connected';
-    that.connection_id = data.connection_id;
-
-    if (typeof that.on_open !== 'undefined') {
-      that.on_open(data);
-    }
-  }
-
-  conn.new_message = function(data) {
-    for(i = 0; i < data.length; i++) {
-      socket_message = data[i];
-      var is_channel = false;
-
-      if (data.length > 2) {
-        var channel_name = socket_message[0],
-            event_name   = socket_message[1],
-            message      = socket_message[2];
-        is_channel = true;
-      } else {
-        var event_name = socket_message[0],
-            message    = socket_message[1];
-      }
-      if (that.state === 'connecting' && event_name === 'client_connected') {
-        on_open(message);
-      }
-      if (is_channel == true) {
-        that.dispatch_channel(channel_name, event_name, message);
-      } else {
-        that.dispatch(event_name, message);
-      }
-    }
-  }
-
-  var callbacks = {};
-
-  that.bind = function(event_name, callback) {
-    callbacks[event_name] = callbacks[event_name] || [];
-    callbacks[event_name].push(callback);
-  }
-
-  that.trigger = function(event_name, data) {
-    conn.trigger(event_name,data,that.connection_id);
-  }
-
-  that.trigger_channel = function(channel, event_name, data) {
-    conn.trigger_channel(channel,event_name,data,that.connection_id);
-  }
-
-  var channels = {};
-  that.subscribe = function(channel_name) {
-    var channel = new WebSocketRails.Channel(channel_name,this);
-    channels[channel_name] = channel;
-    return channel;
-  }
-  
-  that.dispatch = function(event_name, message) {
-    var chain = callbacks[event_name];
-    if (typeof chain == 'undefined') return;
-    for(var i = 0; i < chain.length; i++) {
-      chain[i]( message );
-    }
-  }	
-
-  that.dispatch_channel = function(channel, event_name, message) {
-    var channel = that.channels[channel];
-    if (typeof channel == 'undefined') return;
-    channel.dispatch(event_name, message);
-  }
-}