adhearsion 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d65bdfc20111980b8445acf33c5a6d18ba166a
-  data.tar.gz: c10a07432dec071a4cdcf8e508517c4e2717cf62
+  metadata.gz: bb14c1255a1538690eeda472f1eb7ca04b8fc9d6
+  data.tar.gz: 1d44d386568202e8250ab989f2d3fa76d9ada702
 SHA512:
-  metadata.gz: 2ecd96983d91e8e5da635158cb07537b18179958ea3e148c37086d4ab8e8b0099b3237407bae8aa33d644bef1ae0db7592ea083be58a7296bd7963716505131b
-  data.tar.gz: 3d2f040a64a072c7271690b5582e476b35e7449d7ce92be633e06bf0beb554853333e684efaec6db371a4a786eda5cb70f9f0abb6b47d42c869b81c2e86114dc
+  metadata.gz: cfb2b6fe75db610496304c8de2ccb4b81a004c8820d2998758a0a5b2f2742ea4a47f0082f847ad9da33f4f7247ab0396e7c550447f857326a976226210246e27
+  data.tar.gz: 2f3dc960267aead3512dcafcf44b5db6e239d35f58f74133f5d9592876941b2dbeef2af8f457a9b6b39291b22cc51672a99262862e8a5969bd92086ce3c20ff8

data/.travis.yml

@@ -3,6 +3,7 @@ script: bundle exec rake --trace
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
   - rbx-19mode
   - ruby-head

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.3.1](https://github.com/adhearsion/adhearsion/compare/v2.3.0...v2.3.1) - [2013-03-28](https://rubygems.org/gems/adhearsion/versions/2.3.1)
+  * Bugfix: Fix a leftover Celluloid deprecation warning
+
 # [2.3.0](https://github.com/adhearsion/adhearsion/compare/v2.2.1...v2.3.0) - [2013-03-25](https://rubygems.org/gems/adhearsion/versions/2.3.0)
   * Feature: Allow specifying a renderer per invocation of `#menu`, `#interruptible_play`, `#ask`, `#play` and `#play!`
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012 Adhearsion Foundation Inc
+Copyright (C) 2013 Adhearsion Foundation Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -2,7 +2,7 @@
 
 Adhearsion is an open-source voice application development framework. Adhearsion users write applications atop the framework with Ruby and **call into their code**.
 
-Adhearsion rests above a lower-level telephony platform, for example [Asterisk](http://asterisk.org) or [Voxeo PRISM](http://voxeolabs.com/prism/), and provides a framework for integrating with various resources, such as SQL, LDAP and XMPP (Jabber).
+Adhearsion rests above a lower-level telephony platform, for example [Asterisk](http://asterisk.org), [FreeSWTICH](http://freeswitch.org) or [Voxeo PRISM](http://voxeolabs.com/prism/), and provides a framework for integrating with various resources, such as SQL, LDAP and XMPP (Jabber).
 
 ## Features
 
@@ -66,4 +66,4 @@ There is a pre-commit hook that runs encoding checks available in pre-commit. To
 
 ### Copyright
 
-Copyright (c) 2012 Adhearsion Foundation Inc. MIT LICENSE (see LICENSE for details).
+Copyright (c) 2013 Adhearsion Foundation Inc. MIT LICENSE (see LICENSE for details).

data/adhearsion.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'aruba', "~> 0.4"
   s.add_development_dependency 'ci_reporter'
   s.add_development_dependency 'cucumber'
-  s.add_development_dependency 'flexmock'
   s.add_development_dependency 'guard-cucumber'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'rspec', ["~> 2.11"]

data/lib/adhearsion/punchblock_plugin/initializer.rb

@@ -150,7 +150,7 @@ module Adhearsion
 
         def dispatch_call_event(event)
           if call = Adhearsion.active_calls[event.target_call_id]
-            call.deliver_message! event
+            call.async.deliver_message event
           else
             logger.error "Event received for inactive call #{event.target_call_id}: #{event.inspect}"
           end

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -9,28 +9,29 @@ module Adhearsion
 
       let(:to) { 'sip:foo@bar.com' }
       let(:other_call_id)   { new_uuid }
-      let(:other_mock_call) { flexmock OutboundCall.new, :id => other_call_id, :write_command => true }
+      let(:other_mock_call) { OutboundCall.new }
 
       let(:second_to)               { 'sip:baz@bar.com' }
       let(:second_other_call_id)    { new_uuid }
-      let(:second_other_mock_call)  { flexmock OutboundCall.new, :id => second_other_call_id, :write_command => true }
+      let(:second_other_mock_call)  { OutboundCall.new }
 
       let(:mock_answered) { Punchblock::Event::Answered.new }
 
       let(:latch) { CountDownLatch.new 1 }
 
+      before do
+        other_mock_call.stub id: other_call_id, write_command: true
+        second_other_mock_call.stub id: second_other_call_id, write_command: true
+      end
+
       def mock_end(reason = :hangup)
-        flexmock Punchblock::Event::End.new, :reason => reason
+        Punchblock::Event::End.new.tap { |event| event.stub reason: reason }
       end
 
       describe "#dial" do
-        before do
-          other_mock_call
-        end
-
         it "should dial the call to the correct endpoint and return a dial status object" do
-          flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
-          flexmock(other_mock_call).should_receive(:dial).with(to, :from => 'foo').once
+          OutboundCall.should_receive(:new).and_return other_mock_call
+          other_mock_call.should_receive(:dial).with(to, :from => 'foo').once
           dial_thread = Thread.new do
             subject.dial(to, :from => 'foo').should be_a Dial::DialStatus
           end
@@ -40,9 +41,9 @@ module Adhearsion
         end
 
         it "should default the caller ID to that of the original call" do
-          flexmock call, :from => 'sip:foo@bar.com'
-          flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
-          flexmock(other_mock_call).should_receive(:dial).with(to, :from => 'sip:foo@bar.com').once
+          call.stub :from => 'sip:foo@bar.com'
+          OutboundCall.should_receive(:new).and_return other_mock_call
+          other_mock_call.should_receive(:dial).with(to, :from => 'sip:foo@bar.com').once
           dial_thread = Thread.new do
             subject.dial to
           end
@@ -63,9 +64,9 @@ module Adhearsion
 
         describe "without a block" do
           before do
-            flexmock(other_mock_call).should_receive(:dial).once.with(to, options)
-            flexmock(other_mock_call).should_receive(:hangup).once
-            flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
+            other_mock_call.should_receive(:dial).once.with(to, options)
+            other_mock_call.should_receive(:hangup).once
+            OutboundCall.should_receive(:new).and_return other_mock_call
           end
 
           it "blocks the original controller until the new call ends" do
@@ -89,8 +90,8 @@ module Adhearsion
           end
 
           it "joins the new call to the existing one on answer" do
-            flexmock(call).should_receive(:answer).once
-            flexmock(other_mock_call).should_receive(:join).once.with(call)
+            call.should_receive(:answer).once
+            other_mock_call.should_receive(:join).once.with(call)
 
             dial_in_thread
 
@@ -103,8 +104,8 @@ module Adhearsion
           end
 
           it "hangs up the new call when the dial unblocks" do
-            flexmock(call).should_receive(:answer).once
-            flexmock(other_mock_call).should_receive(:join).once.with(call)
+            call.should_receive(:answer).once
+            other_mock_call.should_receive(:join).once.with(call)
 
             dial_in_thread
 
@@ -150,8 +151,8 @@ module Adhearsion
 
           context "when the call is answered and joined" do
             it "has an overall dial status of :answer" do
-              flexmock(call).should_receive(:answer).once
-              flexmock(other_mock_call).should_receive(:join).once.with(call)
+              call.should_receive(:answer).once
+              other_mock_call.should_receive(:join).once.with(call)
 
               t = dial_in_thread
 
@@ -179,7 +180,7 @@ module Adhearsion
           end
 
           it "should not make any outbound calls" do
-            flexmock(OutboundCall).should_receive(:new).never
+            OutboundCall.should_receive(:new).never
             expect { subject.dial to, options }.to raise_error
           end
         end
@@ -190,16 +191,14 @@ module Adhearsion
           let(:second_other_options) { options }
 
           before do
-            second_other_mock_call
-
-            flexmock(OutboundCall).should_receive(:new).and_return other_mock_call, second_other_mock_call
+            OutboundCall.should_receive(:new).and_return other_mock_call, second_other_mock_call
 
-            flexmock(other_mock_call).should_receive(:dial).once.with(to, other_options)
-            flexmock(other_mock_call).should_receive(:hangup).once
+            other_mock_call.should_receive(:dial).once.with(to, other_options)
+            other_mock_call.should_receive(:hangup).once
 
-            flexmock(second_other_mock_call).should_receive(:dial).once.with(second_to, second_other_options)
-            flexmock(second_other_mock_call).should_receive(:join).never
-            flexmock(second_other_mock_call).should_receive(:hangup).once
+            second_other_mock_call.should_receive(:dial).once.with(second_to, second_other_options)
+            second_other_mock_call.should_receive(:join).never
+            second_other_mock_call.should_receive(:hangup).once
           end
 
           def dial_in_thread
@@ -211,9 +210,9 @@ module Adhearsion
           end
 
           it "dials all parties and joins the first one to answer, hanging up the rest" do
-            flexmock(call).should_receive(:answer).once
-            flexmock(other_mock_call).should_receive(:join).once.with(call)
-            flexmock(second_other_mock_call).should_receive(:hangup).once
+            call.should_receive(:answer).once
+            other_mock_call.should_receive(:join).once.with(call)
+            second_other_mock_call.should_receive(:hangup).once
 
             t = dial_in_thread
 
@@ -236,9 +235,9 @@ module Adhearsion
           end
 
           it "unblocks when the joined call unjoins, allowing it to proceed further" do
-            flexmock(call).should_receive(:answer).once
-            flexmock(other_mock_call).should_receive(:join).once.with(call)
-            flexmock(second_other_mock_call).should_receive(:hangup).once
+            call.should_receive(:answer).once
+            other_mock_call.should_receive(:join).once.with(call)
+            second_other_mock_call.should_receive(:hangup).once
 
             t = dial_in_thread
 
@@ -349,9 +348,9 @@ module Adhearsion
 
           context "when a call is answered and joined, and the other ends with an error" do
             it "has an overall dial status of :answer" do
-              flexmock(call).should_receive(:answer).once
-              flexmock(other_mock_call).should_receive(:join).once.with(call)
-              flexmock(second_other_mock_call).should_receive(:hangup).once
+              call.should_receive(:answer).once
+              other_mock_call.should_receive(:join).once.with(call)
+              second_other_mock_call.should_receive(:hangup).once
 
               t = dial_in_thread
 
@@ -375,9 +374,9 @@ module Adhearsion
           let(:timeout) { 3 }
 
           it "should abort the dial after the specified timeout" do
-            flexmock(other_mock_call).should_receive(:dial).once
-            flexmock(other_mock_call).should_receive(:hangup).once
-            flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
+            other_mock_call.should_receive(:dial).once
+            other_mock_call.should_receive(:hangup).once
+            OutboundCall.should_receive(:new).and_return other_mock_call
 
             time = Time.now
 
@@ -397,11 +396,11 @@ module Adhearsion
 
           describe "if someone answers before the timeout elapses" do
             it "should not abort until the far end hangs up" do
-              flexmock(other_mock_call).should_receive(:dial).once.with(to, hsh(:timeout => timeout))
-              flexmock(call).should_receive(:answer).once
-              flexmock(other_mock_call).should_receive(:join).once.with(call)
-              flexmock(other_mock_call).should_receive(:hangup).once
-              flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
+              other_mock_call.should_receive(:dial).once.with(to, hash_including(:timeout => timeout))
+              call.should_receive(:answer).once
+              other_mock_call.should_receive(:join).once.with(call)
+              other_mock_call.should_receive(:hangup).once
+              OutboundCall.should_receive(:new).and_return other_mock_call
 
               time = Time.now
 
@@ -451,15 +450,15 @@ module Adhearsion
           let(:options) { {:confirm => confirmation_controller} }
 
           before do
-            flexmock(other_mock_call).should_receive(:dial).once
-            flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
+            other_mock_call.should_receive(:dial).once
+            OutboundCall.should_receive(:new).and_return other_mock_call
           end
 
           context "with confirmation controller metadata specified" do
             let(:options) { {:confirm => confirmation_controller, :confirm_metadata => {:foo => 'bar'}} }
 
             it "should set the metadata on the controller" do
-              flexmock(other_mock_call).should_receive(:hangup).twice.and_return do
+              other_mock_call.should_receive(:hangup).twice.and_return do
                 other_mock_call << mock_end
               end
               other_mock_call['confirm'] = false
@@ -479,7 +478,7 @@ module Adhearsion
 
           context "when an outbound call is answered" do
             it "should execute the specified confirmation controller" do
-              flexmock(other_mock_call).should_receive(:hangup).twice.and_return do
+              other_mock_call.should_receive(:hangup).twice.and_return do
                 other_mock_call << mock_end
               end
               other_mock_call['confirm'] = false
@@ -495,10 +494,10 @@ module Adhearsion
             end
 
             it "should join the calls if the call is still active after execution of the call controller" do
-              flexmock(other_mock_call).should_receive(:hangup).once
+              other_mock_call.should_receive(:hangup).once
               other_mock_call['confirm'] = true
-              flexmock(call).should_receive(:answer).once
-              flexmock(other_mock_call).should_receive(:join).once.with(call)
+              call.should_receive(:answer).once
+              other_mock_call.should_receive(:join).once.with(call)
 
               t = dial_in_thread
 
@@ -515,12 +514,12 @@ module Adhearsion
             end
 
             it "should not join the calls if the call is not active after execution of the call controller" do
-              flexmock(other_mock_call).should_receive(:hangup).twice.and_return do
+              other_mock_call.should_receive(:hangup).twice.and_return do
                 other_mock_call << mock_end
               end
               other_mock_call['confirm'] = false
-              flexmock(call).should_receive(:answer).never
-              flexmock(other_mock_call).should_receive(:join).never.with(call)
+              call.should_receive(:answer).never
+              other_mock_call.should_receive(:join).never.with(call)
 
               t = dial_in_thread
 

data/spec/adhearsion/call_controller/input_spec.rb

@@ -87,12 +87,7 @@ module Adhearsion
         let(:utterance) { 'dtmf-5' }
 
         def expect_component_complete_event
-          complete_event = Punchblock::Event::Complete.new
-          flexmock(complete_event).should_receive(:reason => flexmock(:utterance => utterance, :name => :input))
-          flexmock(Punchblock::Component::Input).new_instances do |input|
-            input.should_receive(:complete?).and_return(false)
-            input.should_receive(:complete_event).and_return(complete_event)
-          end
+          expect_input_component_complete_event utterance
         end
 
         it "sends the correct input component" do
@@ -103,7 +98,7 @@ module Adhearsion
 
         it "returns the correct pressed digit" do
           expect_component_complete_event
-          subject.should_receive(:execute_component_and_await_completion).once.with(Punchblock::Component::Input).and_return input_component
+          subject.should_receive(:execute_component_and_await_completion).once.with(kind_of(Punchblock::Component::Input)).and_return input_component
           subject.wait_for_digit(timeout).should be == '5'
         end
 
@@ -112,7 +107,7 @@ module Adhearsion
 
           it "returns the correct pressed digit" do
             expect_component_complete_event
-            subject.should_receive(:execute_component_and_await_completion).once.with(Punchblock::Component::Input).and_return input_component
+            subject.should_receive(:execute_component_and_await_completion).once.with(kind_of(Punchblock::Component::Input)).and_return input_component
             subject.wait_for_digit(timeout).should be == '5'
           end
         end
@@ -130,13 +125,13 @@ module Adhearsion
       end # wait_for_digit
 
       describe "#jump_to" do
-        let(:match_object) { flexmock(Class.new) }
+        let(:match_object) { Class.new }
         let(:overrides) { Hash.new(:extension => "1") }
         let(:block) { Proc.new {} }
 
         it "calls instance_exec if the match object has a block" do
-          match_object.should_receive(:block).and_return(block)
-          subject.should_receive(:instance_exec).with(overrides[:extension], block)
+          match_object.stub(:block => block)
+          subject.should_receive(:instance_exec).with(overrides[:extension], &block)
           subject.jump_to(match_object, overrides)
         end
 
@@ -167,8 +162,8 @@ module Adhearsion
         let(:response) { '1234' }
 
         before do
-          flexmock menu_instance, :status => status, :result => response
-          flexmock(MenuDSL::Menu).should_receive(:new).and_return(menu_instance)
+          menu_instance.stub :status => status, :result => response
+          MenuDSL::Menu.should_receive(:new).and_return(menu_instance)
         end
 
         it "exits the function if MenuResultDone" do
@@ -272,8 +267,8 @@ module Adhearsion
           let(:result_found)                  { MenuDSL::Menu::MenuResultFound.new(:match_object, :new_extension) }
 
           before do
-            flexmock menu_instance
-            flexmock(MenuDSL::Menu).should_receive(:new).and_return(menu_instance)
+            menu_instance
+            MenuDSL::Menu.should_receive(:new).and_return(menu_instance)
           end
 
           it "exits the function if MenuResultDone" do
@@ -298,7 +293,7 @@ module Adhearsion
           end
 
           it "plays audio, then executes timeout hook if input times out" do
-            menu_instance.should_receive(:continue).and_return(result_get_another_or_timeout, result_done)
+            menu_instance.should_receive(:continue).and_return(result_get_another_or_timeout)
             subject.should_receive(:play_sound_files_for_menu).once.with(menu_instance, sound_files).and_return(nil)
             result = subject.ask sound_files
             result.menu.should be menu_instance

data/spec/adhearsion/call_controller/menu_dsl/menu_builder_spec.rb

@@ -11,7 +11,7 @@ module Adhearsion
 
         describe "#build" do
           it "sets the context and instance_eval's the block" do
-            flexmock(subject).should_receive(:foo).with(:bar)
+            subject.should_receive(:foo).with(:bar)
             subject.build do
               foo :bar
             end
@@ -34,18 +34,18 @@ module Adhearsion
           end
 
           it "creates a pattern based on a payload" do
-            flexmock(MenuDSL::MatchCalculator).should_receive(:build_with_pattern).with("1", Object)
+            MenuDSL::MatchCalculator.should_receive(:build_with_pattern).with("1", Object)
             subject.match "1", Object
           end
 
           it "creates a pattern based on a block" do
-            flexmock(MenuDSL::MatchCalculator).should_receive(:build_with_pattern).with("1", nil, match_block)
+            MenuDSL::MatchCalculator.should_receive(:build_with_pattern).with("1", nil, &match_block)
             subject.match("1", &match_block)
           end
 
           it "creates multiple patterns if multiple arguments are passed in" do
-            flexmock(MenuDSL::MatchCalculator).should_receive(:build_with_pattern).with(1, Object)
-            flexmock(MenuDSL::MatchCalculator).should_receive(:build_with_pattern).with(2, Object)
+            MenuDSL::MatchCalculator.should_receive(:build_with_pattern).with(1, Object)
+            MenuDSL::MatchCalculator.should_receive(:build_with_pattern).with(2, Object)
             subject.match(1, 2, Object)
           end
         end#match
@@ -68,7 +68,7 @@ module Adhearsion
           let(:expected_pattern) { MenuDSL::MatchCalculator.build_with_pattern("1", Object) }
 
           it "returns the generated patterns" do
-            flexmock(MenuDSL::MatchCalculator).should_receive(:build_with_pattern).with("1", Object).and_return(expected_pattern)
+            MenuDSL::MatchCalculator.should_receive(:build_with_pattern).with("1", Object).at_least(:once).and_return(expected_pattern)
             subject.match("1", Object)
             subject.weighted_match_calculators.should be == [expected_pattern]
           end

data/spec/adhearsion/call_controller/menu_dsl/menu_spec.rb

@@ -153,8 +153,8 @@ module Adhearsion
               its(:builder) { should be_a MenuBuilder }
 
               it "should evaluate the block on the builder object" do
-                mock_menu_builder = flexmock(MenuBuilder.new)
-                flexmock(MenuBuilder).should_receive(:new).and_return(mock_menu_builder)
+                mock_menu_builder = MenuBuilder.new
+                MenuBuilder.should_receive(:new).and_return(mock_menu_builder)
                 mock_menu_builder.should_receive(:match).once.with(1)
                 Menu.new { match 1 }
               end
@@ -212,8 +212,8 @@ module Adhearsion
 
           describe "#execute_invalid_hook" do
             it "calls the builder's execute_hook_for with :invalid" do
-              mock_menu_builder = flexmock(MenuBuilder.new)
-              flexmock(MenuBuilder).should_receive(:new).and_return(mock_menu_builder)
+              mock_menu_builder = MenuBuilder.new
+              MenuBuilder.should_receive(:new).and_return(mock_menu_builder)
               mock_menu_builder.should_receive(:execute_hook_for).with(:invalid, "")
               menu_instance = Menu.new
               menu_instance.execute_invalid_hook
@@ -222,8 +222,8 @@ module Adhearsion
 
           describe "#execute_timeout_hook" do
             it "calls the builder's execute_hook_for with :timeout" do
-              mock_menu_builder = flexmock(MenuBuilder.new)
-              flexmock(MenuBuilder).should_receive(:new).and_return(mock_menu_builder)
+              mock_menu_builder = MenuBuilder.new
+              MenuBuilder.should_receive(:new).and_return(mock_menu_builder)
               mock_menu_builder.should_receive(:execute_hook_for).with(:timeout, "")
               menu_instance = Menu.new
               menu_instance.execute_timeout_hook
@@ -232,8 +232,8 @@ module Adhearsion
 
           describe "#execute_failure_hook" do
             it "calls the builder's execute_hook_for with :failure" do
-              mock_menu_builder = flexmock(MenuBuilder.new)
-              flexmock(MenuBuilder).should_receive(:new).and_return(mock_menu_builder)
+              mock_menu_builder = MenuBuilder.new
+              MenuBuilder.should_receive(:new).and_return(mock_menu_builder)
               mock_menu_builder.should_receive(:execute_hook_for).with(:failure, "")
               menu_instance = Menu.new
               menu_instance.execute_failure_hook
@@ -242,8 +242,8 @@ module Adhearsion
 
           describe "#execute_validator_hook" do
             it "calls the builder's execute_hook_for with :validator" do
-              mock_menu_builder = flexmock(MenuBuilder.new)
-              flexmock(MenuBuilder).should_receive(:new).and_return(mock_menu_builder)
+              mock_menu_builder = MenuBuilder.new
+              MenuBuilder.should_receive(:new).and_return(mock_menu_builder)
               mock_menu_builder.should_receive(:execute_hook_for).with(:validator, "")
               menu_instance = Menu.new
               menu_instance.execute_validator_hook