slanger 0.3.2 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of slanger might be problematic. Click here for more details.

Files changed (5) hide show
  1. data/lib/slanger/connection.rb +3 -1
  2. data/lib/slanger/handler.rb +13 -2
  3. data/lib/slanger/presence_channel.rb +1 -3
  4. data/lib/slanger/presence_subscription.rb +1 -1
  5. metadata +38 -38
data/lib/slanger/connection.rb CHANGED
@@ -28,7 +28,9 @@ module Slanger
28
28
  private
29
29
 
30
30
  def format(channel_id, event_name, payload = {})
31
- { channel: channel_id, event: event_name, data: payload }.to_json
31
+ body = { event: event_name, data: payload }
32
+ body[:channel] = channel_id if channel_id
33
+ body.to_json
32
34
  end
33
35
  end
34
36
  end
data/lib/slanger/handler.rb CHANGED
@@ -39,7 +39,7 @@ module Slanger
39
39
  end
40
40
 
41
41
  def onclose
42
- @subscriptions.each { |c, s| Channel.unsubscribe c, s }
42
+ @subscriptions.each { |channel_id, subscription_id| Channel.unsubscribe channel_id, subscription_id }
43
43
  end
44
44
 
45
45
  def authenticate
@@ -59,7 +59,18 @@ module Slanger
59
59
  channel_id = msg['data']['channel']
60
60
  klass = subscription_klass channel_id
61
61
 
62
- @subscriptions[channel_id] = klass.new(connection.socket, connection.socket_id, msg).subscribe
62
+ if @subscriptions[channel_id]
63
+ error({ code: nil, message: "Existing subscription to #{channel_id}" })
64
+ else
65
+ @subscriptions[channel_id] = klass.new(connection.socket, connection.socket_id, msg).subscribe
66
+ end
67
+ end
68
+
69
+ def pusher_unsubscribe(msg)
70
+ channel_id = msg['data']['channel']
71
+ subscription_id = @subscriptions.delete(channel_id)
72
+
73
+ Channel.unsubscribe channel_id, subscription_id
63
74
  end
64
75
 
65
76
  private
data/lib/slanger/presence_channel.rb CHANGED
@@ -128,9 +128,7 @@ module Slanger
128
128
  # still remains in the subscriptions hash, i.e. multiple browser windows open.
129
129
  subscriber = subscriptions.delete message['subscription_id']
130
130
  unless subscriptions.has_value? subscriber
131
- push payload('pusher_internal:member_removed', {
132
- user_id: subscriber['user_id']
133
- })
131
+ push payload('pusher_internal:member_removed', { user_id: subscriber['user_id'] })
134
132
  end
135
133
  end
136
134
  end
data/lib/slanger/presence_subscription.rb CHANGED
@@ -9,7 +9,7 @@ module Slanger
9
9
  })
10
10
  end
11
11
 
12
- channel.subscribe(@msg, callback) { |m| connection.send_message m }
12
+ channel.subscribe(@msg, callback) { |m| send_message m }
13
13
  end
14
14
 
15
15
  private
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slanger
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-21 00:00:00.000000000 Z
12
+ date: 2012-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: eventmachine
16
- requirement: &70308786782020 !ruby/object:Gem::Requirement
16
+ requirement: &70337493316800 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.12.10
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70308786782020
24
+ version_requirements: *70337493316800
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: em-hiredis
27
- requirement: &70308786781440 !ruby/object:Gem::Requirement
27
+ requirement: &70337493316120 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.1.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70308786781440
35
+ version_requirements: *70337493316120
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: em-websocket
38
- requirement: &70308786780900 !ruby/object:Gem::Requirement
38
+ requirement: &70337493315580 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.3.5
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70308786780900
46
+ version_requirements: *70337493315580
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rack
49
- requirement: &70308786780320 !ruby/object:Gem::Requirement
49
+ requirement: &70337493315120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.3.3
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70308786780320
57
+ version_requirements: *70337493315120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rack-fiber_pool
60
- requirement: &70308786779740 !ruby/object:Gem::Requirement
60
+ requirement: &70337493314620 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - =
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 0.9.1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70308786779740
68
+ version_requirements: *70337493314620
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: signature
71
- requirement: &70308790894640 !ruby/object:Gem::Requirement
71
+ requirement: &70337493314140 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 0.1.3
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70308790894640
79
+ version_requirements: *70337493314140
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: activesupport
82
- requirement: &70308790894000 !ruby/object:Gem::Requirement
82
+ requirement: &70337493313680 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 3.1.0
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70308790894000
90
+ version_requirements: *70337493313680
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: glamazon
93
- requirement: &70308790893260 !ruby/object:Gem::Requirement
93
+ requirement: &70337493302700 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.3.1
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70308790893260
101
+ version_requirements: *70337493302700
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: sinatra
104
- requirement: &70308790892400 !ruby/object:Gem::Requirement
104
+ requirement: &70337493302020 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 1.2.6
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70308790892400
112
+ version_requirements: *70337493302020
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: thin
115
- requirement: &70308790891620 !ruby/object:Gem::Requirement
115
+ requirement: &70337493301320 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.2.11
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70308790891620
123
+ version_requirements: *70337493301320
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: em-http-request
126
- requirement: &70308790891020 !ruby/object:Gem::Requirement
126
+ requirement: &70337493300820 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.3.0
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70308790891020
134
+ version_requirements: *70337493300820
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rspec
137
- requirement: &70308790890120 !ruby/object:Gem::Requirement
137
+ requirement: &70337493300360 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 2.6.0
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70308790890120
145
+ version_requirements: *70337493300360
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: pusher
148
- requirement: &70308790889340 !ruby/object:Gem::Requirement
148
+ requirement: &70337493299880 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.9.3
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70308790889340
156
+ version_requirements: *70337493299880
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: haml
159
- requirement: &70308790888480 !ruby/object:Gem::Requirement
159
+ requirement: &70337493299380 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 3.1.2
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *70308790888480
167
+ version_requirements: *70337493299380
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: rake
170
- requirement: &70308790887820 !ruby/object:Gem::Requirement
170
+ requirement: &70337493299000 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70308790887820
178
+ version_requirements: *70337493299000
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: timecop
181
- requirement: &70308790908560 !ruby/object:Gem::Requirement
181
+ requirement: &70337493298280 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 0.3.5
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70308790908560
189
+ version_requirements: *70337493298280
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: webmock
192
- requirement: &70308790907940 !ruby/object:Gem::Requirement
192
+ requirement: &70337493297200 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 1.8.7
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70308790907940
200
+ version_requirements: *70337493297200
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: mocha
203
- requirement: &70308790907340 !ruby/object:Gem::Requirement
203
+ requirement: &70337493296460 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,7 +208,7 @@ dependencies:
208
208
  version: 0.12.0
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70308790907340
211
+ version_requirements: *70337493296460
212
212
  description: A websocket service compatible with Pusher libraries
213
213
  email: sjtgraham@mac.com
214
214
  executables: