adhearsion 2.0.0.rc2 → 2.0.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/CHANGELOG.md +6 -0
  2. data/lib/adhearsion/call_controller/output.rb +3 -3
  3. data/lib/adhearsion/calls.rb +3 -6
  4. data/lib/adhearsion/process.rb +1 -1
  5. data/lib/adhearsion/version.rb +1 -1
  6. data/spec/adhearsion/calls_spec.rb +1 -1
  7. metadata +65 -65
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # [develop](https://github.com/adhearsion/adhearsion)
2
2
 
3
+ # [2.0.0.rc3](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc2...v2.0.0.rc3) - [2012-03-23](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc3)
4
+ * Bugfix/Change: `Adhearsion::Calls` (`Adhearsion.active_calls`) now exactly mirrors the Hash API
5
+ * Bugfix: Fix mis-use of `PlaybackError` (wrong namespace)
6
+ * Bugfix: Calls collection now correctly hangs up dead calls, and only genuine crashes
7
+ * Bugfix: Logging of playback errors is more explicit
8
+
3
9
  # [2.0.0.rc2](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc1...v2.0.0.rc2) - [2012-03-22](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc2)
4
10
  * Bugfix: Exceptions raised in call event handlers no longer kill the call actor
5
11
  * Bugfix: More exceptions handled internally by Adhearsion are logged in an appropriate context
data/lib/adhearsion/call_controller/output.rb CHANGED
@@ -167,7 +167,7 @@ module Adhearsion
167
167
  result = interruptible_play! output
168
168
  rescue PlaybackError => e
169
169
  # Ignore this exception and play the next output
170
- logger.warn "Error playing back the prompt: #{e.message}"
170
+ logger.error "Error playing back the prompt: #{e.message}"
171
171
  ensure
172
172
  break if result
173
173
  end
@@ -257,8 +257,8 @@ module Adhearsion
257
257
  write_and_await_response input_stopper_component
258
258
  begin
259
259
  execute_component_and_await_completion output_component
260
- rescue StandardError
261
- raise Adhearsion::PlaybackError, "Output failed for argument #{argument.inspect}"
260
+ rescue ::Punchblock::ProtocolError => e
261
+ raise PlaybackError, "Output failed for argument #{argument.inspect} due to #{e.inspect}"
262
262
  end
263
263
  input_stopper_component.stop! if input_stopper_component.executing?
264
264
  reason = input_stopper_component.complete_event.reason
data/lib/adhearsion/calls.rb CHANGED
@@ -32,15 +32,11 @@ module Adhearsion
32
32
  end
33
33
 
34
34
  def with_tag(tag)
35
- find_all do |call|
35
+ values.find_all do |call|
36
36
  call.tagged_with? tag
37
37
  end
38
38
  end
39
39
 
40
- def each(&block)
41
- values.each(&block)
42
- end
43
-
44
40
  private
45
41
 
46
42
  def call_is_dead?(call)
@@ -49,10 +45,11 @@ module Adhearsion
49
45
  end
50
46
 
51
47
  def call_died(call, reason)
48
+ return unless reason
52
49
  catching_standard_errors do
53
50
  call_id = key call
54
51
  remove_inactive_call call
55
- PunchblockPlugin.client.execute_command Punchblock::Command::Hangup, :async => true, :call_id => call_id
52
+ PunchblockPlugin.client.execute_command Punchblock::Command::Hangup.new, :async => true, :call_id => call_id
56
53
  end
57
54
  end
58
55
  end
data/lib/adhearsion/process.rb CHANGED
@@ -73,7 +73,7 @@ module Adhearsion
73
73
  end
74
74
 
75
75
  def final_shutdown
76
- Adhearsion.active_calls.each do |call|
76
+ Adhearsion.active_calls.each do |_, call|
77
77
  call.hangup!
78
78
  end
79
79
 
data/lib/adhearsion/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  module Adhearsion #:nodoc:
4
- VERSION = '2.0.0.rc2'
4
+ VERSION = '2.0.0.rc3'
5
5
  end
data/spec/adhearsion/calls_spec.rb CHANGED
@@ -113,7 +113,7 @@ module Adhearsion
113
113
  it "is sends a hangup command for the call" do
114
114
  call_id = call.id
115
115
  flexmock PunchblockPlugin, :client => flexmock('Client')
116
- flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(Punchblock::Command::Hangup, :async => true, :call_id => call_id)
116
+ flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(Punchblock::Command::Hangup.new, :async => true, :call_id => call_id)
117
117
 
118
118
  subject << call
119
119
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: adhearsion
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc2
4
+ version: 2.0.0.rc3
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -12,11 +12,11 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2012-03-22 00:00:00.000000000 Z
15
+ date: 2012-03-23 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: bundler
19
- requirement: &2156226700 !ruby/object:Gem::Requirement
19
+ requirement: &2156158800 !ruby/object:Gem::Requirement
20
20
  none: false
21
21
  requirements:
22
22
  - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
24
24
  version: 1.0.10
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *2156226700
27
+ version_requirements: *2156158800
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: punchblock
30
- requirement: &2156221520 !ruby/object:Gem::Requirement
30
+ requirement: &2156157380 !ruby/object:Gem::Requirement
31
31
  none: false
32
32
  requirements:
33
33
  - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
35
35
  version: 0.10.0
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *2156221520
38
+ version_requirements: *2156157380
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: logging
41
- requirement: &2156220200 !ruby/object:Gem::Requirement
41
+ requirement: &2156151240 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 1.6.1
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *2156220200
49
+ version_requirements: *2156151240
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: adhearsion-loquacious
52
- requirement: &2156218540 !ruby/object:Gem::Requirement
52
+ requirement: &2156150320 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
57
57
  version: 1.9.0
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *2156218540
60
+ version_requirements: *2156150320
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: activesupport
63
- requirement: &2156217580 !ruby/object:Gem::Requirement
63
+ requirement: &2156145860 !ruby/object:Gem::Requirement
64
64
  none: false
65
65
  requirements:
66
66
  - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
68
68
  version: 3.0.10
69
69
  type: :runtime
70
70
  prerelease: false
71
- version_requirements: *2156217580
71
+ version_requirements: *2156145860
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: i18n
74
- requirement: &2156213900 !ruby/object:Gem::Requirement
74
+ requirement: &2156145040 !ruby/object:Gem::Requirement
75
75
  none: false
76
76
  requirements:
77
77
  - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
79
79
  version: 0.5.0
80
80
  type: :runtime
81
81
  prerelease: false
82
- version_requirements: *2156213900
82
+ version_requirements: *2156145040
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: json
85
- requirement: &2156213080 !ruby/object:Gem::Requirement
85
+ requirement: &2156144460 !ruby/object:Gem::Requirement
86
86
  none: false
87
87
  requirements:
88
88
  - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
90
90
  version: '0'
91
91
  type: :runtime
92
92
  prerelease: false
93
- version_requirements: *2156213080
93
+ version_requirements: *2156144460
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: thor
96
- requirement: &2156212120 !ruby/object:Gem::Requirement
96
+ requirement: &2156143460 !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
99
  - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
101
101
  version: '0'
102
102
  type: :runtime
103
103
  prerelease: false
104
- version_requirements: *2156212120
104
+ version_requirements: *2156143460
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: rake
107
- requirement: &2156211580 !ruby/object:Gem::Requirement
107
+ requirement: &2156142480 !ruby/object:Gem::Requirement
108
108
  none: false
109
109
  requirements:
110
110
  - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
112
112
  version: '0'
113
113
  type: :runtime
114
114
  prerelease: false
115
- version_requirements: *2156211580
115
+ version_requirements: *2156142480
116
116
  - !ruby/object:Gem::Dependency
