ibm_watson 0.20.1 → 1.0.0.rc1

data/test/unit/test_text_to_speech_v1.rb

@@ -55,10 +55,15 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "stream.watsonplatform.net"
         }
       ).to_return(status: 200, body: voices_response.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::TextToSpeechV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
     service_response = service.list_voices
     assert_equal(voices_response, service_response.result)
 
@@ -94,10 +99,15 @@ class TextToSpeechV1Test < Minitest::Test
     response = {
       "pronunciation" => "pronunciation info"
     }
-    service = IBMWatson::TextToSpeechV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
     stub_request(:get, "https://stream.watsonplatform.net/text-to-speech/api/v1/pronunciation?text=this%20is%20some%20text")
       .with(
         headers: {
@@ -143,10 +153,15 @@ class TextToSpeechV1Test < Minitest::Test
 
   def test_custom_voice_models
     response = { "customizations" => "yep" }
-    service = IBMWatson::TextToSpeechV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
     stub_request(:get, "https://stream.watsonplatform.net/text-to-speech/api/v1/customizations")
       .with(
         headers: {
@@ -232,10 +247,15 @@ class TextToSpeechV1Test < Minitest::Test
 
   def test_custom_words
     response = { "customizations" => "yep" }
-    service = IBMWatson::TextToSpeechV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
     stub_request(:get, "https://stream.watsonplatform.net/text-to-speech/api/v1/customizations/custid/words")
       .with(
         headers: {
@@ -313,10 +333,15 @@ class TextToSpeechV1Test < Minitest::Test
   end
 
   def test_delete_user_data
-    service = IBMWatson::TextToSpeechV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
     stub_request(:delete, "https://stream.watsonplatform.net/text-to-speech/api/v1/user_data?customer_id=id")
       .with(
         headers: {

data/test/unit/test_tone_analyzer_v3.rb

@@ -25,11 +25,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     service_response = service.tone(tone_input: tone_text, content_type: "application/json")
     assert_equal(expected_response.status, service_response.status)
     assert_equal(expected_response.result, service_response.result)
@@ -56,11 +59,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     service_response = service.tone(tone_input: tone_text, content_type: "application/json", sentences: false)
     assert_equal(expected_response.status, service_response.status)
     assert_equal(expected_response.result, service_response.result)
@@ -86,11 +92,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     utterances = [
       {
         "text" => "I am very happy",
@@ -128,11 +137,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 400, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     begin
       service.tone(tone_input: text, content_type: "application/json")
     rescue IBMWatson::ApiException => e
@@ -160,11 +172,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Custom-Header-One" => "yes"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     service_response = service.headers(
       "Custom-Header-One" => "yes",
       "Content-Type" => "Custom/Type"
@@ -188,11 +203,14 @@ class ToneAnalyzerV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: tone_response.to_json, headers: headers)
-    service = IBMWatson::ToneAnalyzerV3.new(
-      version: "2017-09-21",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::ToneAnalyzerV3.new(
+      version: "2017-09-21",
+      authenticator: authenticator
+    )
     service_response = service.tone(tone_input: tone_text, content_type: "application/json")
     assert_equal(tone_response, service_response.result)
   end

data/test/unit/test_vcap_using_personality_insights.rb

@@ -27,8 +27,10 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
     service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13"
+      version: "2017-10-13",
+      authenticator: authenticator
     )
     service_response = service.profile(
       accept: "application/json",
@@ -60,8 +62,10 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
     service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13"
+      version: "2017-10-13",
+      authenticator: authenticator
     )
     service_response = service.profile(
       accept: "application/json",
@@ -95,8 +99,10 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response, headers: headers)
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
     service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13"
+      version: "2017-10-13",
+      authenticator: authenticator
     )
     service_response = service.profile(
       content: personality_text,
@@ -133,8 +139,10 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: profile_response.to_json, headers: headers)
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
     service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13"
+      version: "2017-10-13",
+      authenticator: authenticator
     )
     service_response = service.profile(
       accept: "application/json",

data/test/unit/test_visual_recognition_v3.rb

@@ -9,10 +9,13 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the Visual Recognition V3 Service
 class VisualRecognitionV3Test < Minitest::Test
   def test_get_classifier
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
-      version: "2018-03-19"
+      version: "2018-03-19",
+      authenticator: authenticator
     )
-    service.iam_access_token(iam_access_token: "bogus_access_token")
     response = {
       "classifier_id" => "bogusnumber",
       "name" => "Dog Breeds",
@@ -40,9 +43,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_delete_classifier
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v3/classifiers/bogusnumber?version=2018-03-19")
       .with(
@@ -59,9 +65,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_list_classifiers
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     response = {
       "classifiers" =>
@@ -91,9 +100,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_create_classifier
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     response = {
       "classifier_id" => "DogBreeds_2014254824",
@@ -130,9 +142,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_update_classifier
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     response = {
       "classifier_id" => "bogusid",
@@ -170,9 +185,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_classify
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     response = {
       "images" =>
@@ -240,9 +258,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_detect_faces
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     response = {
       "images" => [
@@ -304,9 +325,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_delete_user_data
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v3/user_data?customer_id=id&version=2018-03-19")
       .with(
@@ -323,9 +347,12 @@ class VisualRecognitionV3Test < Minitest::Test
   end
 
   def test_get_core_ml_model
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "bogus_access_token"
+    )
     service = IBMWatson::VisualRecognitionV3.new(
       version: "2018-03-19",
-      iam_access_token: "bogus_access_token"
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v3/classifiers/classifierid/core_ml_model?version=2018-03-19")
       .with(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +318,6 @@ files:
 - test/unit/test_tone_analyzer_v3.rb
 - test/unit/test_vcap_using_personality_insights.rb
 - test/unit/test_visual_recognition_v3.rb
-- test/unit/test_watson_service.rb
 homepage: https://www.github.com/watson-developer-cloud
 licenses:
 - Apache-2.0
@@ -337,11 +336,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Official client library to use the IBM Watson Services

data/test/unit/test_watson_service.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require("json")
-require_relative("./../test_helper.rb")
-require("webmock/minitest")
-
-WebMock.disable_net_connect!(allow_localhost: true)
-
-# Unit tests for the watson_service
-class WatsonServiceTest < Minitest::Test
-  def test_wrong_username
-    assert_raises do
-      IBMWatson::AssistantV2.new(
-        username: "\"username",
-        password: "password"
-      )
-    end
-  end
-
-  def test_wrong_apikey
-    assert_raises do
-      IBMWatson::AssistantV1.new(
-        iam_apikey: "{apikey"
-      )
-    end
-  end
-
-  def test_wrong_url
-    assert_raises do
-      IBMWatson::AssistantV1.new(
-        iam_apikey: "apikey",
-        url: "url}"
-      )
-    end
-  end
-
-  def test_correct_creds
-    service = IBMWatson::AssistantV1.new(
-      username: "username",
-      password: "password"
-    )
-    refute_nil(service)
-  end
-
-  def test_set_credentials_from_path_in_env
-    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
-    ENV["IBM_CREDENTIALS_FILE"] = file_path
-    service = IBMWatson::VisualRecognitionV3.new
-    assert_equal(service.url, "https://gateway.ronaldo.com")
-    refute_nil(service)
-    ENV.delete("IBM_CREDENTIALS_FILE")
-  end
-
-  def test_set_credentials_when_no_file
-    service = IBMWatson::AssistantV1.new
-    assert_equal(service.url, "https://gateway.watsonplatform.net/assistant/api")
-    refute_nil(service)
-  end
-end