pusher-fake 0.6.0 → 0.7.0

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

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v1.12.5
+ * Pusher JavaScript Library v1.12.7
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher
@@ -81,7 +81,7 @@
     },
 
     subscribeAll: function() {
-      var channel;
+      var channelName;
       for (channelName in this.channels.channels) {
         if (this.channels.channels.hasOwnProperty(channelName)) {
           this.subscribe(channelName);
@@ -123,7 +123,8 @@
     },
 
     checkAppKey: function() {
-      if(this.key === null || this.key === undefined) {
+      if (!this.key) {
+        // do not allow undefined, null or empty string
         Pusher.warn('Warning', 'You must pass your app key when you instantiate Pusher.');
       }
     }
@@ -183,7 +184,7 @@
   };
 
   // Pusher defaults
-  Pusher.VERSION = '1.12.5';
+  Pusher.VERSION = '1.12.7';
   // WS connection parameters
   Pusher.host = 'ws.pusherapp.com';
   Pusher.ws_port = 80;
@@ -1019,22 +1020,26 @@ Example:
 
   var Members = function(channel) {
     var self = this;
+    var channelData = null;
 
     var reset = function() {
-      this._members_map = {};
-      this.count = 0;
-      this.me = null;
+      self._members_map = {};
+      self.count = 0;
+      self.me = null;
+      channelData = null;
+    };
+    reset();
+
+    var subscriptionSucceeded = function(subscriptionData) {
+      self._members_map = subscriptionData.presence.hash;
+      self.count = subscriptionData.presence.count;
+      self.me = self.get(channelData.user_id);
+      channel.emit('pusher:subscription_succeeded', self);
     };
-    reset.call(this);
 
     channel.bind('pusher_internal:authorized', function(authorizedData) {
-      var channelData = JSON.parse(authorizedData.channel_data);
-      channel.bind("pusher_internal:subscription_succeeded", function(subscriptionData) {
-        self._members_map = subscriptionData.presence.hash;
-        self.count = subscriptionData.presence.count;
-        self.me = self.get(channelData.user_id);
-        channel.emit('pusher:subscription_succeeded', self);
-      });
+      channelData = JSON.parse(authorizedData.channel_data);
+      channel.bind("pusher_internal:subscription_succeeded", subscriptionSucceeded);
     });
 
     channel.bind('pusher_internal:member_added', function(data) {
@@ -1056,7 +1061,8 @@ Example:
     });
 
     channel.bind('pusher_internal:disconnected', function() {
-      reset.call(self);
+      reset();
+      channel.unbind("pusher_internal:subscription_succeeded", subscriptionSucceeded);
     });
   };
 
@@ -1091,6 +1097,7 @@ Example:
     return channel;
   };
 }).call(this);
+
 ;(function() {
   Pusher.Channel.Authorizer = function(channel, type, options) {
     this.channel = channel;
@@ -1245,10 +1252,22 @@ var _require = (function() {
     deps.push(root + '/json2' + Pusher.dependency_suffix + '.js');
   }
   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 flashSupported;
+    try {
+      flashSupported = Boolean(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
+    } catch (e) {
+      flashSupported = navigator.mimeTypes["application/x-shockwave-flash"] !== undefined;
+    }
+
+    if (flashSupported) {
+      // 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');
+    } else {
+      // Use SockJS when Flash is not available
+      deps.push(root + '/sockjs' + Pusher.dependency_suffix + '.js');
+    }
   }
 
   var initialize = function() {
@@ -1271,13 +1290,10 @@ var _require = (function() {
           })
           WebSocket.__initialize();
         } else {
-          // 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();
-          })
+          // Flash fallback was not loaded, using SockJS
+          Pusher.Transport = window.SockJS;
+          Pusher.TransportType = 'sockjs';
+          Pusher.ready();
         }
       }
     }

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

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

data/lib/pusher-fake.rb

@@ -16,7 +16,7 @@ require "pusher-fake/webhook"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 
   # Call this method to modify the defaults.
   #

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

