adhearsion-asterisk 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # develop
 
+# v1.2.1
+  * Feature: added play_tone for DTMF in-call generation
+  * Bugfix: "code is an undefined method" errors on executing AMI methods directly (issue #6)
+
 # v1.2.0
   * Feature: Added helper to execute AMI actions easily
 

data/README.md

@@ -25,6 +25,7 @@ Dialplan methods
   * play_time
   * play_numeric
   * play_soundfile
+  * play_tones
   * enable_feature
   * disable_feature
 

data/adhearsion-asterisk.gemspec

@@ -5,8 +5,8 @@ require "adhearsion/asterisk/version"
 Gem::Specification.new do |s|
   s.name        = "adhearsion-asterisk"
   s.version     = Adhearsion::Asterisk::VERSION
-  s.authors     = ["Ben Langfeld", "Taylor Carpenter"]
-  s.email       = ["blangfeld@adhearsion.com", "taylor@codecafe.com"]
+  s.authors     = ["Ben Langfeld", "Taylor Carpenter", "Luca Pradovera"]
+  s.email       = ["blangfeld@adhearsion.com", "taylor@codecafe.com", "lpradovera@mojolingo.com"]
   s.homepage    = "http://adhearsion.com"
   s.summary     = %q{Asterisk specific features for Adhearsion}
   s.description = %q{An Adhearsion Plugin providing Asterisk-specific dialplan methods, AMI access, and access to Asterisk configuration}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency %q<adhearsion>, ["~> 2.0"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.10"]
+  s.add_runtime_dependency %q<jruby-openssl> if RUBY_PLATFORM == 'java'
 
   s.add_development_dependency %q<bundler>, [">= 1.0.0"]
   s.add_development_dependency %q<rspec>, [">= 2.5.0"]
@@ -31,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<mocha>, [">= 0"]
   s.add_development_dependency %q<bones>
   s.add_development_dependency %q<guard-rspec>
-  s.add_development_dependency 'ruby_gntp'
+  s.add_development_dependency %q<ruby_gntp>
+  s.add_development_dependency %q<thor>, ["~> 0.14.0"]
 end

data/lib/adhearsion/asterisk/call_controller_methods.rb

@@ -18,6 +18,7 @@ module Adhearsion
         component = Punchblock::Component::Asterisk::AGI::Command.new :name => name, :params => params
         execute_component_and_await_completion component
         complete_reason = component.complete_event.reason
+        raise Adhearsion::Call::Hangup if complete_reason.is_a?(Punchblock::Event::Complete::Hangup)
         [:code, :result, :data].map { |p| complete_reason.send p }
       end
 
@@ -360,10 +361,25 @@ module Adhearsion
       #Executes SayNumber with the passed argument.
       #
       # @param [Numeric|String] Numeric argument, or a string contanining numbers.
-      # @return [Boolean] Returns false if the argument could not be played.
       def play_numeric(argument)
-        if argument.kind_of?(Numeric) || argument =~ /^\d+$/
-          execute "SayNumber", argument
+        execute "SayNumber", argument
+      end
+
+      #Executes SayDigits with the passed argument.
+      #
+      # @param [Numeric|String] Numeric argument, or a string contanining numbers.
+      def play_digits(argument)
+        execute "SayDigits", argument
+      end
+
+      #Executes Playtones with the passed argument.
+      #
+      # @param [String|Array] Array or comma-separated string of tones.
+      # @param [Boolean] Whether to wait for the tones to finish (defaults to false).
+      def play_tones(argument, wait = false)
+        tones = [*argument].join(",")
+        execute("Playtones", tones).tap do
+          sleep tones.scan(/(?<=\/)\d+/).map(&:to_i).sum.to_f / 1000 if wait
         end
       end
 

data/lib/adhearsion/asterisk/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   module Asterisk
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/spec/adhearsion/asterisk/call_controller_methods_spec.rb

@@ -19,13 +19,26 @@ module Adhearsion::Asterisk
           end
         end
 
-        it 'should execute an AGI command with the specified name and parameters and return the response code, response and data' do
-          Punchblock::Component::Asterisk::AGI::Command.any_instance.stubs :complete_event => complete_event
+        before { Punchblock::Component::Asterisk::AGI::Command.any_instance.stubs :complete_event => complete_event }
 
+        it 'should execute an AGI command with the specified name and parameters and return the response code, response and data' do
           subject.expects(:execute_component_and_await_completion).once.with expected_agi_command
           values = subject.agi 'Dial', '4044754842', 15
           values.should == [200, 1, 'foobar']
         end
+
+        context 'when AGI terminates because of a hangup' do
+          let :complete_event do
+            Punchblock::Event::Complete.new.tap do |c|
+              c.reason = Punchblock::Event::Complete::Hangup.new
+            end
+          end
+
+          it 'should raise Adhearsion::Call::Hangup' do
+            subject.expects(:execute_component_and_await_completion).once.with expected_agi_command
+            lambda { subject.agi 'Dial', '4044754842', 15 }.should raise_error(Adhearsion::Call::Hangup)
+          end
+        end
       end
 
       describe '#execute' do
@@ -436,6 +449,35 @@ module Adhearsion::Asterisk
         end
       end
 
+      describe "#play_digits" do
+        let(:numeric) { 20 }
+        it "should send the correct command SayDigits playing a numeric argument" do
+          subject.expects(:execute).once.with("SayDigits", numeric)
+          subject.play_digits(numeric)
+        end
+      end
+
+      describe "#play_tones" do
+        context "should send the correct command Playtones playing tones" do
+          before do
+            subject.expects(:execute).once.with("Playtones", "!950/330,!1400/330,!1800/330,0")
+          end
+
+          it "given as a string" do
+            subject.play_tones("!950/330,!1400/330,!1800/330,0")
+          end
+
+          it "given as an array" do
+            subject.play_tones(["!950/330","!1400/330","!1800/330","0"])
+          end
+
+          it "and sleep for the duration when instructed" do
+            subject.expects(:sleep).once.with(0.99)
+            subject.play_tones("!950/330,!1400/330,!1800/330,0", true)
+          end
+        end
+      end
+
       describe "#play_soundfile" do
         let(:audiofile) { "tt-monkeys" }
         it "should send the correct command Playback playing an audio file" do

data/spec/adhearsion/asterisk/config_generators/voicemail_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'adhearsion/asterisk/config_generator/voicemail'
+require 'ostruct'
 
 describe 'Basic requirements of the Voicemail config generator' do
   attr_reader :config

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asterisk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
 - Ben Langfeld
 - Taylor Carpenter
+- Luca Pradovera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -220,11 +221,28 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 description: An Adhearsion Plugin providing Asterisk-specific dialplan methods, AMI
   access, and access to Asterisk configuration
 email:
 - blangfeld@adhearsion.com
 - taylor@codecafe.com
+- lpradovera@mojolingo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -280,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1875001914852062926
+      hash: -489585779242727687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -289,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1875001914852062926
+      hash: -489585779242727687
 requirements: []
 rubyforge_project: adhearsion-asterisk
 rubygems_version: 1.8.21
@@ -310,3 +328,4 @@ test_files:
 - spec/has_agi_context.rb
 - spec/spec_helper.rb
 - spec/support/the_following_code.rb
+has_rdoc: