ibm-watson-ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22c57a538c81cb9e7236c70393a4d65c15eda0b
-  data.tar.gz: fef067989c2dbad59f9d3dac6fe561fd61d69853
+  metadata.gz: a674a4fac536056ef2d77c05563611891f96c851
+  data.tar.gz: 65216150eda4a68e5b4c48e65731d1f36f268496
 SHA512:
-  metadata.gz: 482aad19fdbaabc80e8b96cfbe42209a09efa73ee4492d4e34dfd07a3d4019ced41c0ba0df324279d028d794e7a2b612048e582a2fad263a08135a1f0c92c3df
-  data.tar.gz: 9c47108fd1ce173dd8778a6b5c163577cc4b05c77c4d0ffe85a1e597620a9d51f3cc170e860db656f3dcc9cf8d6f09712bc4cdd8e83e1b72a81635b79fb709be
+  metadata.gz: d44956a095c2d4a24d3e50e2d777af4f09e3486c0727ca987357872f2f6a89849f5ec224f51d1ee813f822b2357ce4c16d251663cf49a8ea28dd5e769b8ae264
+  data.tar.gz: 79b8f541e4e55984077012cef9c87887d2e969d9111e3acb4430991ddc8ad648865fa65adc3026d8d5d5547f846ffb5a60c22746ca9984de9a21aa2ae6151810

data/lib/ibm_watson/conversation/result.rb

@@ -2,7 +2,7 @@ module IBMWatson
   module Conversation
     class Result < IBMWatson::BaseModel
       attribute :intents,
-                type: ::IBMWatson::Conversation::IntentResult,
+                type: [::IBMWatson::Conversation::IntentResult],
                 typecaster: lambda { |values|
                   values.map do |value|
                     ::IBMWatson::Conversation::IntentResult.new(value)
@@ -13,6 +13,12 @@ module IBMWatson
       attribute :output, type: Hash
       attribute :context, type: Hash
       attribute :alternate_intents
+
+      def as_json(*)
+        super.merge({
+          "intents" => intents.as_json
+        })
+      end
     end
   end
 end

data/lib/ibm_watson/version.rb

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

data/spec/ibm_watson/conversation/service_spec.rb

@@ -15,18 +15,26 @@ describe IBMWatson::Conversation::Service, record: :none do
       data = YAML.load_file('spec/assets/poc_workspace.json')
       subject.update_workspace(workspace_id: workspace_id, workspace_data: data)
     end
-    
+
     let(:expected_intents) { [{ "intent" => "express_delight", "confidence" => 0.99 }] }
     let(:expected_context_json) { { "conversation_id" => "b90a141a-14b0-48b5-aad3-f53454e93444",
                                     "system" => { "dialog_stack" => [{ "dialog_node" => "Introduce the Bot" }],
                                                   "dialog_turn_counter" => 1, "dialog_request_counter" => 1 },
                                     "listing" => "none", "introduced" => true, "initial_question" => "Awesome!" } }
-    let(:expected_output_json) { {"log_messages"=>[], "text"=>[], "nodes_visited"=>["Conversation Starts", "Introduce the Bot"], "message_template"=>"realtor/intro",
-                                  "choices"=>{"choices"=>[{"body"=>"Like this?"}], "template"=>"realtor/intro_question_one"}, "template"=>"realtor/intro"} }
+    let(:expected_output_json) { { "log_messages" => [], "text" => [], "nodes_visited" => ["Conversation Starts", "Introduce the Bot"], "message_template" => "realtor/intro",
+                                   "choices" => { "choices" => [{ "body" => "Like this?" }], "template" => "realtor/intro_question_one" }, "template" => "realtor/intro" } }
     let(:conversation_id) { "b90a141a-14b0-48b5-aad3-f53454e93444" }
     let(:context) {
       { conversation_id: conversation_id }
     }
+    let(:expected_result_json) { {
+      "alternate_intents" => false,
+      "context" => { "conversation_id" => "b90a141a-14b0-48b5-aad3-f53454e93444", "system" => { "dialog_stack" => [{ "dialog_node" => "Introduce the Bot" }], "dialog_turn_counter" => 1, "dialog_request_counter" => 1 }, "listing" => "none", "introduced" => true, "initial_question" => "Awesome!" },
+      "entities" => [],
+      "input" => { "text" => "Awesome!" },
+      "intents" => [{ "intent" => "express_delight", "confidence" => 0.99 }],
+      "output" => { "log_messages" => [], "text" => [], "nodes_visited" => ["Conversation Starts", "Introduce the Bot"], "message_template" => "realtor/intro", "choices" => { "choices" => [{ "body" => "Like this?" }], "template" => "realtor/intro_question_one" }, "template" => "realtor/intro" }
+    } }
 
 
     example do
@@ -37,18 +45,19 @@ describe IBMWatson::Conversation::Service, record: :none do
       expect(result.context.as_json).to eq(expected_context_json)
       expect(result.output).to be_a_kind_of(Hash)
       expect(result.output.as_json).to eq(expected_output_json)
+      expect(result.as_json).to eq(expected_result_json)
     end
   end
 
-  describe "#workspace", record: :all do
+  describe "#workspace" do
     example do
       result = subject.workspace(workspace_id: workspace_id, export: true)
       expect(result.intents.first).to be_a_kind_of(IBMWatson::Conversation::Intent)
       expect(result.dialog_nodes.first).to be_a_kind_of(IBMWatson::Conversation::DialogNode)
     end
   end
-  
-  describe "#update_workspace", record: :all do
+
+  describe "#update_workspace" do
     example do
       result = subject.workspace(workspace_id: workspace_id, export: true)
       workspace = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm-watson-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bram Whillock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: IBM Watson services in ruby