punchblock 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35195771cc15e2610a1150b15154cf6c3116db63
-  data.tar.gz: bf32f24e8587d6463bb1c8a358fe3ebd78524756
+  metadata.gz: 02c18140e4e4849651937dbae454e815b0674579
+  data.tar.gz: 5465841458d3d77df6b362ed694ad34978678bf4
 SHA512:
-  metadata.gz: e48260063f15f468c12306ae1b109d75499d18eb6bbfc0d18aca8dec0db385c537e661242f73e8f1b58d70a19042afc96875ac7bec11281b668a270b381938e5
-  data.tar.gz: 9f595263dae20bb2d44cc0f630e35da720e5063e1b4a89b79ebf7b8625ed58d2ebe811e0197fb0e50cfdb5761da99f12cf356016bc39d6cc5a6d147d3651eac7
+  metadata.gz: ee18823aea7cdba8ab462c4cf9571d894b4a35412bbf489c9c02adbd505ea4e4110a3e72d0a12c723d317b21c96f70d9e78345109ed86a26d505e791df88fede
+  data.tar.gz: 7416b6895971bcebd5e97b4886e7c9094a3673329c61717ce2245b25d82523d3f7e5c6a5fc85b86285244cfadf20730c725a8d313346b75d1b98b5288ccf8d94

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.7.2](https://github.com/adhearsion/punchblock/compare/v2.7.1...v2.7.2) - [2015-08-10](https://rubygems.org/gems/punchblock/versions/2.7.2)
+  * Bugfix: Process joined events on Asterisk 13 in any order, avoiding Join command timeouts
+
 # [v2.7.1](https://github.com/adhearsion/punchblock/compare/v2.7.0...v2.7.1) - [2015-07-14](https://rubygems.org/gems/punchblock/versions/2.7.1)
   * Bugfix: Ensure components are deregistered from asterisk translator once the call is ended ([#250](https://github.com/adhearsion/punchblock/pull/250))
 

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

@@ -139,7 +139,8 @@ module Punchblock
           when 'BridgeEnter'
             if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'])
               if other_call = translator.call_for_channel(other_call_channel)
-                join_command  = other_call.pending_joins.delete channel
+                join_command   = @pending_joins.delete other_call_channel
+                join_command ||= other_call.pending_joins.delete channel
                 join_command.response = true if join_command
 
                 event = Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time

data/lib/punchblock/version.rb

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

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

@@ -836,11 +836,11 @@ module Punchblock
                 Punchblock::Command::Join.new call_uri: other_call_id
               end
 
-              let :ami_event do
+              let :second_ami_event do
                 RubyAMI::Event.new 'BridgeEnter',
                 'Privilege' => "call,all",
                 'BridgeUniqueid'  => bridge_uniqueid,
-                'Channel'  => call_channel
+                'Channel'  => other_channel
               end
 
               let :expected_joined do
@@ -854,27 +854,49 @@ module Punchblock
               end
 
               before do
-                translator.bridges[bridge_uniqueid] = other_channel
+                translator.register_call subject
                 translator.register_call other_call
-
-                other_call.pending_joins[channel] = command
                 command.request!
                 expect(subject).to receive(:execute_agi_command).and_return code: 200
                 subject.execute_command command
+                translator.handle_ami_event ami_event
               end
 
               it 'sends the correct Joined events' do
                 expect(translator).to receive(:handle_pb_event).with expected_joined
                 expect(translator).to receive(:handle_pb_event).with expected_joined_other
-                subject.process_ami_event ami_event
+                translator.handle_ami_event second_ami_event
                 expect(command.response(0.5)).to eq(true)
               end
+
+              context 'out of order' do
+                let :ami_event do
+                  RubyAMI::Event.new 'BridgeEnter',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => other_channel
+                end
+
+                let :second_ami_event do
+                  RubyAMI::Event.new 'BridgeEnter',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => call_channel
+                end
+
+                it 'sends the correct Joined events' do
+                  expect(translator).to receive(:handle_pb_event).with expected_joined
+                  expect(translator).to receive(:handle_pb_event).with expected_joined_other
+                  translator.handle_ami_event second_ami_event
+                  expect(command.response(0.5)).to eq(true)
+                end
+              end
             end
           end
 
           context 'with a BridgeLeave event' do
             let(:bridge_uniqueid) { "1234-5678" }
-            let(:call_channel) { "SIP/foo-1234" }
+            let(:call_channel) { "SIP/foo" }
             let :ami_event do
               RubyAMI::Event.new 'BridgeLeave',
                 'Privilege' => "call,all",
@@ -896,11 +918,11 @@ module Punchblock
               end
               let(:other_call_id) { other_call.id }
 
-              let :ami_event do
+              let :second_ami_event do
                 RubyAMI::Event.new 'BridgeLeave',
                 'Privilege' => "call,all",
                 'BridgeUniqueid'  => bridge_uniqueid,
-                'Channel'  => call_channel
+                'Channel'  => other_channel
               end
 
               let :expected_unjoined do
@@ -914,14 +936,37 @@ module Punchblock
               end
 
               before do
-                translator.bridges[bridge_uniqueid + '_leave'] = other_channel
+                translator.register_call subject
                 translator.register_call other_call
+                translator.handle_ami_event ami_event
               end
 
               it 'sends the correct Unjoined events' do
                 expect(translator).to receive(:handle_pb_event).with expected_unjoined
                 expect(translator).to receive(:handle_pb_event).with expected_unjoined_other
-                subject.process_ami_event ami_event
+                translator.handle_ami_event second_ami_event
+              end
+
+              context 'out of order' do
+                let :ami_event do
+                  RubyAMI::Event.new 'BridgeLeave',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => other_channel
+                end
+
+                let :second_ami_event do
+                  RubyAMI::Event.new 'BridgeLeave',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => call_channel
+                end
+
+                it 'sends the correct Unjoined events' do
+                  expect(translator).to receive(:handle_pb_event).with expected_unjoined
+                  expect(translator).to receive(:handle_pb_event).with expected_unjoined_other
+                  translator.handle_ami_event second_ami_event
+                end
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri