punchblock 0.11.0 → 0.12.0

data/spec/punchblock/event/complete_spec.rb

@@ -12,17 +12,17 @@ module Punchblock
       describe "comparing for equality" do
         subject do
           Complete.new.tap do |c|
-            c.reason        = Complete::Stop.new
-            c.call_id       = '1234'
-            c.component_id  = 'abcd'
+            c.reason          = Complete::Stop.new
+            c.target_call_id  = '1234'
+            c.component_id    = 'abcd'
           end
         end
 
         let :other_complete do
           Complete.new.tap do |c|
-            c.reason        = reason
-            c.call_id       = call_id
-            c.component_id  = component_id
+            c.reason          = reason
+            c.target_call_id  = call_id
+            c.component_id    = component_id
           end
         end
 

data/spec/punchblock/event/joined_spec.rb

@@ -18,16 +18,16 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:other_call_id) { should be == 'b' }
-        its(:mixer_name)    { should be == 'm' }
-        its(:xmlns)         { should be == 'urn:xmpp:rayo:1' }
+        its(:call_id)     { should be == 'b' }
+        its(:mixer_name)  { should be == 'm' }
+        its(:xmlns)       { should be == 'urn:xmpp:rayo:1' }
       end
 
       describe "when setting options in initializer" do
-        subject { Joined.new :other_call_id => 'abc123', :mixer_name => 'blah' }
+        subject { Joined.new :call_id => 'abc123', :mixer_name => 'blah' }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
       end
     end
   end

data/spec/punchblock/event/started_speaking_spec.rb

@@ -20,16 +20,16 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:other_call_id) { should be == "x0yz4ye-lx7-6ai9njwvw8nsb" }
-        its(:xmlns)         { should be == 'urn:xmpp:rayo:1' }
+        its(:call_id) { should be == "x0yz4ye-lx7-6ai9njwvw8nsb" }
+        its(:xmlns)   { should be == 'urn:xmpp:rayo:1' }
       end
 
       describe "when setting options in initializer" do
         subject do
-          StartedSpeaking.new :other_call_id => 'abc123'
+          StartedSpeaking.new :call_id => 'abc123'
         end
 
-        its(:other_call_id) { should be == 'abc123' }
+        its(:call_id) { should be == 'abc123' }
       end
     end
   end

data/spec/punchblock/event/stopped_speaking_spec.rb

@@ -20,16 +20,16 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:other_call_id) { should be == "x0yz4ye-lx7-6ai9njwvw8nsb" }
-        its(:xmlns)         { should be == 'urn:xmpp:rayo:1' }
+        its(:call_id) { should be == "x0yz4ye-lx7-6ai9njwvw8nsb" }
+        its(:xmlns)   { should be == 'urn:xmpp:rayo:1' }
       end
 
       describe "when setting options in initializer" do
         subject do
-          StoppedSpeaking.new :other_call_id => 'abc123'
+          StoppedSpeaking.new :call_id => 'abc123'
         end
 
-        its(:other_call_id) { should be == 'abc123' }
+        its(:call_id) { should be == 'abc123' }
       end
     end
   end

data/spec/punchblock/event/unjoined_spec.rb

@@ -18,16 +18,16 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:other_call_id) { should be == 'b' }
-        its(:mixer_name)    { should be == 'm' }
-        its(:xmlns)         { should be == 'urn:xmpp:rayo:1' }
+        its(:call_id)     { should be == 'b' }
+        its(:mixer_name)  { should be == 'm' }
+        its(:xmlns)       { should be == 'urn:xmpp:rayo:1' }
       end
 
       describe "when setting options in initializer" do
-        subject { Unjoined.new :other_call_id => 'abc123', :mixer_name => 'blah' }
+        subject { Unjoined.new :call_id => 'abc123', :mixer_name => 'blah' }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
       end
     end
   end

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

@@ -84,7 +84,7 @@ module Punchblock
 
         describe '#send_offer' do
           it 'sends an offer to the translator' do
-            expected_offer = Punchblock::Event::Offer.new :call_id  => subject.id,
+            expected_offer = Punchblock::Event::Offer.new :target_call_id  => subject.id,
                                                           :to       => '1000',
                                                           :from     => 'sip:5678',
                                                           :headers  => sip_headers
@@ -101,7 +101,7 @@ module Punchblock
         end
 
         describe '#answer_if_not_answered' do
