pusher-fake 0.1.4 → 0.1.5

data/features/step_definitions/event_steps.rb

@@ -1,5 +1,5 @@
 When %{a "$event" event is triggered on the "$channel" channel} do |event, channel|
-  Pusher[channel].trigger(event, {})
+  Pusher.trigger([channel], event, {})
 end
 
 When %{I trigger the "$event" event on the "$channel" channel} do |event, channel|

data/features/support/application/public/javascripts/vendor/{pusher-1.11.js → pusher-1.12.5.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v1.12.1
+ * Pusher JavaScript Library v1.12.5
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher
@@ -183,11 +183,17 @@
   };
 
   // Pusher defaults
-  Pusher.VERSION = '1.12.1';
-
+  Pusher.VERSION = '1.12.5';
+  // WS connection parameters
   Pusher.host = 'ws.pusherapp.com';
   Pusher.ws_port = 80;
   Pusher.wss_port = 443;
+  // SockJS fallback parameters
+  Pusher.sockjs_host = 'sockjs.pusher.com';
+  Pusher.sockjs_http_port = 80
+  Pusher.sockjs_https_port = 443
+  Pusher.sockjs_path = "/pusher"
+  // Other settings
   Pusher.channel_auth_endpoint = '/pusher/auth';
   Pusher.cdn_http = 'http://js.pusher.com/'
   Pusher.cdn_https = 'https://d3dy5gmtp8yhk7.cloudfront.net/'
@@ -220,44 +226,67 @@ Example:
     emitter.bind('foo_event', function(data){ alert(data)} );
 
     // Bind to all
-    emitter.bind_all(function(event_name, data){ alert(data) });
+    emitter.bind_all(function(eventName, data){ alert(data) });
 
 --------------------------------------------------------*/
+
+  function CallbackRegistry() {
+    this._callbacks = {};
+  };
+
+  CallbackRegistry.prototype.get = function(eventName) {
+    return this._callbacks[this._prefix(eventName)];
+  };
+
+  CallbackRegistry.prototype.add = function(eventName, callback) {
+    var prefixedEventName = this._prefix(eventName);
+    this._callbacks[prefixedEventName] = this._callbacks[prefixedEventName] || [];
+    this._callbacks[prefixedEventName].push(callback);
+  };
+
+  CallbackRegistry.prototype.remove = function(eventName, callback) {
+    if(this.get(eventName)) {
+      var index = Pusher.Util.arrayIndexOf(this.get(eventName), callback);
+      this._callbacks[this._prefix(eventName)].splice(index, 1);
+    }
+  };
+
+  CallbackRegistry.prototype._prefix = function(eventName) {
+    return "_" + eventName;
+  };
+
+
   function EventsDispatcher(failThrough) {
-    this.callbacks = {};
+    this.callbacks = new CallbackRegistry();
     this.global_callbacks = [];
     // Run this function when dispatching an event when no callbacks defined
     this.failThrough = failThrough;
   }
 
