sinatra-rocketio 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.txt +4 -0
- data/lib/js/rocketio.js +7 -7
- data/lib/sinatra-rocketio/version.rb +1 -1
- data/lib/sinatra/rocketio/client.rb +4 -4
- data/sinatra-rocketio.gemspec +2 -2
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b78d8087665e017740b97926a9cd955e841740e4
|
4
|
+
data.tar.gz: a2996cfe08f7ccd37dd9f630d6a41bc2db2cb3c0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 68af554cc31883a1e5606a1ab7a848ec6690e073e0cb4b2dccbfe2f7a08bfdc7c7b1bf3873b73972257513b220db47f789b2f39659d9950d9edb180fd8aa701e
|
7
|
+
data.tar.gz: 4ff0b6de2002be72904f338bc4cbe6fe0743fffb9624a7e44a9de4993dd2e251e2d3d44896a5c7c975c506388b75fba29e0e69c4531e519fb8ad3126b71fdd59
|
data/History.txt
CHANGED
data/lib/js/rocketio.js
CHANGED
@@ -9,16 +9,21 @@ var RocketIO = function(opts){
|
|
9
9
|
if(typeof opts === "object"){
|
10
10
|
this.channel = ""+opts.channel;
|
11
11
|
}
|
12
|
+
self.on("__connect", function(session_id){
|
13
|
+
self.session = session_id;
|
14
|
+
self.io.push("__channel_id", self.channel);
|
15
|
+
self.emit("connect");
|
16
|
+
});
|
12
17
|
|
13
18
|
this.connect = function(){
|
14
19
|
self.io = function(){
|
15
20
|
if(self.type === "comet") return;
|
16
|
-
if(typeof WebSocketIO
|
21
|
+
if(typeof WebSocketIO !== "function") return;
|
17
22
|
var io = new WebSocketIO();
|
18
23
|
io.session = self.session;
|
19
24
|
return io.connect();
|
20
25
|
}() || function(){
|
21
|
-
if(typeof CometIO
|
26
|
+
if(typeof CometIO !== "function") return;
|
22
27
|
var io = new CometIO();
|
23
28
|
io.session = self.session;
|
24
29
|
return io.connect();
|
@@ -36,11 +41,6 @@ var RocketIO = function(opts){
|
|
36
41
|
if(event_name === "connect") event_name = "__connect";
|
37
42
|
self.emit(event_name, args);
|
38
43
|
});
|
39
|
-
self.on("__connect", function(session_id){
|
40
|
-
self.session = session_id;
|
41
|
-
io.push("__channel_id", self.channel);
|
42
|
-
self.emit("connect");
|
43
|
-
});
|
44
44
|
ws_close_timer = setTimeout(function(){
|
45
45
|
self.close();
|
46
46
|
self.type = "comet";
|
@@ -22,6 +22,10 @@ module Sinatra
|
|
22
22
|
@io = nil
|
23
23
|
@settings = nil
|
24
24
|
@ws_close_thread = nil
|
25
|
+
on :__connect do
|
26
|
+
io.push :__channel_id, channel
|
27
|
+
emit :connect
|
28
|
+
end
|
25
29
|
self
|
26
30
|
end
|
27
31
|
|
@@ -60,10 +64,6 @@ module Sinatra
|
|
60
64
|
event_name = :__connect if event_name == :connect
|
61
65
|
this.emit event_name, *args
|
62
66
|
end
|
63
|
-
this.on :__connect do
|
64
|
-
this.io.push :__channel_id, this.channel
|
65
|
-
this.emit :connect
|
66
|
-
end
|
67
67
|
if @type == :websocket
|
68
68
|
@ws_close_thread = Thread.new do
|
69
69
|
sleep 3
|
data/sinatra-rocketio.gemspec
CHANGED
@@ -26,9 +26,9 @@ Gem::Specification.new do |gem|
|
|
26
26
|
gem.add_development_dependency "json"
|
27
27
|
|
28
28
|
gem.add_dependency "sinatra-cometio", ">= 0.4.3"
|
29
|
-
gem.add_dependency "sinatra-websocketio", ">= 0.2.
|
29
|
+
gem.add_dependency "sinatra-websocketio", ">= 0.2.3"
|
30
30
|
gem.add_dependency "sinatra"
|
31
31
|
gem.add_dependency "eventmachine", ">= 1.0.0"
|
32
|
-
gem.add_dependency "event_emitter", ">= 0.2.
|
32
|
+
gem.add_dependency "event_emitter", ">= 0.2.5"
|
33
33
|
gem.add_dependency "hashie"
|
34
34
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra-rocketio
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sho Hashimoto
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -142,14 +142,14 @@ dependencies:
|
|
142
142
|
requirements:
|
143
143
|
- - '>='
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: 0.2.
|
145
|
+
version: 0.2.3
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - '>='
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 0.2.
|
152
|
+
version: 0.2.3
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: sinatra
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
@@ -184,14 +184,14 @@ dependencies:
|
|
184
184
|
requirements:
|
185
185
|
- - '>='
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version: 0.2.
|
187
|
+
version: 0.2.5
|
188
188
|
type: :runtime
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
192
|
- - '>='
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version: 0.2.
|
194
|
+
version: 0.2.5
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: hashie
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|