-          let(:answer_command) { Command::Answer.new }
+          let(:answer_command) { Command::Answer.new.tap { |a| a.request! } }
 
           context "with a call that is already answered" do
             it 'should not answer the call' do
@@ -153,7 +153,7 @@ module Punchblock
           before { dial_command.request! }
 
           it 'sends an Originate AMI action' do
-            expected_action = Punchblock::Component::Asterisk::AMI::Action.new :name => 'Originate',
+            expected_action = Punchblock::Component::Asterisk::AMI::Action.new(:name => 'Originate',
                                                                                :params => {
                                                                                  :async       => true,
                                                                                  :application => 'AGI',
@@ -161,7 +161,7 @@ module Punchblock
                                                                                  :channel     => 'SIP/1234',
                                                                                  :callerid    => 'sip:foo@bar.com',
                                                                                  :variable    => "punchblock_call_id=#{subject.id}"
-                                                                               }
+                                                                               }).tap { |a| a.request! }
 
             translator.expects(:execute_global_command!).once.with expected_action
             subject.dial dial_command
@@ -173,7 +173,7 @@ module Punchblock
             end
 
             it 'includes the timeout in the Originate AMI action' do
-              expected_action = Punchblock::Component::Asterisk::AMI::Action.new :name => 'Originate',
+              expected_action = Punchblock::Component::Asterisk::AMI::Action.new(:name => 'Originate',
                                                                                  :params => {
                                                                                    :async       => true,
                                                                                    :application => 'AGI',
@@ -182,7 +182,7 @@ module Punchblock
                                                                                    :callerid    => 'sip:foo@bar.com',
                                                                                    :variable    => "punchblock_call_id=#{subject.id}",
                                                                                    :timeout     => 10000
-                                                                                 }
+                                                                                 }).tap { |a| a.request! }
 
               translator.expects(:execute_global_command!).once.with expected_action
               subject.dial dial_command
@@ -192,7 +192,7 @@ module Punchblock
           it 'sends the call ID as a response to the Dial' do
             subject.dial dial_command
             dial_command.response
-            dial_command.call_id.should be == subject.id
+            dial_command.target_call_id.should be == subject.id
           end
 
           it 'should make the call identify as outbound' do
@@ -241,7 +241,7 @@ module Punchblock
 
               it 'should send an end (hangup) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :hangup,
-                                                                :call_id  => subject.id
+                                                                :target_call_id  => subject.id
                 translator.expects(:handle_pb_event!).with expected_end_event
                 subject.process_ami_event ami_event
               end
@@ -253,7 +253,7 @@ module Punchblock
 
               it 'should send an end (hangup) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :hangup,
-                                                                :call_id  => subject.id
+                                                                :target_call_id  => subject.id
                 translator.expects(:handle_pb_event!).with expected_end_event
                 subject.process_ami_event ami_event
               end
@@ -265,7 +265,7 @@ module Punchblock
 
               it 'should send an end (busy) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :busy,
-                                                                :call_id  => subject.id
+                                                                :target_call_id  => subject.id
                 translator.expects(:handle_pb_event!).with expected_end_event
                 subject.process_ami_event ami_event
               end
@@ -281,7 +281,7 @@ module Punchblock
 
                 it 'should send an end (timeout) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :timeout,
-                                                                  :call_id  => subject.id
+                                                                  :target_call_id  => subject.id
                   translator.expects(:handle_pb_event!).with expected_end_event
                   subject.process_ami_event ami_event
                 end
@@ -299,7 +299,7 @@ module Punchblock
 
                 it 'should send an end (reject) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :reject,
-                                                                  :call_id  => subject.id
+                                                                  :target_call_id  => subject.id
                   translator.expects(:handle_pb_event!).with expected_end_event
                   subject.process_ami_event ami_event
                 end
@@ -351,7 +351,7 @@ module Punchblock
 
                 it 'should send an end (error) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :error,
-                                                                  :call_id  => subject.id
+                                                                  :target_call_id  => subject.id
                   translator.expects(:handle_pb_event!).with expected_end_event
                   subject.process_ami_event ami_event
                 end
@@ -406,7 +406,7 @@ module Punchblock
 
               it 'should send a ringing event' do
                 expected_ringing = Punchblock::Event::Ringing.new
-                expected_ringing.call_id = subject.id
+                expected_ringing.target_call_id = subject.id
                 translator.expects(:handle_pb_event!).with expected_ringing
                 subject.process_ami_event ami_event
               end
@@ -423,7 +423,7 @@ module Punchblock
 
               it 'should send a ringing event' do
                 expected_answered = Punchblock::Event::Answered.new
-                expected_answered.call_id = subject.id
+                expected_answered.target_call_id = subject.id
                 translator.expects(:handle_pb_event!).with expected_answered
                 subject.process_ami_event ami_event
               end
@@ -470,7 +470,7 @@ module Punchblock
             let(:other_channel) { 'SIP/5678-00000000' }
             let(:other_call_id) { 'def567' }
             let :command do
-              Punchblock::Command::Join.new :other_call_id => other_call_id
+              Punchblock::Command::Join.new :call_id => other_call_id
             end
 
             before do
@@ -530,8 +530,8 @@ module Punchblock
 
               let :expected_joined do
                 Punchblock::Event::Joined.new.tap do |joined|
-                  joined.call_id = subject.id
-                  joined.other_call_id = other_call_id
+                  joined.target_call_id = subject.id
+                  joined.call_id = other_call_id
                 end
               end
 
@@ -551,8 +551,8 @@ module Punchblock
 
               let :expected_unjoined do
                 Punchblock::Event::Unjoined.new.tap do |joined|
-                  joined.call_id = subject.id
-                  joined.other_call_id = other_call_id
+                  joined.target_call_id = subject.id
+                  joined.call_id = other_call_id
                 end
               end
 
@@ -607,8 +607,8 @@ module Punchblock
 
             let :expected_unjoined do
               Punchblock::Event::Unjoined.new.tap do |joined|
-                joined.call_id = subject.id
-                joined.other_call_id = other_call_id
+                joined.target_call_id = subject.id
+                joined.call_id = other_call_id
               end
             end
 
@@ -762,16 +762,16 @@ module Punchblock
           end
 
           context "with a join command" do
-            let(:other_call_id)         { "abc123" }
-            let(:other_channel)         { 'SIP/bar' }
-            let(:other_translator)      { stub_everything 'Translator::Asterisk' }
+            let(:other_call_id)     { "abc123" }
+            let(:other_channel)     { 'SIP/bar' }
+            let(:other_translator)  { stub_everything 'Translator::Asterisk' }
 
             let :other_call do
               Call.new other_channel, other_translator
             end
 
             let :command do
-              Punchblock::Command::Join.new :other_call_id => other_call_id
+              Punchblock::Command::Join.new :call_id => other_call_id
             end
 
             it "executes the proper dialplan Bridge application" do
@@ -790,15 +790,15 @@ module Punchblock
           end
 
           context "with an unjoin command" do
-            let(:other_call_id)         { "abc123" }
-            let(:other_channel)         { 'SIP/bar' }
+            let(:other_call_id) { "abc123" }
+            let(:other_channel) { 'SIP/bar' }
 
             let :other_call do
               Call.new other_channel, translator
             end
 
             let :command do
-              Punchblock::Command::Unjoin.new :other_call_id => other_call_id
+              Punchblock::Command::Unjoin.new :call_id => other_call_id
             end
 
             it "executes the unjoin through redirection" do
@@ -864,7 +864,7 @@ module Punchblock
               ami_action.headers['Priority'].should be == Punchblock::Translator::Asterisk::REDIRECT_PRIORITY
               ami_action.headers['Context'].should be == Punchblock::Translator::Asterisk::REDIRECT_CONTEXT
             end
-            
+
             it "executes the proper AMI action with another call specified" do
               subject.redirect_back other_call
               ami_action = subject.wrapped_object.instance_variable_get(:'@current_ami_action')

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

@@ -96,7 +96,7 @@ module Punchblock
                       :utterance => '12',
                       :interpretation => 'dtmf-1 dtmf-2',
                       :component_id => subject.id,
-                      :call_id => call.id
+                      :target_call_id => call.id
                   end
 
                   it "should send a success complete event with the relevant data" do
@@ -112,7 +112,7 @@ module Punchblock
 
                   let :expected_event do
                     Punchblock::Component::Input::Complete::NoMatch.new :component_id => subject.id,
