ibm_watson 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c59d5cb848103dc98e1b488bc062d495989460a6e79e98db003355801b85de2
-  data.tar.gz: 444e6be50d0c784cb164dfa0794aab63d90ef6a002936e1c593b523451acbfb8
+  metadata.gz: 6cc1b9f91b2361fcc08435b17ed79e5f7b969e31471fefa78150253b4f1bac00
+  data.tar.gz: 5f56854edbe1136ba2211bb921efeb640646a38d56f751461c45ae75cd09b7a5
 SHA512:
-  metadata.gz: 64144c6053163dbb90b811d0bf631c8e4c110775df5290f87523d3ce24ca263f15c8d8f7a28dcdbf3171f8a15d881d897feb553ef20c05b162e85ee6b3f9633d
-  data.tar.gz: 9aa760289079ef8e17b738abfd883fabea4c0cd4131e446c7719171ab0358e1fb93c687d460f4434b3983716526845836e635043bbc044cb03625cbbfd7d5271
+  metadata.gz: cb694116948f8db7a8419428f4b81e2d5ed9244214f6ce336e447fdf0ffe1bfd699cc29e81d1b611aae217961abca06373b53ec133441ad995edbb98522d6097
+  data.tar.gz: 9100b72cb2b7c7f64948e4a99b0a36f9f8c7e44671a1ee5915121274af995eb97eafcb54abaa845db1dbd94756bfb33f3611fae369e3c3b3e0cfa86000ce4144

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -533,7 +533,7 @@ module IBMWatson
         "redaction" => redaction
       }
       options.delete_if { |_, v| v.nil? }
-      WebSocketClient.new(audio: audio, chunk_data: chunk_data, options: options, recognize_callback: recognize_callback, url: url, headers: headers)
+      WebSocketClient.new(audio: audio, chunk_data: chunk_data, options: options, recognize_callback: recognize_callback, url: url, headers: headers, disable_ssl_verification: @disable_ssl_verification)
     end
 
     # :nocov:

data/lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

data/lib/ibm_watson/websocket/speech_to_text_websocket_listener.rb

@@ -11,7 +11,7 @@ TEN_MILLISECONDS = 0.01
 
 # Class for interacting with the WebSocket API
 class WebSocketClient
-  def initialize(audio: nil, chunk_data:, options:, recognize_callback:, url:, headers:)
+  def initialize(audio: nil, chunk_data:, options:, recognize_callback:, url:, headers:, disable_ssl_verification: false)
     @audio = audio
     @options = options
     @callback = recognize_callback
@@ -24,6 +24,7 @@ class WebSocketClient
     @mic_running = false
     @data_size = audio.nil? ? 0 : @audio.size
     @queue = Queue.new
+    @disable_ssl_verification = disable_ssl_verification
   end
 
   def start
@@ -77,7 +78,12 @@ class WebSocketClient
 
     EM&.reactor_thread&.join
     EM.run do
-      @client = Faye::WebSocket::Client.new(@url, nil, headers: @headers)
+      if @disable_ssl_verification
+        @url = @url.sub("wss:", "ws:")
+        @client = Faye::WebSocket::Client.new(@url, nil, tls: { verify_peer: false, fail_if_no_peer_cert: false }, headers: @headers)
+      else
+        @client = Faye::WebSocket::Client.new(@url, nil, headers: @headers)
+      end
       @client.onclose = on_close
       @client.onerror = on_error
       @client.onmessage = on_message

data/test/integration/test_speech_to_text_v1.rb

@@ -162,7 +162,8 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
 
     def test_recognize_websocket_as_chunks
       audio_file = File.open(Dir.getwd + "/resources/speech.wav")
-      mycallback = MyRecognizeCallback.new
+      atomic_boolean = Concurrent::AtomicBoolean.new
+      mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
       speech = @service.recognize_using_websocket(
         chunk_data: true,
         recognize_callback: mycallback,
@@ -186,7 +187,8 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
 
     def test_recognize_websocket
       audio_file = File.open(Dir.getwd + "/resources/speech.wav")
-      mycallback = MyRecognizeCallback.new
+      atomic_boolean = Concurrent::AtomicBoolean.new
+      mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
       speech = @service.recognize_using_websocket(
         audio: audio_file,
         recognize_callback: mycallback,

data/test/unit/test_configure_http_client.rb

@@ -140,7 +140,7 @@ class HTTPConfigTest < Minitest::Test
     assert_equal(expected_timeouts, timeout)
   end
 
-  def test_disable_ssl
+  def test_disable_ssl_verification
     service = IBMWatson::NaturalLanguageUnderstandingV1.new(
       version: "2018-03-16",
       username: "username",

data/test/unit/test_speech_to_text_v1.rb

@@ -89,6 +89,37 @@ class SpeechToTextV1Test < Minitest::Test
     refute_nil(service_response)
   end
 
+  def test_recognize_using_websocket_disable_ssl_verification
+    service = IBMWatson::SpeechToTextV1.new(
+      username: "username",
+      password: "password"
+    )
+
+    audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+    stub_request(:post, "ws://stream.watsonplatform.net/speech-to-text/api/v1/recognize")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Content-Type" => "audio/l16; rate=44100",
+          "Host" => "stream.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: "", headers: { "Content-Type" => "application/json" })
+
+    atomic_boolean = Concurrent::AtomicBoolean.new
+    mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
+    service.configure_http_client(disable_ssl_verification: true)
+    speech = service.recognize_using_websocket(
+      audio: audio_file,
+      recognize_callback: mycallback,
+      inactivity_timeout: 1,
+      content_type: "audio/l16; rate=44100"
+    )
+    thr = Thread.new { speech.start }
+    thr.join
+    assert(atomic_boolean.true?)
+  end
+
   def test_get_model
     service = IBMWatson::SpeechToTextV1.new(
       username: "username",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Max Nussbaum