adhearsion-asterisk 0.1.3 → 0.2.0

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode # currently in active development, may or may not work for your project
+  - ruby-head
+notifications:
+  irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # develop
 
+# 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
+
 # v0.1.3 - 2012-01-30
   * Update to use Adhearsion's changed Plugin semantics (no more dialplan hooks)
   * Monkeypatch Adhearsion::CallController with Asterisk-specific overloads

data/adhearsion-asterisk.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<adhearsion>, [">= 2.0.0.alpha2"]
+  s.add_runtime_dependency %q<adhearsion>, [">= 2.0.0.rc2"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.10"]
 
-  s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
+  s.add_development_dependency %q<bundler>, [">= 1.0.0"]
   s.add_development_dependency %q<rspec>, [">= 2.5.0"]
   s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
   s.add_development_dependency %q<simplecov>, [">= 0"]
   s.add_development_dependency %q<simplecov-rcov>, [">= 0"]
-  s.add_development_dependency %q<yard>, ["~> 0.6.0"]
+  s.add_development_dependency %q<yard>, [">= 0.6.0"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<mocha>, [">= 0"]
   s.add_development_dependency %q<bones>

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

@@ -4,55 +4,6 @@ module Adhearsion
   # Monkeypatches to Adhearsion for Asterisk-specific functionality.
   #
   class CallController
-    # Plays the specified sound file names. This method will handle Time/DateTime objects (e.g. Time.now),
-    # Fixnums (e.g. 1000), Strings which are valid Fixnums (e.g "123"), and direct sound files. When playing
-    # numbers, Adhearsion assumes you're saying the number, not the digits. For example, play("100")
-    # is pronounced as "one hundred" instead of "one zero zero". To specify how the Date/Time objects are said
-    # pass in as an array with the first parameter as the Date/Time/DateTime object along with a hash with the
-    # additional options.  See play_time for more information.
-    #
-    # Note: it is not necessary to supply a sound file extension; Asterisk will try to find a sound
-    # file encoded using the current channel's codec, if one exists. If not, it will transcode from
-    # the default codec (GSM). Asterisk stores its sound files in /var/lib/asterisk/sounds.
-    #
-    # @example Play file hello-world.???
-    #   play 'hello-world'
-    # @example Speak current time
-    #   play Time.now
-    # @example Speak today's date
-    #   play Date.today
-    # @example Speak today's date in a specific format
-    #   play [Date.today, {:format => 'BdY'}]
-    # @example Play sound file, speak number, play two more sound files
-    #   play %w"a-connect-charge-of 22 cents-per-minute will-apply"
-    # @example Play two sound files
-    #   play "you-sound-cute", "what-are-you-wearing"
-    #
-    # @return [Boolean] true is returned if everything was successful.  Otherwise, false indicates that
-    #   some sound file(s) could not be played.
-    def play(*arguments)
-      begin
-        play! arguments
-      rescue Adhearsion::PlaybackError => e
-        return false
-      end
-      true
-    end
-
-    # Same as {#play}, but immediately raises an exception if a sound file cannot be played.
-    #
-    # @return [true]
-    # @raise [Adhearsion::VoIP::PlaybackError] If a sound file cannot be played
-    def play!(*arguments)
-      result = true
-      unless play_time(arguments)
-        arguments.flatten.each do |argument|
-          result &= play_numeric(argument) || play_soundfile(argument)
-        end
-      end
-      raise Adhearsion::PlaybackError if !result
-    end
-
     #
     # 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
@@ -74,15 +25,15 @@ module Adhearsion
 
         case reason.result
         when 0
-          raise Adhearsion::PlaybackError if reason.data == "endpos=0"
+          raise CallController::Output::PlaybackError if reason.data == "endpos=0"
           nil
         when -1
-          raise Adhearsion::PlaybackError
+          raise CallController::Output::PlaybackError
         else
           [reason.result].pack 'U*'
         end
       rescue StandardError => e
-        raise Adhearsion::PlaybackError, "Output failed for argument #{argument.inspect}"
+        raise CallController::Output::PlaybackError, "Output failed for argument #{argument.inspect}"
       end
     end
   end

data/lib/adhearsion/asterisk/version.rb

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

data/spec/adhearsion/asterisk/call_controller_methods_spec.rb

@@ -405,95 +405,6 @@ module Adhearsion::Asterisk
         end
       end#describe #queue
 
-      describe "#play" do
-        let(:audiofile) { "tt-monkeys" }
-        let(:audiofile2) { "tt-weasels" }
-
-        it 'should return true if play proceeds correctly' do
-          subject.expects(:play!).with([audiofile])
-          subject.play(audiofile).should be true
-        end
-
-        it 'should return false if an audio file cannot be found' do
-          subject.expects(:play!).with([audiofile]).raises(Adhearsion::PlaybackError)
-          subject.play(audiofile).should be false
-
-        end
-
-        it 'should return false when audio files cannot be found' do
-          subject.expects(:play!).with([audiofile, audiofile2]).raises(Adhearsion::PlaybackError)
-          subject.play(audiofile, audiofile2).should be false
-        end
-      end
-
-      describe "#play!" do
-        let(:audiofile) { "tt-monkeys" }
-        let(:audiofile2) { "tt-weasels" }
-        let(:numeric) { 20 }
-        let(:numeric_string) { "42" }
-        let(:date) { Date.parse('2011-10-24') }
-        let(:time) { Time.at(875121313) }
-
-        describe "with a single argument" do
-          it 'passing a single string to play() results in play_soundfile being called with that file name' do
-            subject.expects(:play_time).with([audiofile]).returns(false)
-            subject.expects(:play_numeric).with(audiofile).returns(false)
-            subject.expects(:play_soundfile).with(audiofile).returns(true)
-            subject.play!(audiofile)
-          end
-
-          it 'If a number is passed to play(), the play_numeric method is called with that argument'  do
-            subject.expects(:play_time).with([numeric]).returns(false)
-            subject.expects(:play_numeric).with(numeric).returns(true)
-            subject.play!(numeric)
-          end
-
-          it 'if a string representation of a number is passed to play(), the play_numeric method is called with that argument' do
-            subject.expects(:play_time).with([numeric_string]).returns(false)
-            subject.expects(:play_numeric).with(numeric_string).returns(true)
-            subject.play!(numeric_string)
-          end
-
-          it 'If a Time is passed to play(), the play_time method is called with that argument' do
-            subject.expects(:play_time).with([time]).returns(true)
-            subject.play!(time)
-          end
-
-          it 'If a Date is passed to play(), the play_time method is called with that argument' do
-            subject.expects(:play_time).with([date]).returns(true)
-            subject.play!(date)
-          end
-
-          it 'raises an exception if play fails' do
-            subject.expects(:play_time).with([audiofile]).returns(false)
-            subject.expects(:play_numeric).with(audiofile).returns(false)
-            subject.expects(:play_soundfile).with(audiofile).returns(false)
-            lambda { subject.play!(audiofile) }.should raise_error(Adhearsion::PlaybackError)
-          end
-        end
-
-        describe "with multiple arguments" do
-          it 'loops over the arguments, issuing separate play commands' do
-            subject.expects(:play_time).with([audiofile, audiofile2]).returns(false)
-            subject.expects(:play_numeric).with(audiofile).returns(false)
-            subject.expects(:play_soundfile).with(audiofile).returns(true)
-            subject.expects(:play_numeric).with(audiofile2).returns(false)
-            subject.expects(:play_soundfile).with(audiofile2).returns(true)
-            subject.play!(audiofile, audiofile2)
-          end
-
-          it 'raises an exception if play fails with multiple argument' do
-            subject.expects(:play_time).with([audiofile, audiofile2]).returns(false)
-            subject.expects(:play_numeric).with(audiofile).returns(false)
-            subject.expects(:play_soundfile).with(audiofile).returns(false)
-            subject.expects(:play_numeric).with(audiofile2).returns(false)
-            subject.expects(:play_soundfile).with(audiofile2).returns(false)
-            lambda { subject.play!(audiofile, audiofile2) }.should raise_error(Adhearsion::PlaybackError)
-          end
-        end
-
-      end
-
       describe "#play_time" do
         let(:date) { Date.parse('2011-10-24') }
         let(:date_format) { 'ABdY' }
@@ -598,7 +509,7 @@ module Adhearsion::Asterisk
 
           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::PlaybackError
+            lambda { subject.stream_file prompt, allowed_digits }.should raise_error Adhearsion::CallController::Output::PlaybackError
           end
         end
 
@@ -608,7 +519,7 @@ module Adhearsion::Asterisk
 
           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::PlaybackError
+            lambda { subject.stream_file prompt, allowed_digits }.should raise_error Adhearsion::CallController::Output::PlaybackError
           end
         end
       end # describe #stream_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asterisk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
-  requirement: &2152671220 !ruby/object:Gem::Requirement
+  requirement: &2164421920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha2
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *2152671220
+  version_requirements: *2164421920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152670680 !ruby/object:Gem::Requirement
+  requirement: &2164421300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,21 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152670680
+  version_requirements: *2164421300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156501700 !ruby/object:Gem::Requirement
+  requirement: &2164420660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156501700
+  version_requirements: *2164420660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156501180 !ruby/object:Gem::Requirement
+  requirement: &2164420140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156501180
+  version_requirements: *2164420140
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156500640 !ruby/object:Gem::Requirement
+  requirement: &2164419580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2156500640
+  version_requirements: *2164419580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156500080 !ruby/object:Gem::Requirement
+  requirement: &2164418800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156500080
+  version_requirements: *2164418800
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2156499560 !ruby/object:Gem::Requirement
+  requirement: &2164418180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,21 +88,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156499560
+  version_requirements: *2164418180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156499080 !ruby/object:Gem::Requirement
+  requirement: &2164417560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156499080
+  version_requirements: *2164417560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156498600 !ruby/object:Gem::Requirement
+  requirement: &2164417020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156498600
+  version_requirements: *2164417020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156498120 !ruby/object:Gem::Requirement
+  requirement: &2164416400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156498120
+  version_requirements: *2164416400
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2156497700 !ruby/object:Gem::Requirement
+  requirement: &2164415840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156497700
+  version_requirements: *2164415840
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156497200 !ruby/object:Gem::Requirement
+  requirement: &2164415340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156497200
+  version_requirements: *2164415340
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2156496760 !ruby/object:Gem::Requirement
+  requirement: &2164414720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156496760
+  version_requirements: *2164414720
 description: An Adhearsion Plugin providing Asterisk-specific dialplan methods, AMI
   access, and access to Asterisk configuration
 email:
@@ -166,6 +166,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2593107876374281234
+      hash: 819784652951999828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2593107876374281234
+      hash: 819784652951999828
 requirements: []
 rubyforge_project: adhearsion-asterisk
 rubygems_version: 1.8.10