-                                                                        :call_id => call.id
+                                                                        :target_call_id => call.id
                   end
 
                   it "should send a nomatch complete event" do

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

@@ -29,7 +29,7 @@ module Punchblock
 
             let :expected_event do
               Punchblock::Event::Complete.new.tap do |e|
-                e.call_id = call.id
+                e.target_call_id = call.id
                 e.component_id = subject.id
               end
             end

data/spec/punchblock/translator/asterisk_spec.rb

@@ -50,7 +50,7 @@ module Punchblock
           it 'executes the call command' do
             subject.wrapped_object.expects(:execute_call_command).with do |c|
               c.should be command
-              c.call_id.should be == call_id
+              c.target_call_id.should be == call_id
             end
             subject.execute_command command, :call_id => call_id
           end
@@ -111,7 +111,7 @@ module Punchblock
       describe '#execute_call_command' do
         let(:call_id) { 'abc123' }
         let(:call)    { Translator::Asterisk::Call.new 'SIP/foo', subject }
-        let(:command) { Command::Answer.new.tap { |c| c.call_id = call_id } }
+        let(:command) { Command::Answer.new.tap { |c| c.target_call_id = call_id } }
 
         before do
           command.request!

data/spec/spec_helper.rb

@@ -33,8 +33,8 @@ end
 
 # FIXME: change this to rayo_event?  It can be ambigous
 shared_examples_for 'event' do
-  its(:call_id) { should be == '9f00061' }
-  its(:component_id) { should be == '1' }
+  its(:target_call_id)  { should be == '9f00061' }
+  its(:component_id)    { should be == '1' }
 end
 
 shared_examples_for 'command_headers' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2151904540 !ruby/object:Gem::Requirement
+  requirement: &2151918560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2151904540
+  version_requirements: *2151918560
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &2151919620 !ruby/object:Gem::Requirement
+  requirement: &2151917300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.12
   type: :runtime
   prerelease: false
-  version_requirements: *2151919620
+  version_requirements: *2151917300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151917060 !ruby/object:Gem::Requirement
+  requirement: &2151916200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151917060
+  version_requirements: *2151916200
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2151913560 !ruby/object:Gem::Requirement
+  requirement: &2151915240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151913560
+  version_requirements: *2151915240
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2151923540 !ruby/object:Gem::Requirement
+  requirement: &2151926340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151923540
+  version_requirements: *2151926340
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2151933680 !ruby/object:Gem::Requirement
+  requirement: &2151923420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151933680
+  version_requirements: *2151923420
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2151938780 !ruby/object:Gem::Requirement
+  requirement: &2151921440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151938780
+  version_requirements: *2151921440
 - !ruby/object:Gem::Dependency
   name: ruby_ami
-  requirement: &2152114920 !ruby/object:Gem::Requirement
+  requirement: &2151932640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152114920
+  version_requirements: *2151932640
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2152144720 !ruby/object:Gem::Requirement
+  requirement: &2155995300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152144720
+  version_requirements: *2155995300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152162740 !ruby/object:Gem::Requirement
+  requirement: &2155999080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152162740
+  version_requirements: *2155999080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152170960 !ruby/object:Gem::Requirement
+  requirement: &2156017820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152170960
+  version_requirements: *2156017820
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2152169100 !ruby/object:Gem::Requirement
+  requirement: &2156036260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2152169100
+  version_requirements: *2156036260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152166660 !ruby/object:Gem::Requirement
+  requirement: &2156029000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152166660
+  version_requirements: *2156029000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152021340 !ruby/object:Gem::Requirement
+  requirement: &2156042480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152021340
+  version_requirements: *2156042480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152018180 !ruby/object:Gem::Requirement
+  requirement: &2156036860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152018180
+  version_requirements: *2156036860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152015600 !ruby/object:Gem::Requirement
+  requirement: &2155891280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152015600
+  version_requirements: *2155891280
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2152176560 !ruby/object:Gem::Requirement
+  requirement: &2155887920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152176560
+  version_requirements: *2155887920
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152174900 !ruby/object:Gem::Requirement
+  requirement: &2156050140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,7 +210,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152174900
+  version_requirements: *2156050140
 description: Like Rack is to Rails and Sinatra, Punchblock provides a consistent API
   on top of several underlying third-party call control protocols.
 email: punchblock@adhearsion.com
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 115218676843076240
+      hash: -3649265375268061365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: