punchblock 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6afe18610ec58e92290615347d829d84df0f35
-  data.tar.gz: 67ab1a85edc0cb9603f47739e661a6cd5f13492e
+  metadata.gz: b59ef9a626a919b1db35af9603f8d5d73edae6a8
+  data.tar.gz: 47f018bf7cc1d9ba4e6d14acb0d4bc18e64622e2
 SHA512:
-  metadata.gz: 204717279e74f4f6c892c2a832e2e81ac947473011e2249a7b5fc3cf7847dc133ea3eb7dccf61523898a9c79ef3e913f96562414b48477c2e668d52b67b9b17e
-  data.tar.gz: a7465ef83df1050746b6eb1c6e47b04ca8d9f68fdf29a51ebc96958940e69b868410a9459535b6e961c4206277764f0fe9bc9cfa903fb7c3dc68f1934cf40c76
+  metadata.gz: 8f143c3727b0bf9d205d3c9f8a09eec1eda96ad294af4dcca99b962de39c6aa47cce84ec24080a40ab4ca8ff78e244a444c66fa6571ba0e892871b475798549c
+  data.tar.gz: 55b015a502dc38e174c59707701046c0138ccf8e0db6afd318da38b7e7672a4271023cef5fca0f7b90bf22eaf6d2c695b6d5aee1a5acc0223a5147a410c9f77c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.4.0](https://github.com/adhearsion/punchblock/compare/v2.3.1...v2.4.0) - [2014-03-01](https://rubygems.org/gems/punchblock/versions/2.4.0)
+  * Feature: Add support for requesting calls with a specific URI
+  * Feature: Allow generation of a random call URI for a client
+  * Feature: Rayo events should be timestamped with dispatch or receipt time (#213)
+
 # [v2.3.1](https://github.com/adhearsion/punchblock/compare/v2.3.0...v2.3.1) - [2014-02-13](https://rubygems.org/gems/punchblock/versions/2.3.1)
   * Bugfix: Ensure commands can be associated on the wire even before they're executed
   * Bugfix: Ensure a command is always transitioned to is requested state prior to receiving a response

data/lib/punchblock/client.rb

@@ -10,7 +10,7 @@ module Punchblock
 
     attr_reader :connection, :component_registry
 
-    delegate :run, :stop, :send_message, :to => :connection
+    delegate :run, :stop, :send_message, :new_call_uri, :to => :connection
 
     # @param [Hash] options
     # @option options [Connection::XMPP] :connection The Punchblock connection to use for this session

data/lib/punchblock/command/dial.rb

@@ -13,6 +13,9 @@ module Punchblock
       # @return [String] the caller ID
       attribute :from
 
+      # @return [String] the requested URI for the resulting call
+      attribute :uri
+
       # @return [Integer] timeout in milliseconds
       attribute :timeout, Integer
 
@@ -27,7 +30,7 @@ module Punchblock
       end
 
       def rayo_attributes
-        {to: to, from: from, timeout: timeout}
+        {to: to, from: from, uri: uri, timeout: timeout}
       end
 
       def rayo_children(root)

data/lib/punchblock/component/component_node.rb

@@ -8,6 +8,7 @@ module Punchblock
       def initialize(*args)
         super
         @complete_event_resource = FutureResource.new
+        @mutex = Mutex.new
         register_internal_handlers
       end
 
@@ -36,12 +37,14 @@ module Punchblock
       end
 
       def response=(other)
-        if other.is_a?(Ref)
-          @component_id = other.component_id
-          @source_uri = other.uri.to_s
-          client.register_component self if client
+        @mutex.synchronize do
+          if other.is_a?(Ref)
+            @component_id = other.component_id
+            @source_uri = other.uri.to_s
+            client.register_component self if client
+          end
+          super
         end
-        super
       end
 
       def complete_event(timeout = nil)
@@ -49,10 +52,12 @@ module Punchblock
       end
 
       def complete_event=(other)
-        return if @complete_event_resource.set_yet?
-        client.delete_component_registration self if client
-        complete!
-        @complete_event_resource.resource = other
+        @mutex.synchronize do
+          return if @complete_event_resource.set_yet?
+          client.delete_component_registration self if client
+          complete!
+          @complete_event_resource.resource = other
+        end
       rescue StateMachine::InvalidTransition => e
         e.message << " for component #{self}"
         raise e

data/lib/punchblock/connection/asterisk.rb

@@ -45,6 +45,10 @@ module Punchblock
         ami_client.async.run
         Celluloid::Actor.join(ami_client)
       end
+
+      def new_call_uri
+        Punchblock.new_uuid
+      end
     end
 
     class RubyAMIStreamProxy

data/lib/punchblock/connection/xmpp.rb

@@ -109,6 +109,10 @@ module Punchblock
         super
       end
 
+      def new_call_uri
+        "xmpp:#{Punchblock.new_uuid}@#{root_domain}"
+      end
+
       private
 
       def jid_for_command(command)

data/lib/punchblock/core_ext/blather/stanza.rb

@@ -10,7 +10,7 @@ module Blather
     def rayo_node
       @rayo_node ||= begin
         first_child = at_xpath RAYO_NODE_PATH, Punchblock::RAYO_NAMESPACES
-        Punchblock::RayoNode.from_xml first_child, nil, component_id, "xmpp:#{from}" if first_child
+        Punchblock::RayoNode.from_xml first_child, nil, component_id, "xmpp:#{from}", delay_timestamp if first_child
       end
     end
 
@@ -27,5 +27,13 @@ module Blather
     def component_id
       from.resource
     end
+
+  private
+
+    def delay_timestamp
+      if delay = self.at_xpath('ns:delay', ns: 'urn:xmpp:delay')
+        DateTime.parse(delay[:stamp])
+      end
+    end
   end
 end

data/lib/punchblock/rayo_node.rb

@@ -17,6 +17,7 @@ module Punchblock
     attribute :source_uri
     attribute :domain
     attribute :transport
+    attribute :timestamp, DateTime, default: ->(*) { DateTime.now }
 
     attr_accessor :connection, :client, :original_component
 
@@ -49,7 +50,7 @@ module Punchblock
     # elements of the XML::Node
     # @param [XML::Node] node the node to import
     # @return the appropriate object based on the node name and namespace
-    def self.from_xml(node, call_id = nil, component_id = nil, uri = nil)
+    def self.from_xml(node, call_id = nil, component_id = nil, uri = nil, timestamp = nil)
       ns = (node.namespace.href if node.namespace)
       klass = class_from_registration(node.name, ns)
       if klass && klass != self
@@ -60,6 +61,7 @@ module Punchblock
         event.target_call_id = call_id
         event.component_id = component_id
         event.source_uri = uri
+        event.timestamp = timestamp if timestamp
       end
     end
 

data/lib/punchblock/translator/asterisk.rb

@@ -140,9 +140,13 @@ module Punchblock
           register_component component
           component.execute
         when Punchblock::Command::Dial
-          call = Call.new command.to, current_actor, ami_client, connection
-          register_call call
-          call.dial command
+          if call = call_with_id(command.uri)
+            command.response = ProtocolError.new.setup(:conflict, 'Call ID already in use')
+          else
+            call = Call.new command.to, current_actor, ami_client, connection, nil, command.uri
+            register_call call
+            call.dial command
+          end
         else
           command.response = ProtocolError.new.setup 'command-not-acceptable', "Did not understand command"
         end

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

@@ -25,10 +25,11 @@ module Punchblock
         HANGUP_CAUSE_TO_END_REASON[22] = :reject
         HANGUP_CAUSE_TO_END_REASON[102] = :timeout
 
-        def initialize(channel, translator, ami_client, connection, agi_env = nil)
+        def initialize(channel, translator, ami_client, connection, agi_env = nil, id = nil)
           @channel, @translator, @ami_client, @connection = channel, translator, ami_client, connection
           @agi_env = agi_env || {}
-          @id, @components = Punchblock.new_uuid, {}
+          @id = id || Punchblock.new_uuid
+          @components = {}
           @answered = false
           @pending_joins = {}
           @progress_sent = false
@@ -113,7 +114,7 @@ module Punchblock
 
           case ami_event.name
           when 'Hangup'
-            handle_hangup_event ami_event['Cause'].to_i
+            handle_hangup_event ami_event['Cause'].to_i, ami_event.best_time
           when 'AsyncAGI'
             if component = component_with_id(ami_event['CommandID'])
               component.handle_ami_event ami_event
@@ -121,16 +122,16 @@ module Punchblock
 
             if @answered == false && ami_event['SubEvent'] == 'Start'
               @answered = true
-              send_pb_event Event::Answered.new
+              send_pb_event Event::Answered.new(timestamp: ami_event.best_time)
             end
           when 'Newstate'
             case ami_event['ChannelState']
             when '5'
-              send_pb_event Event::Ringing.new
+              send_pb_event Event::Ringing.new(timestamp: ami_event.best_time)
             end
           when 'OriginateResponse'
             if ami_event['Response'] == 'Failure' && ami_event['Uniqueid'] == '<null>'
-              send_end_event :error
+              send_end_event :error, nil, ami_event.best_time
             end
           when 'BridgeExec'
             join_command   = @pending_joins.delete ami_event['Channel1']
@@ -141,16 +142,16 @@ module Punchblock
             if other_call = translator.call_for_channel(other_call_channel)
               event = case ami_event['Bridgestate']
               when 'Link'
-                Event::Joined.new call_uri: other_call.id
+                Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time
               when 'Unlink'
-                Event::Unjoined.new call_uri: other_call.id
+                Event::Unjoined.new call_uri: other_call.id, timestamp: ami_event.best_time
               end
               send_pb_event event
             end
           when 'Unlink'
             other_call_channel = ([ami_event['Channel1'], ami_event['Channel2']] - [channel]).first
             if other_call = translator.call_for_channel(other_call_channel)
-              send_pb_event Event::Unjoined.new(call_uri: other_call.id)
+              send_pb_event Event::Unjoined.new(call_uri: other_call.id, timestamp: ami_event.best_time)
             end
           when 'VarSet'
             @channel_variables[ami_event['Variable']] = ami_event['Value']
@@ -278,13 +279,14 @@ module Punchblock
           send_ami_action 'Redirect', redirect_options
         end
 
-        def handle_hangup_event(code = 16)
+        def handle_hangup_event(code = nil, timestamp = nil)
+          code ||= 16
           reason = @hangup_cause || HANGUP_CAUSE_TO_END_REASON[code]
           @block_commands = true
           @components.each_pair do |id, component|
             component.call_ended
           end
-          send_end_event reason, code
+          send_end_event reason, code, timestamp
         end
 
         def after(*args, &block)
@@ -306,8 +308,9 @@ module Punchblock
           AMIErrorConverter.convert { @ami_client.send_action name, headers }
         end
 
-        def send_end_event(reason, code = nil)
-          send_pb_event Event::End.new(reason: reason, platform_code: code)
+        def send_end_event(reason, code = nil, timestamp = nil)
+          end_event = Event::End.new(reason: reason, platform_code: code, timestamp: timestamp)
+          send_pb_event end_event
           translator.deregister_call id, channel
         end
 

data/lib/punchblock/translator/asterisk/component/asterisk/agi_command.rb

@@ -23,7 +23,7 @@ module Punchblock
               if event.name == 'AsyncAGI' && event['SubEvent'] == 'Exec'
                 send_complete_event success_reason(event)
                 if @component_node.name == 'ASYNCAGI BREAK' && @call.channel_var('PUNCHBLOCK_END_ON_ASYNCAGI_BREAK')
-                  @call.handle_hangup_event
+                  @call.handle_hangup_event nil, event.best_time
                 end
               end
             end

data/lib/punchblock/version.rb

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

data/punchblock.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   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.14"]
-  s.add_runtime_dependency %q<ruby_ami>, ["~> 2.0"]
+  s.add_runtime_dependency %q<ruby_ami>, ["~> 2.2"]
   s.add_runtime_dependency %q<ruby_fs>, ["~> 1.1"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 2.3"]
   s.add_runtime_dependency %q<virtus>, ["~> 1.0"]

data/spec/punchblock/client_spec.rb

@@ -40,6 +40,13 @@ module Punchblock
       end
     end
 
+    describe '#new_call_uri' do
+      it 'should return the connection-specific fresh call ID' do
+        stub_uuids 'foobar'
+        subject.new_call_uri.should == 'xmpp:foobar@call.rayo.net'
+      end
+    end
+
     it 'should handle connection events' do
       subject.should_receive(:handle_event).with(mock_event).once
       connection.event_handler.call mock_event

data/spec/punchblock/command/dial_spec.rb

@@ -13,10 +13,11 @@ module Punchblock
       let(:join_params) { {:call_uri => 'abc123'} }
 
       describe "when setting options in initializer" do
-        subject { described_class.new to: 'tel:+14155551212', from: 'tel:+13035551212', timeout: 30000, headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' }, join: join_params }
+        subject { described_class.new to: 'tel:+14155551212', from: 'tel:+13035551212', uri: 'xmpp:foo@bar.com', timeout: 30000, headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' }, join: join_params }
 
         its(:to)      { should be == 'tel:+14155551212' }
         its(:from)    { should be == 'tel:+13035551212' }
+        its(:uri)     { should be == 'xmpp:foo@bar.com' }
         its(:timeout) { should be == 30000 }
         its(:join)    { should be == Join.new(join_params) }
         its(:headers) { should be == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
@@ -27,6 +28,7 @@ module Punchblock
             new_instance.should be_instance_of described_class
             new_instance.to.should == 'tel:+14155551212'
             new_instance.from.should == 'tel:+13035551212'
+            new_instance.uri.should == 'xmpp:foo@bar.com'
             new_instance.timeout.should == 30000
             new_instance.join.should == Join.new(join_params)
             new_instance.headers.should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
@@ -54,7 +56,7 @@ module Punchblock
       describe "from a stanza" do
         let :stanza do
           <<-MESSAGE
-<dial to='tel:+14155551212' from='tel:+13035551212' timeout='30000' xmlns='urn:xmpp:rayo:1'>
+<dial to='tel:+14155551212' from='tel:+13035551212' uri='xmpp:foo@bar.com' timeout='30000' xmlns='urn:xmpp:rayo:1'>
   <join call-uri="abc123" />
   <header name="X-skill" value="agent" />
   <header name="X-customer-id" value="8877" />
@@ -68,6 +70,7 @@ module Punchblock
 
         its(:to)      { should be == 'tel:+14155551212' }
         its(:from)    { should be == 'tel:+13035551212' }
+        its(:uri)     { should be == 'xmpp:foo@bar.com' }
         its(:timeout) { should be == 30000 }
         its(:join)    { should be == Join.new(join_params) }
         its(:headers) { should be == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }

data/spec/punchblock/connection/asterisk_spec.rb

@@ -90,6 +90,13 @@ module Punchblock
           subject.handle_event offer
         end
       end
+
+      describe '#new_call_uri' do
+        it "should return a random UUID" do
+          stub_uuids 'foobar'
+          subject.new_call_uri.should == 'foobar'
+        end
+      end
     end
   end
 end

data/spec/punchblock/connection/xmpp_spec.rb

@@ -17,22 +17,42 @@ module Punchblock
       subject { connection }
 
       describe "rayo domains" do
+        before { stub_uuids 'randomcallid' }
+
         context "with no domains specified, and a JID of 1@app.rayo.net" do
           let(:options) { { :username => '1@app.rayo.net' } }
 
           its(:root_domain)   { should be == 'app.rayo.net' }
+
+          describe '#new_call_uri' do
+            it "should return an appropriate random call URI" do
+              subject.new_call_uri.should == 'xmpp:randomcallid@app.rayo.net'
+            end
+          end
         end
 
         context "with only a rayo domain set" do
           let(:options) { { :rayo_domain => 'rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
+
+          describe '#new_call_uri' do
+            it "should return an appropriate random call URI" do
+              subject.new_call_uri.should == 'xmpp:randomcallid@rayo.org'
+            end
+          end
         end
 
         context "with only a root domain set" do
           let(:options) { { :root_domain => 'rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
+
+          describe '#new_call_uri' do
+            it "should return an appropriate random call URI" do
+              subject.new_call_uri.should == 'xmpp:randomcallid@rayo.org'
+            end
+          end
         end
       end
 
@@ -217,6 +237,11 @@ module Punchblock
               MSG
             end
 
+            before do
+              @now = DateTime.now
+              DateTime.stub now: @now
+            end
+
             let(:example_event) { import_stanza offer_xml }
 
             it { example_event.should be_a Blather::Stanza::Presence }
@@ -228,9 +253,28 @@ module Punchblock
                 event.source_uri.should be == 'xmpp:9f00061@call.rayo.net'
                 event.domain.should be == 'call.rayo.net'
                 event.transport.should be == 'xmpp'
+                event.timestamp.should be == @now
               end
               handle_presence
             end
+
+            context "with a delayed delivery timestamp" do
+              let :offer_xml do
+                <<-MSG
+      <presence to='16577@app.rayo.net/1' from='9f00061@call.rayo.net'>
+        <offer xmlns="urn:xmpp:rayo:1" to="sip:whatever@127.0.0.1" from="sip:ylcaomxb@192.168.1.9"/>
+        <delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25Z'/>
+      </presence>
+                MSG
+              end
+
+              it 'should stamp that time on the rayo event' do
+                mock_event_handler.should_receive(:call).once.with do |event|
+                  event.timestamp.should be == DateTime.new(2002, 9, 10, 23, 8, 25, 0)
+                end
+                handle_presence
+              end
+            end
           end
 
           describe "from something that's not a real event" do

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

@@ -327,6 +327,27 @@ module Punchblock
               comp_command.response(0.1).should == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{call_id}", call_id)
             end
 
+            context "when the AMI event has a timestamp" do
+              let :ami_event do
+                RubyAMI::Event.new 'Hangup',
+                  'Uniqueid'      => "1320842458.8",
+                  'Cause'         => cause,
+                  'Cause-txt'     => cause_txt,
+                  'Channel'       => "SIP/1234-00000000",
+                  'Timestamp'     => '1393368380.572575'
+              end
+
+              it "should use the AMI timestamp for the Rayo event" do
+                expected_end_event = Punchblock::Event::End.new reason: :hangup,
+                                                                platform_code: cause,
+                                                                target_call_id: subject.id,
+                                                                timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+                translator.should_receive(:handle_pb_event).with expected_end_event
+
+                subject.process_ami_event ami_event
+              end
+            end
+
             context "after processing a hangup command" do
               let(:command) { Command::Hangup.new }
 
@@ -534,6 +555,24 @@ module Punchblock
                 subject.process_ami_event ami_event
               end
             end
+
+            context "when the AMI event has a timestamp" do
+              let :ami_event do
+                RubyAMI::Event.new "AsyncAGI",
+                  "SubEvent"  => "Start",
+                  "Channel"   => "SIP/1234-00000000",
+                  "Env"       => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2Fuserb-00000006%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201390303636.6%0Aagi_version%3A%2011.7.0%0Aagi_callerid%3A%20userb%0Aagi_calleridname%3A%20User%20B%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%20unknown%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20adhearsion-redirect%0Aagi_extension%3A%201%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%20139696536876800%0A%0A",
+                  'Timestamp' => '1393368380.572575'
+              end
+
+              it "should use the AMI timestamp for the Rayo event" do
+                expected_answered = Punchblock::Event::Answered.new target_call_id: subject.id,
+                                                                    timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+                translator.should_receive(:handle_pb_event).with expected_answered
+
+                subject.process_ami_event ami_event
+              end
+            end
           end
 
           context 'with a Newstate event' do
@@ -565,6 +604,25 @@ module Punchblock
                 subject.process_ami_event ami_event
                 subject.answered?.should be_false
               end
+
+              context "when the AMI event has a timestamp" do
+                let :ami_event do
+                  RubyAMI::Event.new 'Newstate',
+                    'Channel'           => 'SIP/1234-00000000',
+                    'ChannelState'      => channel_state,
+                    'ChannelStateDesc'  => channel_state_desc,
+                    'Uniqueid'          => '1326194671.0',
+                    'Timestamp'         => '1393368380.572575'
+                end
+
+                it "should use the AMI timestamp for the Rayo event" do
+                  expected_ringing = Punchblock::Event::Ringing.new target_call_id: subject.id,
+                                                                    timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+                  translator.should_receive(:handle_pb_event).with expected_ringing
+
+                  subject.process_ami_event ami_event
+                end
+              end
             end
           end
 
@@ -613,6 +671,32 @@ module Punchblock
                 translator.should_receive(:handle_pb_event).with expected_end_event
                 subject.process_ami_event ami_event
               end
+
+              context "when the AMI event has a timestamp" do
+                let :ami_event do
+                  RubyAMI::Event.new 'OriginateResponse',
+                    'Privilege'     => 'call,all',
+                    'ActionID'      => '9d0c1aa4-5e3b-4cae-8aef-76a6119e2909',
+                    'Response'      => response,
+                    'Channel'       => 'SIP/15557654321',
+                    'Context'       => '',
+                    'Exten'         => '',
+                    'Reason'        => '0',
+                    'Uniqueid'      => uniqueid,
+                    'CallerIDNum'   => 'sip:5551234567',
+                    'CallerIDName'  => 'Bryan 100',
+                    'Timestamp'     => '1393368380.572575'
+                end
+
+                it "should use the AMI timestamp for the Rayo event" do
+                  expected_end_event = Punchblock::Event::End.new reason: :error,
+                                                                  target_call_id: subject.id,
+                                                                  timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+                  translator.should_receive(:handle_pb_event).with expected_end_event
+
+                  subject.process_ami_event ami_event
+                end
+              end
             end
           end
 
@@ -749,6 +833,54 @@ module Punchblock
                 translator.should_receive(:handle_pb_event).with expected_joined
                 subject.process_ami_event switched_ami_event
               end
+
+              context "when the AMI event has a timestamp" do
+                let :ami_event do
+                  RubyAMI::Event.new 'Bridge',
+                    'Privilege'   => "call,all",
+                    'Bridgestate' => state,
+                    'Bridgetype'  => "core",
+                    'Channel1'    => channel,
+                    'Channel2'    => other_channel,
+                    'Uniqueid1'   => "1319717537.11",
+                    'Uniqueid2'   => "1319717537.10",
+                    'CallerID1'   => "1234",
+                    'CallerID2'   => "5678",
+                    'Timestamp'   => '1393368380.572575'
+                end
+
+                let :switched_ami_event do
+                  RubyAMI::Event.new 'Bridge',
+                    'Privilege'   => "call,all",
+                    'Bridgestate' => state,
+                    'Bridgetype'  => "core",
+                    'Channel1'    => other_channel,
+                    'Channel2'    => channel,
+                    'Uniqueid1'   => "1319717537.11",
+                    'Uniqueid2'   => "1319717537.10",
+                    'CallerID1'   => "1234",
+                    'CallerID2'   => "5678",
+                    'Timestamp'   => '1393368380.572575'
+                end
+
+                before { expected_joined.timestamp = DateTime.new(2014, 2, 25, 22, 46, 20) }
+
+                context "when the call is the first channel" do
+                  it "should use the AMI timestamp for the Rayo event" do
+                    translator.should_receive(:handle_pb_event).with expected_joined
+
+                    subject.process_ami_event ami_event
+                  end
+                end
+
+                context "when the call is the second channel" do
+                  it "should use the AMI timestamp for the Rayo event" do
+                    translator.should_receive(:handle_pb_event).with expected_joined
+
+                    subject.process_ami_event switched_ami_event
+                  end
+                end
+              end
             end
 
             context "of state 'Unlink'" do
@@ -768,6 +900,54 @@ module Punchblock
                 translator.should_receive(:handle_pb_event).with expected_unjoined
                 subject.process_ami_event switched_ami_event
               end
+
+              context "when the AMI event has a timestamp" do
+                let :ami_event do
+                  RubyAMI::Event.new 'Bridge',
+                    'Privilege'   => "call,all",
+                    'Bridgestate' => state,
+                    'Bridgetype'  => "core",
+                    'Channel1'    => channel,
+                    'Channel2'    => other_channel,
+                    'Uniqueid1'   => "1319717537.11",
+                    'Uniqueid2'   => "1319717537.10",
+                    'CallerID1'   => "1234",
+                    'CallerID2'   => "5678",
+                    'Timestamp'   => '1393368380.572575'
+                end
+
+                let :switched_ami_event do
+                  RubyAMI::Event.new 'Bridge',
+                    'Privilege'   => "call,all",
+                    'Bridgestate' => state,
+                    'Bridgetype'  => "core",
+                    'Channel1'    => other_channel,
+                    'Channel2'    => channel,
+                    'Uniqueid1'   => "1319717537.11",
+                    'Uniqueid2'   => "1319717537.10",
+                    'CallerID1'   => "1234",
+                    'CallerID2'   => "5678",
+                    'Timestamp'   => '1393368380.572575'
+                end
+
+                before { expected_unjoined.timestamp = DateTime.new(2014, 2, 25, 22, 46, 20) }
+
+                context "when the call is the first channel" do
+                  it "should use the AMI timestamp for the Rayo event" do
+                    translator.should_receive(:handle_pb_event).with expected_unjoined
+
+                    subject.process_ami_event ami_event
+                  end
+                end
+
+                context "when the call is the second channel" do
+                  it "should use the AMI timestamp for the Rayo event" do
+                    translator.should_receive(:handle_pb_event).with expected_unjoined
+
+                    subject.process_ami_event switched_ami_event
+                  end
+                end
+              end
             end
           end
 
@@ -820,6 +1000,50 @@ module Punchblock
               translator.should_receive(:handle_pb_event).with expected_unjoined
               subject.process_ami_event switched_ami_event
             end
+
+            context "when the AMI event has a timestamp" do
+              let :ami_event do
+                RubyAMI::Event.new 'Unlink',
+                  'Privilege' => "call,all",
+                  'Channel1'  => channel,
+                  'Channel2'  => other_channel,
+                  'Uniqueid1' => "1319717537.11",
+                  'Uniqueid2' => "1319717537.10",
+                  'CallerID1' => "1234",
+                  'CallerID2' => "5678",
+                  'Timestamp'   => '1393368380.572575'
+              end
+
+              let :switched_ami_event do
+                RubyAMI::Event.new 'Unlink',
+                  'Privilege' => "call,all",
+                  'Channel1'  => other_channel,
+                  'Channel2'  => channel,
+                  'Uniqueid1' => "1319717537.11",
+                  'Uniqueid2' => "1319717537.10",
+                  'CallerID1' => "1234",
+                  'CallerID2' => "5678",
+                  'Timestamp'   => '1393368380.572575'
+              end
+
+              before { expected_unjoined.timestamp = DateTime.new(2014, 2, 25, 22, 46, 20) }
+
+              context "when the call is the first channel" do
+                it "should use the AMI timestamp for the Rayo event" do
+                  translator.should_receive(:handle_pb_event).with expected_unjoined
+
+                  subject.process_ami_event ami_event
+                end
+              end
+
+              context "when the call is the second channel" do
+                it "should use the AMI timestamp for the Rayo event" do
+                  translator.should_receive(:handle_pb_event).with expected_unjoined
+
+                  subject.process_ami_event switched_ami_event
+                end
+              end
+            end
           end
 
           context 'with a VarSet event' do

data/spec/punchblock/translator/asterisk/component/asterisk/agi_command_spec.rb

@@ -168,6 +168,29 @@ module Punchblock
                       translator.should_receive(:handle_pb_event).once.with expected_end_event
                       subject.handle_ami_event ami_event
                     end
+
+                    context "when the AMI event has a timestamp" do
+                      let :ami_event do
+                        RubyAMI::Event.new 'AsyncAGI',
+                          "SubEvent"   => "Exec",
+                          "Channel"    => channel,
+                          "CommandId"  => component_id,
+                          "Command"    => "EXEC ANSWER",
+                          "Result"     => "200%20result=123%20(timeout)%0A",
+                          'Timestamp'  => '1393368380.572575'
+                      end
+
+                      it "should use the AMI timestamp for the Rayo event" do
+                        expected_end_event = Punchblock::Event::End.new reason: :hangup,
+                                                                        platform_code: 16,
+                                                                        target_call_id: mock_call.id,
+                                                                        timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+                        translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                        translator.should_receive(:handle_pb_event).once.with expected_end_event
+
+                        subject.handle_ami_event ami_event
+                      end
+                    end
                   end
                 end
               end

data/spec/punchblock/translator/asterisk_spec.rb

@@ -7,7 +7,7 @@ module Punchblock
   module Translator
     describe Asterisk do
       let(:ami_client)    { double 'RubyAMI::Client' }
-      let(:connection)    { double 'Connection::Asterisk', handle_event: nil }
+      let(:connection)    { Connection::Asterisk.new }
 
       let(:translator) { Asterisk.new ami_client, connection }
 
@@ -16,6 +16,10 @@ module Punchblock
       its(:ami_client) { should be ami_client }
       its(:connection) { should be connection }
 
+      before do
+        connection.event_handler = ->(*) {}
+      end
+
       after { translator.terminate if translator.alive? }
 
       describe '#execute_command' do
@@ -210,6 +214,39 @@ module Punchblock
             mock_call.should_receive(:dial).once.with command
             subject.execute_global_command command
           end
+
+          context 'when requesting a specific URI' do
+            let(:requested_uri) { connection.new_call_uri }
+
+            before do
+              command.uri = requested_uri
+            end
+
+            it "should assign the requested URI to the call" do
+              subject.execute_global_command command
+              subject.call_with_id(requested_uri).id.should == requested_uri
+            end
+
+            context 'and the requested URI already represents a known call' do
+              before do
+                earlier_command = Command::Dial.new to: 'SIP/1234', uri: requested_uri
+                earlier_command.request!
+
+                subject.execute_global_command earlier_command
+
+                @first_call = subject.call_with_id(requested_uri)
+              end
+
+              it "should set the command response to a conflict error" do
+                subject.execute_global_command command
+                command.response(0.1).should == ProtocolError.new.setup(:conflict, 'Call ID already in use')
+              end
+
+              it "should not replace the original call in the registry" do
+                subject.call_with_id(requested_uri).should be @first_call
+              end
+            end
+          end
         end
 
         context 'with an AMI action' do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'countdownlatch'
 require 'logger'
 require 'celluloid'
 require 'coveralls'
+require 'ruby_ami'
 Coveralls.wear!
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
@@ -27,6 +28,9 @@ RSpec.configure do |config|
   config.before do
     @uuid = SecureRandom.uuid
     Punchblock.stub new_request_id: @uuid
+
+    @current_datetime = DateTime.now
+    DateTime.stub now: @current_datetime
   end
 
   config.after :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: ruby_fs
   requirement: !ruby/object:Gem::Requirement