punchblock 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64729c9456c13c6897d13dbac65657a51951f67a
-  data.tar.gz: aa7522da6cf77ebfbbb044865e7c43b79a1939d3
+  metadata.gz: 2afefcb37df1adbbdbd78069ace76a6e7a90ff6a
+  data.tar.gz: 19c35819dbc195978dc642e89171e8ce2369cb9c
 SHA512:
-  metadata.gz: d39f61aaa9ffb224dfa32e9bd898fadc359a9ec6881682e709ee3d0df36afff2c26854baa30e0fc99794a73c18309e8f4922c17d065cb2f5402573947dfabba1
-  data.tar.gz: 5c93e10769dbbd141b71732f163783bf7ff653faa30d3886f382a87c5a3402c5e6bcd8784701d7b55adbfdf1a728f3841a0093d455c1a16e10e94e161473b902
+  metadata.gz: 424af09c594e3ef4f26ae02452ebae5bdaf7b7c1f3df1b2235914e3397360468c9135905bb61e352a0b09097e4958538dec4645778413dcd61d5740a41e6b70b
+  data.tar.gz: 809aa86ad8b9e5c211c774279f27d7f853a05802bb7c52b2c95f5d23477e8ff4f6c708d5f678c3c770821692727375748a2510d6ab284c5d7906910c45539986

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.9.1](https://github.com/adhearsion/punchblock/compare/v1.9.0...v1.9.1) - [2013-05-08](https://rubygems.org/gems/punchblock/versions/1.9.1)
+  * Bugfix: AMI errors indicating dead channels were not being handled correctly
+  * Bugfix: We were broken on Celluloid 0.14 due to changes in block execution semantics between actors
+
 # [v1.9.0](https://github.com/adhearsion/punchblock/compare/v1.8.2...v1.9.0) - [2013-05-03](https://rubygems.org/gems/punchblock/versions/1.9.0)
   * Feature: Use RubyAMI 2.0 with a single AMI connection.
   * Feature: Cache channel variables on Asterisk calls.

data/lib/punchblock.rb

@@ -13,6 +13,7 @@
 module Punchblock
   extend ActiveSupport::Autoload
 
+  autoload :ActorHasGuardedHandlers
   autoload :Client
   autoload :Command
   autoload :CommandNode

data/lib/punchblock/actor_has_guarded_handlers.rb

@@ -0,0 +1,7 @@
+module Punchblock
+  module ActorHasGuardedHandlers
+    def execute_guarded_handlers_on_receiver
+      execute_block_on_receiver :register_handler, :register_tmp_handler, :register_handler_with_priority
+    end
+  end
+end

data/lib/punchblock/translator/asterisk/call.rb

@@ -8,6 +8,9 @@ module Punchblock
         include Celluloid
         include DeadActorSafety
 
+        extend ActorHasGuardedHandlers
+        execute_guarded_handlers_on_receiver
+
         attr_reader :id, :channel, :translator, :agi_env, :direction
 
         HANGUP_CAUSE_TO_END_REASON = Hash.new { :error }
@@ -215,7 +218,12 @@ module Punchblock
             command.response = ProtocolError.new.setup 'command-not-acceptable', "Did not understand command for call #{id}", id
           end
         rescue RubyAMI::Error => e
-          command.response = ProtocolError.new.setup 'error', e.message
+          command.response = case e.message
+          when 'No such channel'
+            ProtocolError.new.setup :item_not_found, "Could not find a call with ID #{id}", id
+          else
+            ProtocolError.new.setup 'error', e.message, id
+          end
         rescue Celluloid::DeadActorError
           command.response = ProtocolError.new.setup :item_not_found, "Could not find a component with ID #{command.component_id} for call #{id}", id, command.component_id
         end

data/lib/punchblock/translator/freeswitch.rb

@@ -10,6 +10,9 @@ module Punchblock
       include HasGuardedHandlers
       include DeadActorSafety
 
+      extend ActorHasGuardedHandlers
+      execute_guarded_handlers_on_receiver
+
       extend ActiveSupport::Autoload
 
       autoload :Call

data/lib/punchblock/translator/freeswitch/call.rb

@@ -8,6 +8,9 @@ module Punchblock
         include Celluloid
         include DeadActorSafety
 
+        extend ActorHasGuardedHandlers
+        execute_guarded_handlers_on_receiver
+
         HANGUP_CAUSE_TO_END_REASON = Hash.new :error
 
         HANGUP_CAUSE_TO_END_REASON['USER_BUSY'] = :busy

data/lib/punchblock/translator/freeswitch/component.rb

@@ -18,6 +18,9 @@ module Punchblock
           include DeadActorSafety
           include HasGuardedHandlers
 
+          extend ActorHasGuardedHandlers
+          execute_guarded_handlers_on_receiver
+
           attr_reader :id, :call, :call_id
 
           def initialize(component_node, call = nil)

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/punchblock.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.5"]
-  s.add_runtime_dependency %q<celluloid>, ["~> 0.13"]
+  s.add_runtime_dependency %q<celluloid>, ["~> 0.14"]
   s.add_runtime_dependency %q<ruby_ami>, ["~> 2.0"]
   s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]

data/spec/punchblock/translator/asterisk/call_spec.rb

@@ -851,6 +851,27 @@ module Punchblock
               subject.execute_command command
               command.response(0.5).should be true
             end
+
+            context "when the AMI commannd raises an error" do
+              let(:message) { 'Some error' }
+              let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
+
+              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+
+              it "should return an error with the message" do
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
+              end
+
+              context "with message 'No such channel'" do
+                let(:message) { 'No such channel' }
+
+                it "should return an :item_not_found event for the call" do
+                  subject.execute_command command
+                  command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+                end
+              end
+            end
           end
 
           context 'with a reject command' do
@@ -876,6 +897,27 @@ module Punchblock
               subject.execute_command command
               command.response(0.5).should be true
             end
+
+            context "when the AMI commannd raises an error" do
+              let(:message) { 'Some error' }
+              let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
+
+              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+
+              it "should return an error with the message" do
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
+              end
+
+              context "with message 'No such channel'" do
+                let(:message) { 'No such channel' }
+
+                it "should return an :item_not_found event for the call" do
+                  subject.execute_command command
+                  command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+                end
+              end
+            end
           end
 
           context 'with an answer command' do
@@ -886,6 +928,27 @@ module Punchblock
               subject.execute_command command
               command.response(0.5).should be true
             end
+
+            context "when the AMI commannd raises an error" do
+              let(:message) { 'Some error' }
+              let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
+
+              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+
+              it "should return an error with the message" do
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
+              end
+
+              context "with message 'No such channel'" do
+                let(:message) { 'No such channel' }
+
+                it "should return an :item_not_found event for the call" do
+                  subject.execute_command command
+                  command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+                end
+              end
+            end
           end
 
           context 'with a hangup command' do
@@ -896,6 +959,27 @@ module Punchblock
               subject.execute_command command
               command.response(0.5).should be true
             end
+
+            context "when the AMI commannd raises an error" do
+              let(:message) { 'Some error' }
+              let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
+
+              before { ami_client.should_receive(:send_action).and_raise error }
+
+              it "should return an error with the message" do
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
+              end
+
+              context "with message 'No such channel'" do
+                let(:message) { 'No such channel' }
+
+                it "should return an :item_not_found event for the call" do
+                  subject.execute_command command
+                  command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+                end
+              end
+            end
           end
 
           context 'with an AGI command component' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -122,14 +122,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: ruby_ami
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +316,7 @@ files:
 - README.markdown
 - Rakefile
 - lib/punchblock.rb
+- lib/punchblock/actor_has_guarded_handlers.rb
 - lib/punchblock/client.rb
 - lib/punchblock/client/component_registry.rb
 - lib/punchblock/command.rb