adhearsion_cpa 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78576498fddf76d14a2756d853529647a08bc674
-  data.tar.gz: 01259071cfe35b2c4daa379e5e61dcdf569019a7
+  metadata.gz: 6387c07bc6e12199e7d38d9fa3bc9a4fe2e162db
+  data.tar.gz: 7c4a94002bc0895b8875737c71dd536794cfeed0
 SHA512:
-  metadata.gz: ac156ed89e74dd1a0d1bed7a8ff5e09aace7226596ce73d554d39f27694190c636fa40716ab9e5f465a28bb621654b2cd61e77f11811c5405db84014b179109c
-  data.tar.gz: 28a92b969d343b08517ab4194cd0d30e64e1b53347df14332123345e42977342e79bb016f4f2e1ac95a5d7ca3bdfe5b04459301a3dce614f9da1260be73f58a2
+  metadata.gz: 17a7ef5743d71f74032f239dec6b59ea3206835787510dcd2833b3837bdd4036e806c8a837080104100de7d44da0bdfe3536c1dcce4132135375de67be1e4107
+  data.tar.gz: b0d349199378a252a840ea2658b2bfea1e91458baffe875f679a5b13d75844ffa59b85ea0d5b3e219ac06a55d2ba42e4a8f908ea93bccd9c3a5a5e2c35e29c2d

data/CHANGELOG.md

@@ -1,2 +1,8 @@
+# DEVELOP
+
+# 0.1.1
+  * [BUGFIX] Don't error out on async calls if a timeout isn't set
+  * [BUGFIX] Make async calls work with both terminating and nonterminating CPA components
+
 # 0.1.0
   * Initial release

data/lib/adhearsion_cpa/controller_methods.rb

@@ -23,7 +23,7 @@ module AdhearsionCpa
     # Begin asynchronous tone detection, and run the block when the tone is detected
     #
     # @example Asynchronous wait for a dtmf
-    #   detect_tone :dtmf, timeout: -1 { |detected| logger.info "Beep! Customer pushed #{detected.inspect}"}
+    #   detect_tone :dtmf { |detected| logger.info "Beep! Customer pushed #{detected.inspect}"}
     # @example Asynchronous wait for dtmf presses, running the block multiple times if multiple signals are detected
     def detect_tone!(*arguments)
       options = arguments.last.is_a?(Hash) && arguments.count > 1 ? arguments.pop : {}

data/lib/adhearsion_cpa/tone_detector.rb

@@ -11,9 +11,15 @@ module AdhearsionCpa
       @tones = tones
       process options
 
-      component.register_event_handler Punchblock::Component::Input::Signal do |event|
-        yield event if block_given?
-      end if async?
+      if async?
+        component.register_event_handler Punchblock::Component::Input::Signal do |event|
+          yield event if block_given?
+        end
+
+        component.register_event_handler Punchblock::Event::Complete do |event|
+          yield event.reason if block_given? && event.reason.is_a?(Punchblock::Component::Input::Signal)
+        end
+      end
 
       call.write_and_await_response component if call_alive?
 
@@ -22,7 +28,7 @@ module AdhearsionCpa
           if component_running?
             component.stop!
           end
-        end
+        end if timeout
 
         component
       else

data/lib/adhearsion_cpa/version.rb

@@ -1,3 +1,3 @@
 module AdhearsionCpa
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/adhearsion_cpa/controller_methods_spec.rb

@@ -7,8 +7,8 @@ module AdhearsionCpa
     subject { Adhearsion::CallController.new mock_call }
 
     let(:expected_component)  { Punchblock::Component::Input.new mode: :cpa, grammars: expected_grammars }
-    let(:mock_complete_event) { double 'Event', reason: mock_signal }
-    let(:mock_signal)     { double 'Signal', type: "dtmf" }
+    let(:mock_complete_event) { double Punchblock::Event::Complete, reason: mock_signal   }
+    let(:mock_signal)         { double Punchblock::Component::Input::Signal, type: "dtmf" }
 
     describe "#detect_tone" do
       context "when watching for a beep" do
@@ -95,12 +95,16 @@ module AdhearsionCpa
           and_return mock_component
 
         mock_component.should_receive(:register_event_handler).with Punchblock::Component::Input::Signal do |&block|
-          @on_detect_block = block
+          @on_detect_signal_block = block
         end
+        mock_component.should_receive(:register_event_handler).with Punchblock::Event::Complete do |&block|
+          @on_detect_complete_block = block
+        end
+
         mock_call.should_receive(:write_and_await_response).with mock_component
       end
 
-      context "watches in the background" do
+      context "with :terminate set to true" do
         let(:expected_grammars) do
           [ Punchblock::Component::Input::Grammar.new(url: "urn:xmpp:rayo:cpa:dtmf:1?terminate=true") ]
         end
@@ -108,15 +112,16 @@ module AdhearsionCpa
         it "detects the dtmf" do
           detector = subject.detect_tone!(:dtmf, timeout: 0.02) { |tone| tone.type }
           detector.should == mock_component
+          mock_signal.should_receive(:is_a?).with(Punchblock::Component::Input::Signal).and_return true
           mock_signal.should_receive :type
-          @on_detect_block.call mock_signal
+          @on_detect_complete_block.call mock_complete_event
 
           mock_component.should_receive :stop!
           sleep 0.04
         end
       end
 
-      context " with :terminate set to false" do
+      context "with :terminate set to false" do
         let(:expected_grammars) do
           [ Punchblock::Component::Input::Grammar.new(url: "urn:xmpp:rayo:cpa:dtmf:1") ]
         end
@@ -126,11 +131,25 @@ module AdhearsionCpa
           detector.should == mock_component
 
           mock_signal.should_receive(:type).twice
-          @on_detect_block.call mock_signal
-          @on_detect_block.call mock_signal
+          @on_detect_signal_block.call mock_signal
+          @on_detect_signal_block.call mock_signal
 
           mock_component.should_receive :stop!
-          sleep 0.04
+          sleep 0.1
+        end
+
+        context "without a timeout" do
+          it "doesn't ever stop.." do
+            detector = subject.detect_tone!(:dtmf, terminate: false) { |tone| tone.type }
+            detector.should == mock_component
+
+            mock_signal.should_receive(:type).twice
+            @on_detect_signal_block.call mock_signal
+            @on_detect_signal_block.call mock_signal
+
+            mock_component.should_not_receive :stop!
+            sleep 0.04
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion_cpa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -172,4 +172,3 @@ summary: A plugin for adding cpa to Adhearsion
 test_files:
 - spec/adhearsion_cpa/controller_methods_spec.rb
 - spec/spec_helper.rb
-has_rdoc: