adhearsion 2.0.0.rc2 → 2.0.0.rc3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [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)
+  * Bugfix/Change: `Adhearsion::Calls` (`Adhearsion.active_calls`) now exactly mirrors the Hash API
+  * Bugfix: Fix mis-use of `PlaybackError` (wrong namespace)
+  * Bugfix: Calls collection now correctly hangs up dead calls, and only genuine crashes
+  * Bugfix: Logging of playback errors is more explicit
+
 # [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)
   * Bugfix: Exceptions raised in call event handlers no longer kill the call actor
   * Bugfix: More exceptions handled internally by Adhearsion are logged in an appropriate context

data/lib/adhearsion/call_controller/output.rb

@@ -167,7 +167,7 @@ module Adhearsion
             result = interruptible_play! output
           rescue PlaybackError => e
             # Ignore this exception and play the next output
-            logger.warn "Error playing back the prompt: #{e.message}"
+            logger.error "Error playing back the prompt: #{e.message}"
           ensure
             break if result
           end
@@ -257,8 +257,8 @@ module Adhearsion
         write_and_await_response input_stopper_component
         begin
           execute_component_and_await_completion output_component
-        rescue StandardError
-          raise Adhearsion::PlaybackError, "Output failed for argument #{argument.inspect}"
+        rescue ::Punchblock::ProtocolError => e
+          raise PlaybackError, "Output failed for argument #{argument.inspect} due to #{e.inspect}"
         end
         input_stopper_component.stop! if input_stopper_component.executing?
         reason = input_stopper_component.complete_event.reason

data/lib/adhearsion/calls.rb

@@ -32,15 +32,11 @@ module Adhearsion
     end
 
     def with_tag(tag)
-      find_all do |call|
+      values.find_all do |call|
         call.tagged_with? tag
       end
     end
 
-    def each(&block)
-      values.each(&block)
-    end
-
     private
 
     def call_is_dead?(call)
@@ -49,10 +45,11 @@ module Adhearsion
     end
 
     def call_died(call, reason)
+      return unless reason
       catching_standard_errors do
         call_id = key call
         remove_inactive_call call
-        PunchblockPlugin.client.execute_command Punchblock::Command::Hangup, :async => true, :call_id => call_id
+        PunchblockPlugin.client.execute_command Punchblock::Command::Hangup.new, :async => true, :call_id => call_id
       end
     end
   end

data/lib/adhearsion/process.rb

@@ -73,7 +73,7 @@ module Adhearsion
     end
 
     def final_shutdown
-      Adhearsion.active_calls.each do |call|
+      Adhearsion.active_calls.each do |_, call|
         call.hangup!
       end
 

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion #:nodoc:
-  VERSION = '2.0.0.rc2'
+  VERSION = '2.0.0.rc3'
 end

data/spec/adhearsion/calls_spec.rb

@@ -113,7 +113,7 @@ module Adhearsion
       it "is sends a hangup command for the call" do
         call_id = call.id
         flexmock PunchblockPlugin, :client => flexmock('Client')
-        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(Punchblock::Command::Hangup, :async => true, :call_id => call_id)
+        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(Punchblock::Command::Hangup.new, :async => true, :call_id => call_id)
 
         subject << call
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156226700 !ruby/object:Gem::Requirement
+  requirement: &2156158800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156226700
+  version_requirements: *2156158800
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2156221520 !ruby/object:Gem::Requirement
+  requirement: &2156157380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156221520
+  version_requirements: *2156157380
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2156220200 !ruby/object:Gem::Requirement
+  requirement: &2156151240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156220200
+  version_requirements: *2156151240
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2156218540 !ruby/object:Gem::Requirement
+  requirement: &2156150320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156218540
+  version_requirements: *2156150320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156217580 !ruby/object:Gem::Requirement
+  requirement: &2156145860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156217580
+  version_requirements: *2156145860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156213900 !ruby/object:Gem::Requirement
+  requirement: &2156145040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156213900
+  version_requirements: *2156145040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156213080 !ruby/object:Gem::Requirement
+  requirement: &2156144460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156213080
+  version_requirements: *2156144460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156212120 !ruby/object:Gem::Requirement
+  requirement: &2156143460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156212120
+  version_requirements: *2156143460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156211580 !ruby/object:Gem::Requirement
+  requirement: &2156142480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156211580
+  version_requirements: *2156142480
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2156210340 !ruby/object:Gem::Requirement
+  requirement: &2156141680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156210340
+  version_requirements: *2156141680
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2156209660 !ruby/object:Gem::Requirement
+  requirement: &2156140700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156209660
+  version_requirements: *2156140700
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2156208320 !ruby/object:Gem::Requirement
+  requirement: &2156139480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156208320
+  version_requirements: *2156139480
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2156207180 !ruby/object:Gem::Requirement
+  requirement: &2156127780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156207180
+  version_requirements: *2156127780
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2156193500 !ruby/object:Gem::Requirement
+  requirement: &2156126940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +167,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156193500
+  version_requirements: *2156126940
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2156188320 !ruby/object:Gem::Requirement
+  requirement: &2156123960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156188320
+  version_requirements: *2156123960
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2156187600 !ruby/object:Gem::Requirement
+  requirement: &2156121080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +189,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156187600
+  version_requirements: *2156121080
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2156186680 !ruby/object:Gem::Requirement
+  requirement: &2156120300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +200,10 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2156186680
+  version_requirements: *2156120300
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2156186020 !ruby/object:Gem::Requirement
+  requirement: &2156119260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +211,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156186020
+  version_requirements: *2156119260
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &2152014220 !ruby/object:Gem::Requirement
+  requirement: &2156118360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,10 +222,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152014220
+  version_requirements: *2156118360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152012400 !ruby/object:Gem::Requirement
+  requirement: &2156117620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -233,10 +233,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152012400
+  version_requirements: *2156117620
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2152011380 !ruby/object:Gem::Requirement
+  requirement: &2156116220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +244,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152011380
+  version_requirements: *2156116220
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152009540 !ruby/object:Gem::Requirement
+  requirement: &2156115240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +255,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *2152009540
+  version_requirements: *2156115240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152008640 !ruby/object:Gem::Requirement
+  requirement: &2156114600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152008640
+  version_requirements: *2156114600
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2152007400 !ruby/object:Gem::Requirement
+  requirement: &2156113920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152007400
+  version_requirements: *2156113920
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2152006220 !ruby/object:Gem::Requirement
+  requirement: &2156113000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152006220
+  version_requirements: *2156113000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156172140 !ruby/object:Gem::Requirement
+  requirement: &2156111640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156172140
+  version_requirements: *2156111640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156170840 !ruby/object:Gem::Requirement
+  requirement: &2152231160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -310,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156170840
+  version_requirements: *2152231160
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2156169560 !ruby/object:Gem::Requirement
+  requirement: &2152229220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,10 +321,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156169560
+  version_requirements: *2152229220
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2156167960 !ruby/object:Gem::Requirement
+  requirement: &2152227900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -332,10 +332,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156167960
+  version_requirements: *2152227900
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156120960 !ruby/object:Gem::Requirement
+  requirement: &2152226420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -343,10 +343,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156120960
+  version_requirements: *2152226420
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156118080 !ruby/object:Gem::Requirement
+  requirement: &2168873960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -354,7 +354,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156118080
+  version_requirements: *2168873960
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2676474875029582124
+      hash: 4509344095409013612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: