adhearsion-asterisk 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # develop
 
+# v0.3.0 - 2012-03-29
+  # Remove the monkey-patched version of `CallController#stream_file` since Punchblock now supports stopping output
+
 # v0.2.0 - 2012-03-22
   * Update to work with Adhearsion 2.0.0.rc2
   * Remove overloaded `CallController#play` and `#play!` - we should use Adhearsion's core auto-detection

data/lib/adhearsion/asterisk.rb

@@ -1,5 +1,4 @@
 require 'adhearsion'
-require 'adhearsion/asterisk/core_ext/adhearsion/call_controller'
 require 'active_support/dependencies/autoload'
 require 'adhearsion/asterisk/version'
 require 'adhearsion/asterisk/call_controller_methods'

data/lib/adhearsion/asterisk/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   module Asterisk
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/adhearsion/asterisk/call_controller_methods_spec.rb

@@ -451,78 +451,6 @@ module Adhearsion::Asterisk
           subject.play_soundfile(audiofile).should == false
         end
       end
-
-      describe "#stream_file" do
-        let(:allowed_digits)  { '35' }
-        let(:prompt)          { 'tt-monkeys' }
-
-        let :output_params do
-          {
-            :name => 'STREAM FILE',
-            :params => [
-              'tt-monkeys',
-              '35'
-            ]
-          }
-        end
-
-        let(:output_component) do
-          Punchblock::Component::Asterisk::AGI::Command.new output_params
-        end
-
-        let(:result) { 53 }
-        let(:endpos) { '5000' }
-
-        let :reason do
-          Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new :code => 200,
-                                                                               :result => result,
-                                                                               :data => "endpos=#{endpos}"
-        end
-
-        before do
-          output_component
-          Punchblock::Component::Asterisk::AGI::Command.expects(:new).once.with(output_params).returns output_component
-          output_component.expects(:complete_event).at_least_once.returns mock('success', :reason => reason)
-        end
-
-        it "plays the correct output" do
-          subject.expects(:execute_component_and_await_completion).once.with(output_component).returns(output_component)
-          subject.stream_file prompt, allowed_digits
-        end
-
-        it "returns a single digit amongst the allowed when pressed" do
-          subject.expects(:execute_component_and_await_completion).once.with(output_component).returns(output_component)
-          subject.stream_file(prompt, allowed_digits).should == '5'
-        end
-
-        context 'when nothing was pressed' do
-          let(:result) { 0 }
-
-          it "returns nil" do
-            subject.expects(:execute_component_and_await_completion).once.with(output_component).returns(output_component)
-            subject.stream_file(prompt, allowed_digits).should == nil
-          end
-        end
-
-        context 'when output fails' do
-          let(:result) { -1 }
-
-          it "raises Adhearsion::PlaybackError" do
-            subject.expects(:execute_component_and_await_completion).once.with(output_component).returns(output_component)
-            lambda { subject.stream_file prompt, allowed_digits }.should raise_error Adhearsion::CallController::Output::PlaybackError
-          end
-        end
-
-        context 'when output fails to open' do
-          let(:result) { 0 }
-          let(:endpos) { '0' }
-
-          it "raises Adhearsion::PlaybackError" do
-            subject.expects(:execute_component_and_await_completion).once.with(output_component).returns(output_component)
-            lambda { subject.stream_file prompt, allowed_digits }.should raise_error Adhearsion::CallController::Output::PlaybackError
-          end
-        end
-      end # describe #stream_file
     end
   end#main describe
 end

data/spec/adhearsion/asterisk/plugin_spec.rb

@@ -6,12 +6,6 @@ module Adhearsion::Asterisk
 
     let(:mock_call) { stub_everything 'Call' }
 
-    it 'should monkeypatch Adhearsion::CallController' do
-      cc = Adhearsion::CallController.new(mock_call)
-      cc.expects(:play_time).returns true
-      cc.play
-    end
-
     it 'should extend Adhearsion::CallController with Asterisk methods' do
       Adhearsion::CallController.new(mock_call).should respond_to :play_time
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asterisk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
-  requirement: &2164421920 !ruby/object:Gem::Requirement
+  requirement: &2152681880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.0.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *2164421920
+  version_requirements: *2152681880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164421300 !ruby/object:Gem::Requirement
+  requirement: &2152681220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2164421300
+  version_requirements: *2152681220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164420660 !ruby/object:Gem::Requirement
+  requirement: &2152680480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164420660
+  version_requirements: *2152680480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164420140 !ruby/object:Gem::Requirement
+  requirement: &2152679880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2164420140
+  version_requirements: *2152679880
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2164419580 !ruby/object:Gem::Requirement
+  requirement: &2152679240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2164419580
+  version_requirements: *2152679240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164418800 !ruby/object:Gem::Requirement
+  requirement: &2152678520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164418800
+  version_requirements: *2152678520
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2164418180 !ruby/object:Gem::Requirement
+  requirement: &2152677920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164418180
+  version_requirements: *2152677920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164417560 !ruby/object:Gem::Requirement
+  requirement: &2152677240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164417560
+  version_requirements: *2152677240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164417020 !ruby/object:Gem::Requirement
+  requirement: &2168705200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164417020
+  version_requirements: *2168705200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164416400 !ruby/object:Gem::Requirement
+  requirement: &2168704540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164416400
+  version_requirements: *2168704540
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2164415840 !ruby/object:Gem::Requirement
+  requirement: &2168704040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164415840
+  version_requirements: *2168704040
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2164415340 !ruby/object:Gem::Requirement
+  requirement: &2168703200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164415340
+  version_requirements: *2168703200
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2164414720 !ruby/object:Gem::Requirement
+  requirement: &2168702500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164414720
+  version_requirements: *2168702500
 description: An Adhearsion Plugin providing Asterisk-specific dialplan methods, AMI
   access, and access to Asterisk configuration
 email:
@@ -182,7 +182,6 @@ files:
 - lib/adhearsion/asterisk/config_generator/queues.rb
 - lib/adhearsion/asterisk/config_generator/voicemail.rb
 - lib/adhearsion/asterisk/config_manager.rb
-- lib/adhearsion/asterisk/core_ext/adhearsion/call_controller.rb
 - lib/adhearsion/asterisk/plugin.rb
 - lib/adhearsion/asterisk/queue_proxy.rb
 - lib/adhearsion/asterisk/queue_proxy/agent_proxy.rb
@@ -214,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 819784652951999828
+      hash: -71015258719465438
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 819784652951999828
+      hash: -71015258719465438
 requirements: []
 rubyforge_project: adhearsion-asterisk
 rubygems_version: 1.8.10

data/lib/adhearsion/asterisk/core_ext/adhearsion/call_controller.rb

@@ -1,40 +0,0 @@
-module Adhearsion
-
-  ##
-  # Monkeypatches to Adhearsion for Asterisk-specific functionality.
-  #
-  class CallController
-    #
-    # Plays a single output, not only files, accepting interruption by one of the digits specified
-    # Currently still stops execution, will be fixed soon in Punchblock
-    #
-    # @param [Object] String or Hash specifying output and options
-    # @param [String] String with the digits that are allowed to interrupt output
-    # @return [String|nil] The pressed digit, or nil if nothing was pressed
-    #
-    def stream_file(argument, digits = '0123456789#*')
-      begin
-        output_component = ::Punchblock::Component::Asterisk::AGI::Command.new :name => "STREAM FILE",
-                                                                               :params => [
-                                                                                 argument,
-                                                                                 digits
-                                                                               ]
-        execute_component_and_await_completion output_component
-
-        reason = output_component.complete_event.reason
-
-        case reason.result
-        when 0
-          raise CallController::Output::PlaybackError if reason.data == "endpos=0"
-          nil
-        when -1
-          raise CallController::Output::PlaybackError
-        else
-          [reason.result].pack 'U*'
-        end
-      rescue StandardError => e
-        raise CallController::Output::PlaybackError, "Output failed for argument #{argument.inspect}"
-      end
-    end
-  end
-end