117
117
  name: pry
118
- requirement: &2156210340 !ruby/object:Gem::Requirement
118
+ requirement: &2156141680 !ruby/object:Gem::Requirement
119
119
  none: false
120
120
  requirements:
121
121
  - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
123
123
  version: '0'
124
124
  type: :runtime
125
125
  prerelease: false
126
- version_requirements: *2156210340
126
+ version_requirements: *2156141680
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: uuid
129
- requirement: &2156209660 !ruby/object:Gem::Requirement
129
+ requirement: &2156140700 !ruby/object:Gem::Requirement
130
130
  none: false
131
131
  requirements:
132
132
  - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
134
134
  version: '0'
135
135
  type: :runtime
136
136
  prerelease: false
137
- version_requirements: *2156209660
137
+ version_requirements: *2156140700
138
138
  - !ruby/object:Gem::Dependency
139
139
  name: future-resource
140
- requirement: &2156208320 !ruby/object:Gem::Requirement
140
+ requirement: &2156139480 !ruby/object:Gem::Requirement
141
141
  none: false
142
142
  requirements:
143
143
  - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
145
145
  version: 0.0.2
146
146
  type: :runtime
147
147
  prerelease: false
148
- version_requirements: *2156208320
148
+ version_requirements: *2156139480
149
149
  - !ruby/object:Gem::Dependency
150
150
  name: ruby_speech
151
- requirement: &2156207180 !ruby/object:Gem::Requirement
151
+ requirement: &2156127780 !ruby/object:Gem::Requirement
152
152
  none: false
153
153
  requirements:
154
154
  - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
156
156
  version: 0.4.0
157
157
  type: :runtime
158
158
  prerelease: false
159
- version_requirements: *2156207180
159
+ version_requirements: *2156127780
160
160
  - !ruby/object:Gem::Dependency
161
161
  name: countdownlatch
162
- requirement: &2156193500 !ruby/object:Gem::Requirement
162
+ requirement: &2156126940 !ruby/object:Gem::Requirement
163
163
  none: false
164
164
  requirements:
165
165
  - - ! '>='
@@ -167,10 +167,10 @@ dependencies:
167
167
  version: '0'
168
168
  type: :runtime
169
169
  prerelease: false
170
- version_requirements: *2156193500
170
+ version_requirements: *2156126940
171
171
  - !ruby/object:Gem::Dependency
172
172
  name: has-guarded-handlers
173
- requirement: &2156188320 !ruby/object:Gem::Requirement
173
+ requirement: &2156123960 !ruby/object:Gem::Requirement
174
174
  none: false
175
175
  requirements:
176
176
  - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
178
178
  version: 1.1.0
179
179
  type: :runtime
180
180
  prerelease: false
181
- version_requirements: *2156188320
181
+ version_requirements: *2156123960
182
182
  - !ruby/object:Gem::Dependency
183
183
  name: girl_friday
184
- requirement: &2156187600 !ruby/object:Gem::Requirement
184
+ requirement: &2156121080 !ruby/object:Gem::Requirement
185
185
  none: false
186
186
  requirements:
187
187
  - - ! '>='
@@ -189,10 +189,10 @@ dependencies:
189
189
  version: '0'
190
190
  type: :runtime
191
191
  prerelease: false
192
- version_requirements: *2156187600
192
+ version_requirements: *2156121080
193
193
  - !ruby/object:Gem::Dependency
194
194
  name: ffi
195
- requirement: &2156186680 !ruby/object:Gem::Requirement
195
+ requirement: &2156120300 !ruby/object:Gem::Requirement
196
196
  none: false
197
197
  requirements:
198
198
  - - ! '>='
@@ -200,10 +200,10 @@ dependencies:
200
200
  version: 1.0.11
201
201
  type: :runtime
202
202
  prerelease: false
203
- version_requirements: *2156186680
203
+ version_requirements: *2156120300
204
204
  - !ruby/object:Gem::Dependency
