ibm_watson 0.9.2 → 0.10.0

data/test/integration/test_personality_insights_v3.rb

@@ -20,6 +20,7 @@ if !ENV["PERSONALITY_INSIGHTS_USERNAME"].nil? && !ENV["PERSONALITY_INSIGHTS_PASS
         }
       )
       service_response = service.profile(
+        accept: "application/json",
         content: personality_text,
         content_type: "text/plain;charset=utf-8"
       )
@@ -40,6 +41,7 @@ if !ENV["PERSONALITY_INSIGHTS_USERNAME"].nil? && !ENV["PERSONALITY_INSIGHTS_PASS
         }
       )
       service_response = service.profile(
+        accept: "application/json",
         content: personality_text,
         content_type: "application/json",
         raw_scores: true,
@@ -86,6 +88,7 @@ if !ENV["PERSONALITY_INSIGHTS_USERNAME"].nil? && !ENV["PERSONALITY_INSIGHTS_PASS
         }
       )
       service_response = service.profile(
+        accept: "application/json",
         content: personality_text,
         content_type: "text/plain;charset=utf-8",
         content_language: "es",

data/test/integration/test_visual_recognition_v3.rb

@@ -47,7 +47,7 @@ if !ENV["VISUAL_RECOGNITION_IAM_APIKEY"].nil? && !ENV["VISUAL_RECOGNITION_IAM_UR
       trucks = File.open(Dir.getwd + "/resources/trucks.zip")
       classifier = @service.create_classifier(
         name: "CarsVsTrucks",
-        cars_positive_examples: cars,
+        positive_examples: { cars: cars },
         negative_examples: trucks
       ).result
       refute(classifier.nil?)

data/test/unit/test_compare_comply_v1.rb

@@ -0,0 +1,289 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./../test_helper.rb")
+require("webmock/minitest")
+SimpleCov.command_name "test:unit"
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+# Unit tests for the Watson Assistant V1 Service
+class CompareComplyV1 < Minitest::Test
+  def test_convert_to_html
+    # service.set_default_headers("x-watson-learning-opt-out" => true)
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/html_conversion").with do |req|
+      # Test the headers.
+      assert_equal(req.headers["Accept"], "application/json")
+      assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
+    end
+    service.convert_to_html(
+      file: file
+    )
+    service.convert_to_html(
+      file: "dummy",
+      filename: "file"
+    )
+  end
+
+  def test_classify_elements
+    # service.set_default_headers("x-watson-learning-opt-out" => true)
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/element_classification").with do |req|
+      assert_equal(req.headers["Accept"], "application/json")
+      assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
+      assert_match(/Content-Disposition: form-data/, req.body)
+    end
+    service.classify_elements(
+      file: file
+    )
+    service.classify_elements(
+      file: "dummy",
+      filename: "file"
+    )
+  end
+
+  def test_extract_tables
+    # service.set_default_headers("x-watson-learning-opt-out" => true)
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/tables").with do |req|
+      assert_equal(req.headers["Accept"], "application/json")
+      assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
+      assert_match(/Content-Disposition: form-data/, req.body)
+    end
+    service.extract_tables(
+      file: file
+    )
+    service.extract_tables(
+      file: "dummy",
+      filename: "file"
+    )
+  end
+
+  def test_compare_documents
+    # service.set_default_headers("x-watson-learning-opt-out" => true)
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/comparison").with do |req|
+      assert_equal(req.headers["Accept"], "application/json")
+      assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
+      assert_match(/Content-Disposition: form-data/, req.body)
+    end
+    service.compare_documents(
+      file_1: file,
+      file_2: file
+    )
+    service.compare_documents(
+      file_1: "dummy data",
+      file_1_filename: "file1",
+      file_2: "dummy data",
+      file_2_filename: "file1"
+    )
+  end
+
+  def test_list_feedback
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = {
+      "feedback" => [
+        {
+          "feedback_id" => "another_one",
+          "text" => "we the best music"
+        }
+      ]
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+
+    service_response = service.list_feedback
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_add_feedback
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = {
+      "feedback_id" => "another_one"
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+
+    service_response = service.add_feedback(
+      feedback_data: "we the best music"
+    )
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_get_feedback
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = {
+      "feedback_id" => "messi"
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+
+    service_response = service.get_feedback(
+      feedback_id: "messi"
+    )
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_delete_feedback
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = "200"
+    stub_request(:delete, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response, headers: {})
+
+    service_response = service.delete_feedback(
+      feedback_id: "messi"
+    )
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_create_batch
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches?function=tables")
+      .with do |req|
+        assert_equal req.headers["Accept"], "application/json"
+        assert_match %r{\Amultipart/form-data}, req.headers["Content-Type"]
+      end
+
+    service.create_batch(
+      function: "tables",
+      input_credentials_file: { key: "ip" },
+      input_bucket_location: "us",
+      input_bucket_name: "bucket",
+      output_credentials_file: { key: "op" },
+      output_bucket_location: "you",
+      output_bucket_name: "obucket"
+    )
+  end
+
+  def test_list_batches
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = {
+      "batches" => []
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+
+    service_response = service.list_batches
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_get_batch
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = "200"
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response, headers: {})
+
+    service_response = service.get_batch(
+      batch_id: "mo"
+    )
+    assert_equal(message_response, service_response.result)
+  end
+
+  def test_update_batch
+    service = IBMWatson::CompareComplyV1.new(
+      iam_apikey: "apikey",
+      iam_access_token: "token"
+    )
+    message_response = "200"
+    stub_request(:put, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo?action=goal")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Bearer token",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response, headers: {})
+
+    service_response = service.update_batch(
+      batch_id: "mo",
+      action: "goal"
+    )
+    assert_equal(message_response, service_response.result)
+  end
+end

data/test/unit/test_personality_insights_v3.rb

@@ -31,6 +31,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       password: "password"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "text/plain;charset=utf-8"
     )
@@ -52,6 +53,7 @@ class PersonalityInsightsV3Test < Minitest::Test
         }
       ).to_return(status: 200, body: { "profile" => "response" }.to_json, headers: headers)
     service_response = service.profile(
+      accept: "application/json",
       content: { "personality" => "text" },
       content_type: "application/json"
     )
@@ -81,6 +83,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       password: "password"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "application/json",
       raw_scores: true,
@@ -157,6 +160,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       password: "password"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "text/plain;charset=utf-8",
       content_language: "es",

data/test/unit/test_vcap_using_personality_insights.rb

@@ -31,6 +31,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "text/plain;charset=utf-8"
     )
@@ -63,6 +64,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "application/json",
       raw_scores: true,
@@ -135,6 +137,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13"
     )
     service_response = service.profile(
+      accept: "application/json",
       content: personality_text,
       content_type: "text/plain;charset=utf-8",
       content_language: "es",

data/test/unit/test_visual_recognition_v3.rb

@@ -116,15 +116,15 @@ class VisualRecognitionV3Test < Minitest::Test
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.create_classifier(
       name: "Cars vs Trucks",
-      classname_positive_examples: cars,
+      positive_examples: { cars: cars },
       negative_examples: trucks
     )
     assert_equal(response, service_response.result)
 
     service_response = service.create_classifier(
       name: "Cars vs Trucks",
-      cars_positive_examples: "cars",
-      cars_positive_examples_filename: "cars",
+      positive_examples: { cars: "cars" },
+      positive_examples_filename: { cars: "cars" },
       negative_examples: "trucks",
       negative_examples_filename: "trucks"
     )
@@ -158,15 +158,15 @@ class VisualRecognitionV3Test < Minitest::Test
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.update_classifier(
       classifier_id: "bogusid",
-      positive_positive_examples: "positive examples classname",
+      positive_examples: { example: "positive examples classname" },
       negative_examples: "negative examples"
     )
     assert_equal(response, service_response.result)
 
     service_response = service.update_classifier(
       classifier_id: "bogusid",
-      positive_positive_examples: "positive examples file",
-      positive_positive_examples_filename: "positive_filename",
+      positive_examples: { example: "positive examples classname" },
+      positive_examples_filename: { example: "positive_filename" },
       negative_examples: "negative examples",
       negative_examples_filename: "negative_filename"
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -246,6 +246,7 @@ files:
 - lib/ibm_watson.rb
 - lib/ibm_watson/assistant_v1.rb
 - lib/ibm_watson/assistant_v2.rb
+- lib/ibm_watson/compare_comply_v1.rb
 - lib/ibm_watson/detailed_response.rb
 - lib/ibm_watson/discovery_v1.rb
 - lib/ibm_watson/iam_token_manager.rb
@@ -266,6 +267,7 @@ files:
 - test/appveyor_status.rb
 - test/integration/test_assistant_v1.rb
 - test/integration/test_assistant_v2.rb
+- test/integration/test_compare_comply_v1.rb
 - test/integration/test_discovery_v1.rb
 - test/integration/test_iam_assistant_v1.rb
 - test/integration/test_language_translator_v3.rb
@@ -279,6 +281,7 @@ files:
 - test/test_helper.rb
 - test/unit/test_assistant_v1.rb
 - test/unit/test_assistant_v2.rb
+- test/unit/test_compare_comply_v1.rb
 - test/unit/test_configure_http_client.rb
 - test/unit/test_discovery_v1.rb
 - test/unit/test_iam_token_manager.rb