@@ -24,6 +24,8 @@ module PusherFake
                      channel($1, request)
                    when %r{\A/apps/#{id}/channels/([^/]+)/users\Z}
                      users($1)
+                   else
+                     unknown_path(request.path)
                    end
 
         Rack::Response.new(MultiJson.dump(response)).finish
@@ -111,6 +113,15 @@ module PusherFake
 
         { users: users || [] }
       end
+
+      def self.unknown_path(path)
+        message = "Unknown path: #{path}"
+
+        logger = Logger.new(STDOUT)
+        logger.error(message)
+
+        raise message
+      end
     end
   end
 end

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

@@ -74,6 +74,49 @@ describe PusherFake::Server::Application, ".call, for retrieving occupied channe
   end
 end
 
+describe PusherFake::Server::Application, ".call, with unknown path" do
+  let(:path)        { "/apps/fake/events" }
+  let(:request)     { stub(path: path) }
+  let(:message)     { "Unknown path: #{path}" }
+  let(:response)    { mock }
+  let(:environment) { mock }
+
+  before do
+    subject.stubs(:unknown_path).raises(message)
+
+    response.stubs(finish: response)
+
+    Rack::Request.stubs(new: request)
+    Rack::Response.stubs(new: response)
+  end
+
+  subject { PusherFake::Server::Application }
+
+  it "creates a request" do
+    subject.call(environment)
+    Rack::Request.should have_received(:new).with(environment)
+  end
+
+  it "calls unknown_path with the path" do
+    subject.call(environment)
+    subject.should have_received(:unknown_path).with(request.path)
+  end
+
+  it "creates a Rack response with the error message" do
+    subject.call(environment)
+    Rack::Response.should have_received(:new).with(message, 400)
+  end
+
+  it "finishes the response" do
+    subject.call(environment)
+    response.should have_received(:finish).with()
+  end
+
+  it "returns the response" do
+    subject.call(environment).should == response
+  end
+end
+
 describe PusherFake::Server::Application, ".call, raising an error" do
   let(:id)          { PusherFake.configuration.app_id }
   let(:path)        { "/apps/#{id}/channels" }
@@ -229,9 +272,9 @@ describe PusherFake::Server::Application, ".channels, requesting a user count on
   subject { PusherFake::Server::Application }
 
   it "raises an error" do
-    lambda {
+    expect {
       subject.channels(request)
-    }.should raise_error(subject::CHANNEL_FILTER_ERROR)
+    }.to raise_error(subject::CHANNEL_FILTER_ERROR)
   end
 end
 
@@ -309,9 +352,9 @@ describe PusherFake::Server::Application, ".channel, requesting a user count on
   subject { PusherFake::Server::Application }
 
   it "raises an error" do
-    lambda {
+    expect {
       subject.channel("public-1", request)
-    }.should raise_error(subject::CHANNEL_USER_COUNT_ERROR)
+    }.to raise_error(subject::CHANNEL_USER_COUNT_ERROR)
   end
 end
 
@@ -365,3 +408,31 @@ describe PusherFake::Server::Application, ".users, for an unknown channel" do
     subject.users("fake").should == { users: [] }
   end
 end
+
+describe PusherFake::Server::Application, ".unknown_path" do
+  let(:path)    { "/apps/fake/events" }
+  let(:logger)  { stub(error: true) }
+  let(:message) { "Unknown path: #{path}" }
+
+  before do
+    Logger.stubs(new: logger)
+  end
+
+  subject { PusherFake::Server::Application }
+
+  it "creates a logger" do
+    expect { subject.unknown_path(path) }.to raise_error
+    Logger.should have_received(:new).with(STDOUT)
+  end
+
+  it "logs the error message" do
+    expect { subject.unknown_path(path) }.to raise_error
+    logger.should have_received(:error).with(message)
+  end
+
+  it "raises an error" do
+    expect {
+      subject.unknown_path(path)
+    }.to raise_error(message)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -249,7 +249,7 @@ files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-1.12.5.js
+- features/support/application/public/javascripts/vendor/pusher-1.12.7.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/environment.rb
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -92888459837878587
+      hash: -3011704484738286884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -92888459837878587
+      hash: -3011704484738286884
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -314,7 +314,7 @@ test_files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-1.12.5.js
+- features/support/application/public/javascripts/vendor/pusher-1.12.7.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/environment.rb