205
205
  name: celluloid
206
- requirement: &2156186020 !ruby/object:Gem::Requirement
206
+ requirement: &2156119260 !ruby/object:Gem::Requirement
207
207
  none: false
208
208
  requirements:
209
209
  - - ! '>='
@@ -211,10 +211,10 @@ dependencies:
211
211
  version: 0.9.0
212
212
  type: :runtime
213
213
  prerelease: false
214
- version_requirements: *2156186020
214
+ version_requirements: *2156119260
215
215
  - !ruby/object:Gem::Dependency
216
216
  name: deep_merge
217
- requirement: &2152014220 !ruby/object:Gem::Requirement
217
+ requirement: &2156118360 !ruby/object:Gem::Requirement
218
218
  none: false
219
219
  requirements:
220
220
  - - ! '>='
@@ -222,10 +222,10 @@ dependencies:
222
222
  version: '0'
223
223
  type: :runtime
224
224
  prerelease: false
225
- version_requirements: *2152014220
225
+ version_requirements: *2156118360
226
226
  - !ruby/object:Gem::Dependency
227
227
  name: rspec
228
- requirement: &2152012400 !ruby/object:Gem::Requirement
228
+ requirement: &2156117620 !ruby/object:Gem::Requirement
229
229
  none: false
230
230
  requirements:
231
231
  - - ~>
@@ -233,10 +233,10 @@ dependencies:
233
233
  version: 2.7.0
234
234
  type: :development
235
235
  prerelease: false
236
- version_requirements: *2152012400
236
+ version_requirements: *2156117620
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: flexmock
239
- requirement: &2152011380 !ruby/object:Gem::Requirement
239
+ requirement: &2156116220 !ruby/object:Gem::Requirement
240
240
  none: false
241
241
  requirements:
242
242
  - - ! '>='
@@ -244,10 +244,10 @@ dependencies:
244
244
  version: '0'
245
245
  type: :development
246
246
  prerelease: false
247
- version_requirements: *2152011380
247
+ version_requirements: *2156116220
248
248
  - !ruby/object:Gem::Dependency
249
249
  name: activerecord
250
- requirement: &2152009540 !ruby/object:Gem::Requirement
250
+ requirement: &2156115240 !ruby/object:Gem::Requirement
251
251
  none: false
252
252
  requirements:
253
253
  - - ! '>='
@@ -255,10 +255,10 @@ dependencies:
255
255
  version: 3.0.10
256
256
  type: :development
257
257
  prerelease: false
258
- version_requirements: *2152009540
258
+ version_requirements: *2156115240
259
259
  - !ruby/object:Gem::Dependency
260
260
  name: simplecov
261
- requirement: &2152008640 !ruby/object:Gem::Requirement
261
+ requirement: &2156114600 !ruby/object:Gem::Requirement
262
262
  none: false
263
263
  requirements:
264
264
  - - ! '>='
@@ -266,10 +266,10 @@ dependencies:
266
266
  version: '0'
267
267
  type: :development
268
268
  prerelease: false
269
- version_requirements: *2152008640
269
+ version_requirements: *2156114600
270
270
  - !ruby/object:Gem::Dependency
271
271
  name: simplecov-rcov
272
- requirement: &2152007400 !ruby/object:Gem::Requirement
272
+ requirement: &2156113920 !ruby/object:Gem::Requirement
273
273
  none: false
274
274
  requirements:
275
275
  - - ! '>='
@@ -277,10 +277,10 @@ dependencies:
277
277
  version: '0'
278
278
  type: :development
279
279
  prerelease: false
280
- version_requirements: *2152007400
280
+ version_requirements: *2156113920
281
281
  - !ruby/object:Gem::Dependency
282
282
  name: ci_reporter
283
- requirement: &2152006220 !ruby/object:Gem::Requirement
283
+ requirement: &2156113000 !ruby/object:Gem::Requirement
284
284
  none: false
285
285
  requirements:
286
286
  - - ! '>='
@@ -288,10 +288,10 @@ dependencies:
288
288
  version: '0'
289
289
  type: :development
290
290
  prerelease: false
291
- version_requirements: *2152006220
291
+ version_requirements: *2156113000
292
292
  - !ruby/object:Gem::Dependency
293
293
  name: yard
294
- requirement: &2156172140 !ruby/object:Gem::Requirement
294
+ requirement: &2156111640 !ruby/object:Gem::Requirement
295
295
  none: false
296
296
  requirements:
297
297
  - - ! '>='
@@ -299,10 +299,10 @@ dependencies:
299
299
  version: '0'
300
300
  type: :development
301
301
  prerelease: false
302
- version_requirements: *2156172140
302
+ version_requirements: *2156111640
303
303
  - !ruby/object:Gem::Dependency
304
304
  name: guard-rspec
305
- requirement: &2156170840 !ruby/object:Gem::Requirement
305
+ requirement: &2152231160 !ruby/object:Gem::Requirement
306
306
  none: false
307
307
  requirements:
308
308
  - - ! '>='
@@ -310,10 +310,10 @@ dependencies:
310
310
  version: '0'
311
311
  type: :development
312
312
  prerelease: false
313
- version_requirements: *2156170840
313
+ version_requirements: *2152231160
314
314
  - !ruby/object:Gem::Dependency
315
315
  name: guard-cucumber
316
- requirement: &2156169560 !ruby/object:Gem::Requirement
316
+ requirement: &2152229220 !ruby/object:Gem::Requirement
317
317
  none: false
318
318
  requirements:
319
319
  - - ! '>='
@@ -321,10 +321,10 @@ dependencies:
321
321
  version: '0'
322
322
  type: :development
323
323
  prerelease: false
324
- version_requirements: *2156169560
324
+ version_requirements: *2152229220
325
325
  - !ruby/object:Gem::Dependency
326
326
  name: ruby_gntp
327
- requirement: &2156167960 !ruby/object:Gem::Requirement
327
+ requirement: &2152227900 !ruby/object:Gem::Requirement
328
328
  none: false
329
329
  requirements:
330
330
  - - ! '>='
@@ -332,10 +332,10 @@ dependencies:
332
332
  version: '0'
333
333
  type: :development
334
334
  prerelease: false
335
- version_requirements: *2156167960
335
+ version_requirements: *2152227900
336
336
  - !ruby/object:Gem::Dependency
337
337
  name: cucumber
338
- requirement: &2156120960 !ruby/object:Gem::Requirement
338
+ requirement: &2152226420 !ruby/object:Gem::Requirement
339
339
  none: false
340
340
  requirements:
341
341
  - - ! '>='
@@ -343,10 +343,10 @@ dependencies:
343
343
  version: '0'
344
344
  type: :development
345
345
  prerelease: false
346
- version_requirements: *2156120960
346
+ version_requirements: *2152226420
347
347
  - !ruby/object:Gem::Dependency
348
348
  name: aruba
349
- requirement: &2156118080 !ruby/object:Gem::Requirement
349
+ requirement: &2168873960 !ruby/object:Gem::Requirement
350
350
  none: false
351
351
  requirements:
352
352
  - - ! '>='
@@ -354,7 +354,7 @@ dependencies:
354
354
  version: '0'
355
355
  type: :development
356
356
  prerelease: false
357
- version_requirements: *2156118080
357
+ version_requirements: *2168873960
358
358
  description: Adhearsion is an open-source telephony development framework
359
359
  email: dev&Adhearsion.com
360
360
  executables:
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
517
517
  version: '0'
518
518
  segments:
519
519
  - 0
520
- hash: -2676474875029582124
520
+ hash: 4509344095409013612
521
521
  required_rubygems_version: !ruby/object:Gem::Requirement
522
522
  none: false
523
523
  requirements: