signalwire 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71faeeb60f034a4e12e5389161bd930b76be463ab5bbff6d4c8cc34732d66f2c
-  data.tar.gz: 14661cf2afbe90123ad580a96bdf9e25ee77a1b5ea77caa6abb49515beb3f53f
+  metadata.gz: 617cfadba260ca55f6a9930c26eca415a3db201fdad4165a86f6c06955a98471
+  data.tar.gz: e78dc8b25ac1cd28e0252962497ed620aa9794635b23b1fc72347b1458e79dfb
 SHA512:
-  metadata.gz: 8043e8fd96285a6bd4e4263c8825901f52e85123566fa588860f5ecf178d588cb1fb0c420d3e67701df99cf032875b93ea74e42c37c30395256e4fe10ce1ae38
-  data.tar.gz: 2dd59c3fca26721d5060a1c12774e58353394c449521c2359a94b05574b4da6ea85c0c2fa2c321aa15051e2778bfadc178971dbd81abb9703914b39f7f054448
+  metadata.gz: 9ca9a848b357a319f84ec836fb73a75a99e5054064fbdf59ffcb44da615b0009df676da2c8abd434062747888618016220e8f016b35682808ebf3acab2a51df4
+  data.tar.gz: f367464b5544df04e67828765a16c5368af055eb1e24328f9e8a97d93ebac5105a8ebcd840cdee984a257825e9363c49d7f5d791b636ba7e830286962374ad54

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [2.3.3] - 2020-03-09
+### Fixed
+- `record` correctly set up for terminators now.
+- Make AMD more usable and less complex.
+- AMD now returns immediately in `wait_for_beep` mode if it detects a human.
+-  Relax `gemspec` dependencies.
+
 ## [2.3.2] - 2020-01-29
 ### Fixed
 - Correctly return AMD result in Relay.

data/examples/relay/outbound_amd.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+%w[
+  bundler/setup
+  signalwire
+].each { |f| require f }
+
+# Set logging to debug for testing
+Signalwire::Logger.logger.level = ::Logger::DEBUG
+
+class OutboundConsumer < Signalwire::Relay::Consumer
+  def ready
+    logger.info 'Dialing out'
+    call = client.calling.new_call(from: ENV['FROM_NUMBER'], to: ENV['TO_NUMBER'])
+    call.dial
+    result = call.amd(timeout: 10, wait_for_beep: true)
+    pp "---------------------------------- Detect AM result was:"
+    pp result.type
+    pp result.result
+    pp result.successful
+
+    call.hangup
+  rescue StandardError => e
+    logger.error e.inspect
+    logger.error e.backtrace
+  end
+end
+
+OutboundConsumer.new.run

data/examples/relay/outbound_collect_speech.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+%w[
+  bundler/setup
+  signalwire
+].each { |f| require f }
+
+# Set logging to debug for testing
+Signalwire::Logger.logger.level = ::Logger::DEBUG
+
+class OutboundConsumer < Signalwire::Relay::Consumer
+  def ready
+    dial_result = client.calling.new_call(from: ENV['FROM_NUMBER'], to: ENV['TO_NUMBER']).dial
+    tts = [{ type: 'tts', params: { text: 'Say something funny!' } }]
+    result = dial_result.call.prompt collect: {speech: {language: 'en-US'}}, play: tts
+    dial_result.call.play_tts text: "You ordered #{result.result} hamburgers. Thank you!"
+    dial_result.call.hangup
+  # this makes it so the errors don't stop the process
+  rescue StandardError => e
+    logger.error e.inspect
+    logger.error e.backtrace
+  end
+end
+
+OutboundConsumer.new.run

data/examples/relay/outbound_record.rb

@@ -16,6 +16,7 @@ class OutboundConsumer < Signalwire::Relay::Consumer
     call.dial
     call.play_tts text: 'please leave your message after the beep. Press pound when done.'
     result = call.record(beep: true, terminators: "#")
+    sleep 1 # wait for recording to be uploaded
     call.play_tts text: 'you said:'
     call.play_audio result.url
     call.hangup

data/lib/signalwire/relay/calling/call.rb

@@ -389,7 +389,7 @@ module Signalwire::Relay::Calling
         speech_obj[:language] = args[:speech_language] if args[:speech_language]
         speech_obj[:hints] = args[:speech_hints] if args[:speech_hints]
         speech_obj[:end_silence_timeout] = args[:end_silence_timeout] if args[:end_silence_timeout]
-        collect[:digits] = digits_obj
+        collect[:speech] = speech_obj
       end
 
       collect

data/lib/signalwire/relay/calling/call_convenience_methods.rb

@@ -90,7 +90,6 @@ module Signalwire::Relay::Calling
       collect = compile_collect_arguments(args) if collect.nil? && collect_p.nil?
 
       set_parameters(binding, %i{collect text language gender volume}, %i{collect text})
-
       prompt(collect: collect, play: tts_payload(text, language, gender), volume: volume)
     end
 

data/lib/signalwire/relay/calling/call_detect_methods.rb

@@ -3,8 +3,7 @@ module Signalwire::Relay::Calling
 
     def detect(type:, **args)
       component = build_detect_component(type, args)
-      component.wait_for(Relay::CallDetectState::MACHINE, Relay::CallDetectState::HUMAN,
-        Relay::CallDetectState::UNKNOWN, Relay::CallDetectState::CED, Relay::CallDetectState::CNG)
+      component.wait_for(Relay::CallDetectState::CED, Relay::CallDetectState::CNG)
       DetectResult.new(component: component)
     end
 

data/lib/signalwire/relay/calling/component/detect.rb

@@ -4,7 +4,23 @@ module Signalwire::Relay::Calling
   class Detect < ControlComponent
     attr_reader :result, :type
 
-    FINISHED_EVENTS = [Relay::CallDetectState::FINISHED, Relay::CallDetectState::ERROR]
+    FINISHED_EVENTS = [
+      Relay::CallDetectState::FINISHED, 
+      Relay::CallDetectState::ERROR,
+      Relay::CallDetectState::READY,
+      Relay::CallDetectState::NOT_READY,
+      Relay::CallDetectState::MACHINE,
+      Relay::CallDetectState::HUMAN,
+      Relay::CallDetectState::UNKNOWN
+    ]
+
+    READY_EVENTS = [
+      Relay::CallDetectState::FINISHED, 
+      Relay::CallDetectState::ERROR,
+      Relay::CallDetectState::READY,
+      Relay::CallDetectState::HUMAN
+    ]
+
     MACHINE_EVENTS = [Relay::CallDetectState::READY, Relay::CallDetectState::NOT_READY]
 
     def initialize(call:, detect:, wait_for_beep: false, timeout: 30)
@@ -38,26 +54,22 @@ module Signalwire::Relay::Calling
       detect_result = event.call_params[:detect]
       @type = detect_result[:type]
       params = detect_result[:params]
-      res_event = params[:event]
-      @state = res_event
-
-      return complete(event) if FINISHED_EVENTS.include?(@state) || @type == Relay::CallDetectType::DIGIT
+      @state = params[:event]
 
-      if has_blocker?
-        @received_events << @state
-        return
-      end
+      # if we are detecting digits we are done
+      return complete(event) if @type == Relay::CallDetectType::DIGIT
 
-      if @waiting_for_ready
-        return (@state == Relay::CallDetectState::READY ? complete(event) : nil)
-      end
-
-      if (@wait_for_beep && @state == Relay::CallDetectState::MACHINE)
-        @waiting_for_ready = true
-        return
+      if @type == 'machine'
+        if @wait_for_beep
+          return complete(event) if READY_EVENTS.include?(@state)
+        else
+          return complete(event) if FINISHED_EVENTS.include?(@state)
+        end
+      else
+        check_for_waiting_events
       end
-
-      check_for_waiting_events
+      
+      @received_events << @state
       broadcast_event(event)
     end
 
@@ -71,20 +83,10 @@ module Signalwire::Relay::Calling
     def complete(event)
       @completed = true
       @event = event
+      @result = @state
 
-      if has_blocker?
-        @successful = @state == Relay::CallDetectState::FINISHED
-
-        if MACHINE_EVENTS.include?(@state)
-          @result = Relay::CallDetectState::MACHINE
-        else
-          @result = @state
-        end
-        unblock(event)
-      else
-        @result = @received_events.join(',')
-        @successful = @state != Relay::CallDetectState::ERROR
-      end
+      @successful = @state != Relay::CallDetectState::ERROR
+      unblock(event) if has_blocker?
     end
   end
 end

data/lib/signalwire/relay/calling/component/record.rb

@@ -51,7 +51,7 @@ module Signalwire::Relay::Calling
     end
 
     def after_execute(execute_event)
-      @url = execute_event.call_params[:url]
+      @url = execute_event.dig(:params, :params, :params, :url)
     end
   end
 end

data/lib/signalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Signalwire
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/signalwire.gemspec

@@ -25,20 +25,20 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'bundler-audit', '~> 0.6.1'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rdoc', '~> 6.1.1'
+  spec.add_development_dependency 'bundler-audit', '~> 0.6'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rdoc', '~> 6.1'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.67.2'
-  spec.add_development_dependency 'ruby-prof', '~> 0.17.0'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
-  spec.add_development_dependency 'vcr', '~> 4.0.0'
-  spec.add_development_dependency 'webmock', '~> 3.5.1'
+  spec.add_development_dependency 'rubocop', '~> 0.67'
+  spec.add_development_dependency 'ruby-prof', '~> 0.17'
+  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'vcr', '~> 4.0'
+  spec.add_development_dependency 'webmock', '~> 3.5'
 
   spec.add_dependency 'twilio-ruby', '~> 5.0'
-  spec.add_dependency 'faye-websocket', '~> 0.10.9'
-  spec.add_dependency 'concurrent-ruby', '~> 1.1.5'
+  spec.add_dependency 'faye-websocket', '~> 0.10'
+  spec.add_dependency 'concurrent-ruby', '~> 1.1'
   spec.add_dependency 'has-guarded-handlers', '~> 1.6.3'
-  spec.add_dependency 'logger', '~> 1.3.0'
+  spec.add_dependency 'logger', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalwire
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - SignalWire Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,70 +100,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: '0.67'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 description: 
 email:
 - open.source@signalwire.com
@@ -262,7 +262,9 @@ files:
 - examples/relay/inbound_send_digits.rb
 - examples/relay/messaging/messaging_receive.rb
 - examples/relay/messaging/messaging_send.rb
+- examples/relay/outbound_amd.rb
 - examples/relay/outbound_collect.rb
+- examples/relay/outbound_collect_speech.rb
 - examples/relay/outbound_consumer.rb
 - examples/relay/outbound_detect.rb
 - examples/relay/outbound_record.rb