Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update dependencies.

  • Loading branch information...
commit 2ca93185a668fbf7c2a4ecdfdf1f49d99ea5da5f 1 parent 715a575
@tristandunn authored
View
54 Gemfile.lock
@@ -4,16 +4,16 @@ PATH
pusher-fake (0.6.0)
em-http-request (= 1.0.3)
em-websocket (= 0.4.0)
- multi_json (= 1.5.0)
+ multi_json (= 1.6.1)
thin (= 1.5.0)
GEM
remote: http://rubygems.org/
specs:
- addressable (2.3.2)
- bourne (1.3.0)
- mocha (= 0.13.0)
- builder (3.1.4)
+ addressable (2.3.3)
+ bourne (1.3.2)
+ mocha (= 0.13.2)
+ builder (3.2.0)
capybara (2.0.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -21,11 +21,11 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
- capybara-webkit (0.14.1)
+ capybara-webkit (0.14.2)
capybara (~> 2.0, >= 2.0.2)
json
- childprocess (0.3.7)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.8)
+ ffi (~> 1.0, >= 1.0.11)
cookiejar (0.3.0)
cucumber (1.2.1)
builder (>= 2.1.2)
@@ -33,7 +33,7 @@ GEM
gherkin (~> 2.11.0)
json (>= 1.4.6)
daemons (1.1.9)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.1)
em-http-request (1.0.3)
addressable (>= 2.2.3)
cookiejar
@@ -46,37 +46,37 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.5.3)
eventmachine (1.0.0)
- ffi (1.3.1)
+ ffi (1.4.0)
gherkin (2.11.6)
json (>= 1.7.6)
http_parser.rb (0.5.3)
- json (1.7.6)
+ json (1.7.7)
metaclass (0.0.1)
- mime-types (1.20.1)
- mocha (0.13.0)
+ mime-types (1.21)
+ mocha (0.13.2)
metaclass (~> 0.0.1)
- multi_json (1.5.0)
+ multi_json (1.6.1)
nokogiri (1.5.6)
pusher (0.11.3)
multi_json (~> 1.0)
signature (~> 0.1.6)
- rack (1.5.1)
+ rack (1.5.2)
rack-protection (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rake (10.0.3)
redcarpet (2.2.2)
- rspec (2.12.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
- rspec-core (2.12.2)
- rspec-expectations (2.12.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.2)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.0)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
rubyzip (0.9.9)
- selenium-webdriver (2.29.0)
+ selenium-webdriver (2.30.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@@ -100,13 +100,13 @@ PLATFORMS
ruby
DEPENDENCIES
- bourne (= 1.3.0)
- capybara-webkit (= 0.14.1)
+ bourne (= 1.3.2)
+ capybara-webkit (= 0.14.2)
cucumber (= 1.2.1)
pusher (= 0.11.3)
pusher-fake!
rake (= 10.0.3)
redcarpet (= 2.2.2)
- rspec (= 2.12.0)
+ rspec (= 2.13.0)
sinatra (= 1.3.4)
yard (= 0.8.4.1)
View
70 ...cation/public/javascripts/vendor/pusher-1.12.5.js → ...cation/public/javascripts/vendor/pusher-1.12.6.js
@@ -1,5 +1,5 @@
/*!
- * Pusher JavaScript Library v1.12.5
+ * Pusher JavaScript Library v1.12.6
* 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.6';
// 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();
}
}
}
View
2  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.6.js"></script>
<script>
window.addEventListener("DOMContentLoaded", function() {
// Use the PusherFake server.
View
8 pusher-fake.gemspec
@@ -16,15 +16,15 @@ Gem::Specification.new do |s|
s.add_dependency "em-http-request", "1.0.3"
s.add_dependency "em-websocket", "0.4.0"
s.add_dependency "thin", "1.5.0"
- s.add_dependency "multi_json", "1.5.0"
+ s.add_dependency "multi_json", "1.6.1"
- s.add_development_dependency "bourne", "1.3.0"
- s.add_development_dependency "capybara-webkit", "0.14.1"
+ s.add_development_dependency "bourne", "1.3.2"
+ s.add_development_dependency "capybara-webkit", "0.14.2"
s.add_development_dependency "cucumber", "1.2.1"
s.add_development_dependency "pusher", "0.11.3"
s.add_development_dependency "rake", "10.0.3"
s.add_development_dependency "redcarpet", "2.2.2"
- s.add_development_dependency "rspec", "2.12.0"
+ s.add_development_dependency "rspec", "2.13.0"
s.add_development_dependency "sinatra", "1.3.4"
s.add_development_dependency "yard", "0.8.4.1"
end
Please sign in to comment.
Something went wrong with that request. Please try again.