-  EventsDispatcher.prototype.bind = function(event_name, callback) {
-    this.callbacks[event_name] = this.callbacks[event_name] || [];
-    this.callbacks[event_name].push(callback);
+  EventsDispatcher.prototype.bind = function(eventName, callback) {
+    this.callbacks.add(eventName, callback);
     return this;// chainable
   };
-  
+
   EventsDispatcher.prototype.unbind = function(eventName, callback) {
-    if(this.callbacks[eventName]) {
-      var index = Pusher.Util.arrayIndexOf(this.callbacks[eventName], callback);
-      this.callbacks[eventName].splice(index, 1);
-    }
+    this.callbacks.remove(eventName, callback);
     return this;
   };
 
-  EventsDispatcher.prototype.emit = function(event_name, data) {
+  EventsDispatcher.prototype.emit = function(eventName, data) {
     // Global callbacks
     for (var i = 0; i < this.global_callbacks.length; i++) {
-      this.global_callbacks[i](event_name, data);
+      this.global_callbacks[i](eventName, data);
     }
 
     // Event callbacks
-    var callbacks = this.callbacks[event_name];
+    var callbacks = this.callbacks.get(eventName);
     if (callbacks) {
       for (var i = 0; i < callbacks.length; i++) {
         callbacks[i](data);
       }
     } else if (this.failThrough) {
-      this.failThrough(event_name, data)
+      this.failThrough(eventName, data)
     }
 
     return this;
@@ -402,32 +431,30 @@ Example:
     'connected': ['permanentlyClosing', 'waiting'],
     'impermanentlyClosing': ['waiting', 'permanentlyClosing'],
     'permanentlyClosing': ['permanentlyClosed'],
-    'permanentlyClosed': ['waiting'],
+    'permanentlyClosed': ['waiting', 'failed'],
     'failed': ['permanentlyClosed']
   };
 
 
-  // Amount to add to time between connection attemtpts per failed attempt.
-  var UNSUCCESSFUL_CONNECTION_ATTEMPT_ADDITIONAL_WAIT = 2000;
-  var UNSUCCESSFUL_OPEN_ATTEMPT_ADDITIONAL_TIMEOUT = 2000;
-  var UNSUCCESSFUL_CONNECTED_ATTEMPT_ADDITIONAL_TIMEOUT = 2000;
+  var OPEN_TIMEOUT_INCREMENT = 2000;
+  var CONNECTED_TIMEOUT_INCREMENT = 2000;
 
-  var MAX_CONNECTION_ATTEMPT_WAIT = 5 * UNSUCCESSFUL_CONNECTION_ATTEMPT_ADDITIONAL_WAIT;
-  var MAX_OPEN_ATTEMPT_TIMEOUT = 5 * UNSUCCESSFUL_OPEN_ATTEMPT_ADDITIONAL_TIMEOUT;
-  var MAX_CONNECTED_ATTEMPT_TIMEOUT = 5 * UNSUCCESSFUL_CONNECTED_ATTEMPT_ADDITIONAL_TIMEOUT;
+  var MAX_OPEN_TIMEOUT = 10000;
+  var MAX_CONNECTED_TIMEOUT = 10000;
 
   function resetConnectionParameters(connection) {
     connection.connectionWait = 0;
 
-    if (Pusher.TransportType === 'flash') {
-      // Flash needs a bit more time
-      connection.openTimeout = 5000;
-    } else {
-      connection.openTimeout = 2000;
+    if (Pusher.TransportType === 'native') {
+      connection.openTimeout = 4000;
+    } else if (Pusher.TransportType === 'flash') {
+      connection.openTimeout = 7000;
+    } else { // SockJS
+      connection.openTimeout = 6000;
     }
     connection.connectedTimeout = 2000;
     connection.connectionSecure = connection.compulsorySecure;
-    connection.connectionAttempts = 0;
+    connection.failedAttempts = 0;
   }
 
   function Connection(key, options) {
@@ -435,6 +462,7 @@ Example:
 
     Pusher.EventsDispatcher.call(this);
 
+    this.ping = true
     this.options = Pusher.Util.extend({encrypted: false}, options);
 
     this.netInfo = new Pusher.NetInfo();
@@ -474,22 +502,25 @@ Example:
       },
 
       waitingPre: function() {
-        if (self.connectionWait > 0) {
-          self.emit('connecting_in', self.connectionWait);
-        }
+        if (self.netInfo.isOnLine()) {
+          if (self.failedAttempts < 2) {
+            updateState('connecting');
+          } else {
+            updateState('unavailable');
+            // Delay 10s between connection attempts on entering unavailable
+            self.connectionWait = 10000;
+          }
 
-        if (self.netInfo.isOnLine() && self.connectionAttempts <= 4) {
-          updateState('connecting');
-        } else {
-          updateState('unavailable');
-        }
+          if (self.connectionWait > 0) {
+            self.emit('connecting_in', connectionDelay());
+          }
 
-        // When in the unavailable state we attempt to connect, but don't
-        // broadcast that fact
-        if (self.netInfo.isOnLine()) {
           self._waitingTimer = setTimeout(function() {
+            // Even when unavailable we try connecting (not changing state)
             self._machine.transition('connecting');
           }, connectionDelay());
+        } else {
+          updateState('unavailable');
         }
       },
 
@@ -507,12 +538,27 @@ Example:
           return;
         }
 
-        var url = formatURL(self.key, self.connectionSecure);
-        Pusher.debug('Connecting', url);
-        self.socket = new Pusher.Transport(url);
-        // now that the socket connection attempt has been started,
-        // set up the callbacks fired by the socket for different outcomes
-        self.socket.onopen = ws_onopen;
+        var path = connectPath(self.key);
+        if (Pusher.TransportType === 'sockjs') {
+          Pusher.debug('Connecting to sockjs', Pusher.sockjs);
+          var url = buildSockJSURL(self.connectionSecure);
+
+          self.ping = false
+          self.socket = new SockJS(url);
+          self.socket.onopen = function() {
+            // SockJS does not yet support custom paths and query params
+            self.socket.send(JSON.stringify({path: path}));
+            self._machine.transition('open');
+          }
+        } else {
+          var url = connectBaseURL(self.connectionSecure) + path;
+          Pusher.debug('Connecting', url);
+          self.socket = new Pusher.Transport(url);
+          self.socket.onopen = function() {
+            self._machine.transition('open');
+          }
+        }
+
         self.socket.onclose = transitionToWaiting;
         self.socket.onerror = ws_onError;
 
@@ -616,44 +662,45 @@ Example:
       -----------------------------------------------*/
 
     function updateConnectionParameters() {
-      if (self.connectionWait < MAX_CONNECTION_ATTEMPT_WAIT) {
-        self.connectionWait += UNSUCCESSFUL_CONNECTION_ATTEMPT_ADDITIONAL_WAIT;
-      }
-
-      if (self.openTimeout < MAX_OPEN_ATTEMPT_TIMEOUT) {
-        self.openTimeout += UNSUCCESSFUL_OPEN_ATTEMPT_ADDITIONAL_TIMEOUT;
+      if (self.openTimeout < MAX_OPEN_TIMEOUT) {
+        self.openTimeout += OPEN_TIMEOUT_INCREMENT;
       }
 
-      if (self.connectedTimeout < MAX_CONNECTED_ATTEMPT_TIMEOUT) {
-        self.connectedTimeout += UNSUCCESSFUL_CONNECTED_ATTEMPT_ADDITIONAL_TIMEOUT;
+      if (self.connectedTimeout < MAX_CONNECTED_TIMEOUT) {
+        self.connectedTimeout += CONNECTED_TIMEOUT_INCREMENT;
       }
 
+      // Toggle between ws & wss
       if (self.compulsorySecure !== true) {
         self.connectionSecure = !self.connectionSecure;
       }
 
-      self.connectionAttempts++;
+      self.failedAttempts++;
     }
 
-    function formatURL(key, isSecure) {
-      var port = Pusher.ws_port;
-      var protocol = 'ws://';
-
-      // Always connect with SSL if the current page has
-      // been loaded via HTTPS.
-      //
-      // FUTURE: Always connect using SSL.
-      //
-      if (isSecure || document.location.protocol === 'https:') {
-        port = Pusher.wss_port;
-        protocol = 'wss://';
-      }
+    function connectBaseURL(isSecure) {
+      // Always connect with SSL if the current page served over https
+      var ssl = (isSecure || document.location.protocol === 'https:');
+      var port = ssl ? Pusher.wss_port : Pusher.ws_port;
+      var scheme = ssl ? 'wss://' : 'ws://';
 
-      var flash = (Pusher.TransportType === "flash") ? "true" : "false";
+      return scheme + Pusher.host + ':' + port;
+    }
 
-      return protocol + Pusher.host + ':' + port + '/app/' + key + '?protocol=5&client=js'
+    function connectPath(key) {
+      var flash = (Pusher.TransportType === "flash") ? "true" : "false";
+      var path = '/app/' + key + '?protocol=5&client=js'
         + '&version=' + Pusher.VERSION
         + '&flash=' + flash;
+      return path;
+    }
+
+    function buildSockJSURL(isSecure) {
+      var ssl = (isSecure || document.location.protocol === 'https:');
+      var port = ssl ? Pusher.sockjs_https_port : Pusher.sockjs_http_port;
+      var scheme = ssl ? 'https://' : 'http://';
+
+      return scheme + Pusher.sockjs_host + ':' + port + Pusher.sockjs_path;
     }
 
     // callback for close and retry.  Used on timeouts.
@@ -664,13 +711,15 @@ Example:
     function resetActivityCheck() {
       if (self._activityTimer) { clearTimeout(self._activityTimer); }
       // Send ping after inactivity
-      self._activityTimer = setTimeout(function() {
-        self.send_event('pusher:ping', {})
-        // Wait for pong response
+      if (self.ping) {
         self._activityTimer = setTimeout(function() {
-          self.socket.close();
-        }, (self.options.pong_timeout || Pusher.pong_timeout))
-      }, (self.options.activity_timeout || Pusher.activity_timeout))
+          self.send_event('pusher:ping', {})
+          // Wait for pong response
+          self._activityTimer = setTimeout(function() {
+            self.socket.close();
+          }, (self.options.pong_timeout || Pusher.pong_timeout))
+        }, (self.options.activity_timeout || Pusher.activity_timeout))
+      }
     }
 
     function stopActivityCheck() {
@@ -700,11 +749,6 @@ Example:
       WebSocket Callbacks
       -----------------------------------------------*/
 
-    // no-op, as we only care when we get pusher:connection_established
-    function ws_onopen() {
-      self._machine.transition('open');
-    };
-
     function handleCloseCode(code, message) {
       // first inform the end-developer of this error
       self.emit('error', {type: 'PusherError', data: {code: code, message: message}});
@@ -819,7 +863,7 @@ Example:
 
   Connection.prototype.connect = function() {
     // no WebSockets
-    if (Pusher.Transport === null || Pusher.Transport === undefined) {
+    if (!this._machine.is('failed') && !Pusher.Transport) {
       this._machine.transition('failed');
     }
     // initial open of connection
@@ -840,17 +884,12 @@ Example:
 
   Connection.prototype.send = function(data) {
     if (this._machine.is('connected')) {
-      // Bug in iOS (reproduced in 5.0.1) Mobile Safari:
-      // 1. Open page/tab, connect WS, get some data.
-      // 2. Switch tab or close Mobile Safari and wait for WS connection to get closed (probably by server).
-      // 3. Switch back to tab or open Mobile Safari and Mobile Safari crashes.
-      // The problem is that WS tries to send data on closed WS connection before it realises it is closed.
-      // The timeout means that by the time the send happens, the WS readyState correctly reflects closed state.
+      // Workaround for MobileSafari bug (see https://gist.github.com/2052006)
       var self = this;
       setTimeout(function() {
         self.socket.send(data);
       }, 0);
-      return true; // only a reflection of fact that WS thinks it is open - could get returned before some lower-level failure.
+      return true;
     } else {
       return false;
     }
@@ -1145,73 +1184,83 @@ Example:
     }
   };
 }).call(this);
-var _require = (function () {
-
-  var handleScriptLoaded;
-  if (document.addEventListener) {
-    handleScriptLoaded = function (elem, callback) {
-      elem.addEventListener('load', callback, false)
-    }
-  } else {
-    handleScriptLoaded = function(elem, callback) {
+// _require(dependencies, callback) takes an array of dependency urls and a
+// callback to call when all the dependecies have finished loading
+var _require = (function() {
+  function handleScriptLoaded(elem, callback) {
+    if (document.addEventListener) {
+      elem.addEventListener('load', callback, false);
+    } else {
       elem.attachEvent('onreadystatechange', function () {
-        if(elem.readyState == 'loaded' || elem.readyState == 'complete') callback()
-      })
+        if (elem.readyState == 'loaded' || elem.readyState == 'complete') {
+          callback();
+        }
+      });
     }
   }
 
-  return function (deps, callback) {
-    var dep_count = 0,
-    dep_length = deps.length;
+  function addScript(src, callback) {
+    var head = document.getElementsByTagName('head')[0];
+    var script = document.createElement('script');
+    script.setAttribute('src', src);
+    script.setAttribute("type","text/javascript");
+    script.setAttribute('async', true);
 
-    function checkReady (callback) {
-      dep_count++;
-      if ( dep_length == dep_count ) {
-        // Opera needs the timeout for page initialization weirdness
-        setTimeout(callback, 0);
-      }
-    }
+    handleScriptLoaded(script, function() {
+      callback();
+    });
 
-    function addScript (src, callback) {
-      callback = callback || function(){}
-      var head = document.getElementsByTagName('head')[0];
-      var script = document.createElement('script');
-      script.setAttribute('src', src);
-      script.setAttribute("type","text/javascript");
-      script.setAttribute('async', true);
+    head.appendChild(script);
+  }
 
-      handleScriptLoaded(script, function () {
-        checkReady(callback);
+  return function(deps, callback) {
+    var deps_loaded = 0;
+    for (var i = 0; i < deps.length; i++) {
+      addScript(deps[i], function() {
+        if (deps.length == ++deps_loaded) {
+          // This setTimeout is a workaround for an Opera issue
+          setTimeout(callback, 0);
+        }
       });
-
-      head.appendChild(script);
-    }
-
-    for(var i = 0; i < dep_length; i++) {
-      addScript(deps[i], callback);
     }
   }
 })();
 
 ;(function() {
+  // Support Firefox versions which prefix WebSocket
+  if (!window['WebSocket'] && window['MozWebSocket']) {
+    window['WebSocket'] = window['MozWebSocket']
+  }
+
+  if (window['WebSocket']) {
+    Pusher.Transport = window['WebSocket'];
+    Pusher.TransportType = 'native';
+  }
+
   var cdn = (document.location.protocol == 'http:') ? Pusher.cdn_http : Pusher.cdn_https;
   var root = cdn + Pusher.VERSION;
   var deps = [];
 
-  if (window['JSON'] === undefined) {
+  if (!window['JSON']) {
     deps.push(root + '/json2' + Pusher.dependency_suffix + '.js');
   }
-  if (window['WebSocket'] === undefined && window['MozWebSocket'] === undefined) {
-    // We manually initialize web-socket-js to iron out cross browser issues
+  if (!window['WebSocket']) {
+    // Try to use web-socket-js (flash WebSocket emulation)
     window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION = true;
+    window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;
     deps.push(root + '/flashfallback' + Pusher.dependency_suffix + '.js');
   }
 
   var initialize = function() {
-    if (window['WebSocket'] === undefined && window['MozWebSocket'] === undefined) {
+    if (window['WebSocket']) {
+      // Initialize function in the case that we have native WebSocket support
+      return function() {
+        Pusher.ready();
+      }
+    } else {
+      // Initialize function for fallback case
       return function() {
-        // This runs after flashfallback.js has loaded
-        if (window['WebSocket'] !== undefined && window['MozWebSocket'] === undefined) {
+        if (window['WebSocket']) {
           // window['WebSocket'] is a flash emulation of WebSocket
           Pusher.Transport = window['WebSocket'];
           Pusher.TransportType = 'flash';
@@ -1222,31 +1271,19 @@ var _require = (function () {
           })
           WebSocket.__initialize();
         } else {
-          // Flash must not be installed
-          Pusher.Transport = null;
-          Pusher.TransportType = 'none';
-          Pusher.ready();
-        }
-      }
-    } else {
-      return function() {
-        // This is because Mozilla have decided to
-        // prefix the WebSocket constructor with "Moz".
-        if (window['MozWebSocket'] !== undefined) {
-          Pusher.Transport = window['MozWebSocket'];
-        } else {
-          Pusher.Transport = window['WebSocket'];
+          // web-socket-js cannot initialize (most likely flash not installed)
+          sockjsPath = root + '/sockjs' + Pusher.dependency_suffix + '.js';
+          _require([sockjsPath], function() {
+            Pusher.Transport = SockJS;
+            Pusher.TransportType = 'sockjs';
+            Pusher.ready();
+          })
         }
-        // We have some form of a native websocket,
-        // even if the constructor is prefixed:
-        Pusher.TransportType = 'native';
-
-        // Initialise Pusher.
-        Pusher.ready();
       }
     }
   }();
 
+  // Allows calling a function when the document body is available
   var ondocumentbody = function(callback) {
     var load_body = function() {
       document.body ? callback() : setTimeout(load_body, 0);

data/features/support/application/views/index.erb

@@ -14,7 +14,7 @@
   </ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-1.11.js"></script>
+<script src="/javascripts/vendor/pusher-1.12.5.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Use the PusherFake server.

data/lib/pusher-fake.rb

@@ -14,7 +14,7 @@ require "pusher-fake/server/application"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   # Call this method to modify the defaults.
   #

data/lib/pusher-fake/server/application.rb

@@ -2,61 +2,20 @@ module PusherFake
   module Server
     class Application
       # Process an API request by emitting the event with data to the
-      # requested channel.
+      # requested channels.
       #
       # @param [Hash] environment The request environment.
       # @return [Rack::Response] A successful response.
       def self.call(environment)
-        @environment = environment
+        request = Rack::Request.new(environment)
+        event   = Yajl::Parser.parse(request.body.read)
 
-        Channel.factory(channel).emit(event, data)
+        event["channels"].each do |channel|
+          Channel.factory(channel).emit(event["name"], event["data"])
+        end
 
         Rack::Response.new("{}").finish
       end
-
-      # Determine the channel name from the request path.
-      #
-      # @return [String] The channel name.
-      def self.channel
-        matcher = %r{/apps/#{PusherFake.configuration.app_id}/channels/(.+)/events}i
-        matches = path.match(matcher)
-        matches[1]
-      end
-
-      # Parse and return the event data from the request JSON.
-      #
-      # @return [Hash] The parsed event data.
-      def self.data
-        Yajl::Parser.parse(request.body.read)
-      end
-
-      # Get the environment.
-      #
-      # @return [Hash] The request environment.
-      def self.environment
-        @environment
-      end
-
-      # Get the event name from the request parameters.
-      #
-      # @return [String] The event name.
-      def self.event
-        request.params["name"]
-      end
-
-      # Get the request path from the environment.
-      #
-      # @return [String] The request path.
-      def self.path
-        environment["PATH_INFO"]
-      end
-
-      # Create a +Rack::Request+ from the environment.
-      #
-      # @return [Rack::Request] The request object.
-      def self.request
-        Rack::Request.new(environment)
-      end
     end
   end
 end

data/spec/lib/pusher-fake/server/application_spec.rb

@@ -1,35 +1,52 @@
 require "spec_helper"
 
 describe PusherFake::Server::Application, ".call" do
-  let(:data)         { mock }
-  let(:event)        { mock }
-  let(:channel)      { stub(emit: nil) }
-  let(:response)     { mock }
-  let(:environment)  { mock }
-  let(:channel_name) { mock }
+  let(:body)        { stub(read: json) }
+  let(:data)        { mock }
+  let(:json)        { mock }
+  let(:name)        { "event-name" }
+  let(:event)       { { "channels" => channels, "name" => name, "data" => data } }
+  let(:request)     { stub(body: body) }
+  let(:channels)    { ["channel-1", "channel-2"] }
+  let(:response)    { mock }
+  let(:channel_1)   { stub(emit: true) }
+  let(:channel_2)   { stub(emit: true) }
+  let(:environment) { mock }
 
   subject { PusherFake::Server::Application }
 
   before do
-    subject.stubs(channel: channel_name, data: data, event: event)
-    PusherFake::Channel.stubs(factory: channel)
     response.stubs(finish: response)
+
+    Yajl::Parser.stubs(parse: event)
+    Rack::Request.stubs(new: request)
     Rack::Response.stubs(new: response)
+    PusherFake::Channel.stubs(:factory).with(channels[0]).returns(channel_1)
+    PusherFake::Channel.stubs(:factory).with(channels[1]).returns(channel_2)
   end
 
-  it "assigns the environment" do
+  it "creates a request" do
     subject.call(environment)
-    subject.environment.should == environment
+    Rack::Request.should have_received(:new).with(environment)
   end
 
-  it "creates the channel by name" do
+  it "parses the request body as JSON" do
     subject.call(environment)
-    PusherFake::Channel.should have_received(:factory).with(channel_name)
+    Yajl::Parser.should have_received(:parse).with(json)
   end
 
-  it "emits the event to the channel" do
+  it "creates channels by name" do
     subject.call(environment)
-    channel.should have_received(:emit).with(event, data)
+
+    channels.each do |channel|
+      PusherFake::Channel.should have_received(:factory).with(channel)
+    end
+  end
+
+  it "emits the event to the channels" do
+    subject.call(environment)
+    channel_1.should have_received(:emit).with(name, data)
+    channel_2.should have_received(:emit).with(name, data)
   end
 
   it "creates a Rack response with an empty JSON object" do
@@ -46,101 +63,3 @@ describe PusherFake::Server::Application, ".call" do
     subject.call(environment).should == response
   end
 end
-
-describe PusherFake::Server::Application, ".channel" do
-  let(:path)    { "/apps/PUSHER_APP_ID/channels/#{channel}/events" }
-  let(:channel) { "channel-name" }
-
-  subject { PusherFake::Server::Application }
-
-  before do
-    subject.stubs(path: path)
-  end
-
-  it "returns the channel name from the path" do
-    subject.channel.should == channel
-  end
-
-  context "with a custom application ID" do
-    let(:path)   { "/apps/#{app_id}/channels/#{channel}/events" }
-    let(:app_id) { "test-id" }
-
-    before do
-      PusherFake.configuration.app_id = app_id
-    end
-
-    it "returns the channel name from the path" do
-      subject.channel.should == channel
-    end
-  end
-end
-
-describe PusherFake::Server::Application, ".data" do
-  let(:data)    { mock }
-  let(:body)    { stub(read: json) }
-  let(:json)    { mock }
-  let(:request) { stub(body: body) }
-
-  subject { PusherFake::Server::Application }
-
-  before do
-    subject.stubs(request: request)
-    Yajl::Parser.stubs(parse: data)
-  end
-
-  it "parses the request body as JSON" do
-    subject.data
-    Yajl::Parser.should have_received(:parse).with(json)
-  end
-
-  it "returns the parsed JSON" do
-    subject.data.should == data
-  end
-end
-
-describe PusherFake::Server::Application, ".event" do
-  let(:name)    { mock }
-  let(:params)  { { "name" => name } }
-  let(:request) { stub(params: params) }
-
-  subject { PusherFake::Server::Application }
-
-  before do
-    subject.stubs(request: request)
-  end
-
-  it "creates a reqeust from the environment" do
-    subject.event.should == name
-  end
-end
-
-describe PusherFake::Server::Application, ".path" do
-  let(:path)        { mock }
-  let(:environment) { { "PATH_INFO" => path } }
-
-  subject { PusherFake::Server::Application }
-
-  before do
-    subject.stubs(environment: environment)
-  end
-
-  it "returns the path for the environment" do
-    subject.path.should == path
-  end
-end
-
-describe PusherFake::Server::Application, ".request" do
-  let(:environment) { mock }
-
-  subject { PusherFake::Server::Application }
-
-  before do
-    Rack::Request.stubs(:new)
-    subject.stubs(environment: environment)
-  end
-
-  it "creates a reqeust from the environment" do
-    subject.request
-    Rack::Request.should have_received(:new).with(environment)
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +242,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: 0.8.3
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -275,7 +275,7 @@ files:
 - features/step_definitions/event_steps.rb
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-1.11.js
+- features/support/application/public/javascripts/vendor/pusher-1.12.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/environment.rb
@@ -306,7 +306,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370365380025237123
+      hash: 2596033998219902442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370365380025237123
+      hash: 2596033998219902442
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -332,7 +332,7 @@ test_files:
 - features/step_definitions/event_steps.rb
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-1.11.js
+- features/support/application/public/javascripts/vendor/pusher-1.12.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/environment.rb