ibm-watson-ruby 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0c86b0b88c44a474376bd43b2e110b7754eaf6
-  data.tar.gz: 3893a7d6cde18e060f477c3ca86e0c4fb05934d1
+  metadata.gz: 3d3195bcccad976df212074781bf31e7fb7294f2
+  data.tar.gz: 53ae05cbe93970afd40ac57f370637c598c532bd
 SHA512:
-  metadata.gz: 10a8affa0eebe3ee715faea64bb6971ffe5510792c52dc778f28bebcf9dde7276c067d634275cb1d82462d5ad29903171f5abb247761089cc8e8f3609489dfd9
-  data.tar.gz: fa69dfa4a1759f60ff34ca9749aabc11664f273b0650b9e48bd658031289290a0e6a4d01abd848a88a860d9a4baf9cd675984dac9c3eba4fcd816b7bbd12cbd5
+  metadata.gz: '09568b6872472b87bcbb9a397b0ba3ea08098f2e07cfe256168d29f434fb96d5dd5016ba96f8d9f7381d3f900d8f1b26cbc4769d141761df222b2d4194eda9cb'
+  data.tar.gz: 7784a1b32ca4976ed65def28915db96057b6f44c9f8cbb62daf5f2312ae0f35f0292b1bb9576119cdb86973197cc86a90740af7627724eab3ff7494e3c0aa029

data/.env.example

@@ -0,0 +1,10 @@
+# Use your own credentials
+IBM_WATSON_CONVERSATION_USERNAME=xxx
+IBM_WATSON_CONVERSATION_PASSWORD=yyy
+
+# the VCR examples kinda need this workspace id to match
+IBM_WATSON_WORKSPACE_ID=9c9b5bb9-9841-4c08-a69b-1af8797c74c8
+IBM_WATSON_WORKSPACE_ID_TO_DELETE=c6f27505-bc6c-4914-bd8d-b570d8ff2720
+
+IBM_WATSON_NLU_USERNAME=xxx
+IBM_WATSON_NLU_PASSWORD=yyy

data/Gemfile

@@ -2,14 +2,3 @@ source 'https://rubygems.org'
 ruby "~> 2.3.0"
 
 gemspec
-
-gem 'http'
-gem 'active_attr'
-
-group :test, :development do
-  gem 'dotenv'
-  gem 'rspec'
-  gem 'rspec-middlewares'
-  gem 'vcr'
-  gem 'webmock'
-end

data/ibm-watson-ruby.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "http", "~> 2.0"
   gem.add_dependency "active_attr", '~> 0.10'
   gem.add_dependency "active_attr_extended", "~> 0.9"
+  gem.add_dependency "activesupport"
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'
@@ -28,4 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
   gem.add_development_dependency 'rspec-middlewares'
   gem.add_development_dependency 'vcr'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'dotenv'
+  gem.add_development_dependency 'pry'
 end

data/lib/ibm_watson.rb

@@ -1,8 +1,16 @@
 require 'active_attr'
 require 'active_attr_extended'
 
-require 'ibm_watson/version'
-require 'ibm_watson/base_model'
-require 'ibm_watson/base_service'
-require 'ibm_watson/errors'
-require 'ibm_watson/conversation'
+require 'active_support'
+
+module IBMWatson
+  extend ActiveSupport::Autoload
+
+  autoload :VERSION
+  autoload :BaseModel
+  autoload :BaseService
+  autoload :Errors
+
+  autoload :Conversation
+  autoload :NLU
+end

data/lib/ibm_watson/base_model.rb

@@ -2,5 +2,38 @@ module IBMWatson
   class BaseModel
     include ActiveAttr::Model
     include ActiveAttr::AttributeDefaults
+
+    # Support "Collection" attributes, eg:
+    #   attribute :foo, type: [String]
+    def typecaster_for(type)
+      if type.kind_of?(Array) && type.length == 1 && type.first.is_a?(Class)
+        item_type = type.first
+        lambda do |value|
+          value.map { |item|
+            unless item.is_a?(item_type)
+              item = item_type.new(item)
+            end
+            item
+          }
+        end
+      else
+        super
+      end
+    end
+
+    # By default add all collection attributes are considered as if they were associations
+    # this will make sure that `as_json` is called on them properly
+    def as_json(options = nil)
+      options ||= {}
+      options[:include] = self.class.collection_attribute_names
+      super(options)
+    end
+
+    # All [BaseModel] typed attributes are considered here
+    def self.collection_attribute_names
+      attributes.select { |name, attribute|
+        attribute[:type].present? && attribute[:type].is_a?(Array) && attribute[:type].first <= BaseModel
+      }.map { |name, attribute| name }
+    end
   end
 end

data/lib/ibm_watson/conversation.rb

@@ -1,11 +1,12 @@
 module IBMWatson
   module Conversation
+    extend ActiveSupport::Autoload
+
+    autoload :Service
+    autoload :MessageResponse
+    autoload :RuntimeIntent
+    autoload :Intent
+    autoload :DialogNode
+    autoload :Workspace
   end
 end
-
-require_relative 'conversation/service'
-require_relative 'conversation/intent_result'
-require_relative 'conversation/result'
-require_relative 'conversation/intent'
-require_relative 'conversation/dialog_node'
-require_relative 'conversation/workspace'

data/lib/ibm_watson/conversation/intent.rb

@@ -4,7 +4,7 @@ module IBMWatson
       attribute :intent, type: String
       attribute :created, type: String
       attribute :updated, type: String
-      attribute :examples, type: Array
+      attribute :examples, type: [Hash]
       attribute :description
     end
   end

data/lib/ibm_watson/conversation/message_response.rb

@@ -0,0 +1,12 @@
+module IBMWatson
+  module Conversation
+    class MessageResponse < IBMWatson::BaseModel
+      attribute :entities, type: [RuntimeEntity]
+      attribute :input
+      attribute :output
+      attribute :context
+      attribute :alternate_intents
+      attribute :intents, type: [RuntimeIntent]
+    end
+  end
+end

data/lib/ibm_watson/conversation/runtime_entity.rb

@@ -0,0 +1,10 @@
+module IBMWatson
+  module Conversation
+    class RuntimeEntity < IBMWatson::BaseModel
+      attribute :entity, type: String
+      attribute :location, type: [Integer]
+      attribute :value, type: String
+      attribute :confidence, type: Float
+    end
+  end
+end

data/lib/ibm_watson/conversation/{intent_result.rb → runtime_intent.rb}

@@ -1,6 +1,6 @@
 module IBMWatson
   module Conversation
-    class IntentResult < IBMWatson::BaseModel
+    class RuntimeIntent < IBMWatson::BaseModel
       attribute :intent, type: String
       attribute :confidence, type: Float
     end

data/lib/ibm_watson/conversation/service.rb

@@ -30,7 +30,7 @@ module IBMWatson
       end
 
       def delete_workspace(workspace_id:)
-        url = build_url('workspaces', workspace_id, query: { version: QUERY_VERSION})
+        url = build_url('workspaces', workspace_id, query: { version: QUERY_VERSION })
         result = accept_json(basic_auth).delete(url)
         verify_http_result(result)
       end
@@ -49,7 +49,7 @@ module IBMWatson
         }
         result = accept_json(basic_auth).post(url, json: params)
         verify_http_result(result)
-        IBMWatson::Conversation::Result.new.tap do |result_object|
+        IBMWatson::Conversation::MessageResponse.new.tap do |result_object|
           result_object.from_json(result)
         end
       end

data/lib/ibm_watson/conversation/workspace.rb

@@ -9,12 +9,10 @@ module IBMWatson
       attribute :updated, type: String
       attribute :workspace_id, type: String
       attribute :status, type: String
-      attribute :intents, type: ::IBMWatson::Conversation::Intent,
-                typecaster: lambda { |values| values.map { |value| ::IBMWatson::Conversation::Intent.new(value) }}
-      attribute :entities, type: Array
-      attribute :counterexamples, type: Array
-      attribute :dialog_nodes, type: ::IBMWatson::Conversation::DialogNode,
-                typecaster: lambda { |values| values.map { |value|  ::IBMWatson::Conversation::DialogNode.new(value)}}
+      attribute :intents, type: [Intent]
+      attribute :entities, type: [Hash]
+      attribute :counterexamples, type: [Hash]
+      attribute :dialog_nodes, type: [DialogNode]
     end
   end
 end

data/lib/ibm_watson/errors.rb

@@ -1,7 +1,12 @@
 module IBMWatson
   module Errors
-    class WatsonError < StandardError; end
-    class WatsonRequestError < WatsonError; end
-    class WatsonServerError < WatsonError; end
+    class WatsonError < StandardError
+    end
+
+    class WatsonRequestError < WatsonError
+    end
+
+    class WatsonServerError < WatsonError
+    end
   end
 end

data/lib/ibm_watson/nlu.rb

@@ -0,0 +1,8 @@
+module IBMWatson
+  module NLU
+    extend ActiveSupport::Autoload
+
+    autoload :Service
+    autoload :AnalyzeResult
+  end
+end

data/lib/ibm_watson/nlu/analyze_result.rb

@@ -0,0 +1,25 @@
+module IBMWatson
+  module NLU
+    class AnalyzeResult < IBMWatson::BaseModel
+      class Keyword < IBMWatson::BaseModel
+        attribute :text, type: String
+        attribute :relevance, type: Float
+      end
+
+      attribute :language, type: String
+      attribute :analyzed_text, type: String
+      attribute :retrieved_url, type: String
+      attribute :usage # no examples of this, so don't know type
+
+      attribute :concepts, type: [Hash]
+      attribute :categories, type: [Hash]
+      attribute :emotion, type: Hash
+      attribute :entities, type: [Hash]
+      attribute :keywords, type: [Keyword]
+      attribute :metadata, type: Hash
+      attribute :relations, type: [Hash]
+      attribute :semantic_roles, type: [Hash]
+      attribute :sentiment, type: Hash
+    end
+  end
+end

data/lib/ibm_watson/nlu/service.rb

@@ -0,0 +1,49 @@
+module IBMWatson
+  module NLU
+    class Service < IBMWatson::BaseService
+      version "v1"
+      url "https://gateway.watsonplatform.net/natural-language-understanding/api"
+      QUERY_VERSION = "2017-02-27"
+
+      class FeatureDefinition
+
+      end
+
+      def analyze_text(text, language: 'en', keywords: false)
+        # additional parameters not being implemented:
+        #  - html (analyzing html)
+        #  - url (analyzing urls)
+        #  - clean (not sure what it does yet)
+
+        features = {}
+        features[:keywords] = {} if keywords
+        # Features not implemented yet:
+        # - concepts
+        # - categories
+        # - emotion
+        # - entities
+        # - metadata
+        # - relations
+        # - semantic_roles
+        # - sentiment
+
+        parameters = {
+          text: text,
+          language: language,
+          # return_analyzed_text: true,
+          features: features,
+        }
+
+        url = build_url('analyze', query: { version: QUERY_VERSION })
+        result = accept_json(basic_auth).post(url, json: parameters)
+
+        verify_http_result(result)
+
+        IBMWatson::NLU::AnalyzeResult.new.tap do |result_object|
+          result_object.from_json(result)
+        end
+      end
+
+    end
+  end
+end

data/lib/ibm_watson/version.rb

@@ -1,3 +1,3 @@
 module IBMWatson
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/ibm_watson_ruby.rb

@@ -0,0 +1,3 @@
+# This is just a stub to help rubygems find the include file on its own
+
+require_relative 'ibm_watson'

data/spec/ibm_watson/conversation/service_spec.rb

@@ -2,14 +2,11 @@ require 'spec_helper'
 require 'ibm_watson'
 
 describe IBMWatson::Conversation::Service, record: :none do
-  subject(:service) { described_class.new(username: username, password: password) }
   let(:username) { ENV['IBM_WATSON_CONVERSATION_USERNAME'] }
   let(:password) { ENV['IBM_WATSON_CONVERSATION_PASSWORD'] }
   let(:workspace_id) { ENV['IBM_WATSON_WORKSPACE_ID'] }
   let(:delete_workspace_id) { ENV['IBM_WATSON_WORKSPACE_ID_TO_DELETE'] }
-  subject(:service) do
-    described_class.new(username: username, password: password)
-  end
+  subject(:service) { described_class.new(username: username, password: password) }
 
   describe "#message" do
     before do
@@ -40,7 +37,7 @@ describe IBMWatson::Conversation::Service, record: :none do
 
     example do
       result = subject.message(workspace_id: workspace_id, input: "Awesome!", context: context)
-      expect(result.intents.first).to be_a_kind_of(IBMWatson::Conversation::IntentResult)
+      expect(result.intents.first).to be_a_kind_of(IBMWatson::Conversation::RuntimeIntent)
       expect(result.intents.as_json).to eq expected_intents
       expect(result.context).to be_a_kind_of(Hash)
       expect(result.context.as_json).to eq(expected_context_json)
@@ -94,9 +91,7 @@ describe IBMWatson::Conversation::Service, record: :none do
 
   describe "#delete_workspace" do
     example do
-       expect {
-         subject.delete_workspace(workspace_id: delete_workspace_id)
-       }.not_to raise_error
+      subject.delete_workspace(workspace_id: delete_workspace_id)
     end
   end
 end

data/spec/ibm_watson/nlu/service_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'ibm_watson'
+
+describe IBMWatson::NLU::Service, record: :once do
+  subject(:service) { described_class.new(username: username, password: password) }
+  let(:username) { ENV['IBM_WATSON_NLU_USERNAME'] }
+  let(:password) { ENV['IBM_WATSON_NLU_PASSWORD'] }
+
+  describe "keyword extraction" do
+    example do
+      result = service.analyze_text("sure, I'll bite. My name is Kieran", keywords: true)
+
+      expect(result.keywords).to be_a_kind_of(Array)
+      expect(result.keywords.length).to eq(1)
+      expect(result.keywords[0].as_json).to eq({ "relevance" => 0.970239, "text" => "Kieran" })
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
-require 'rspec'
-require 'middleware'
-require 'rspec-middlewares'
-require 'vcr'
+require 'bundler/setup'
+Bundler.require :default, :development
 require 'dotenv/load'
 
 RSpec.configure do |config|

data/spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_create_workspace_.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/9c9b5bb9-9841-4c08-a69b-1af8797c74c8?export=true&version=2017-02-03
+    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/c6f27505-bc6c-4914-bd8d-b570d8ff27208?export=true&version=2017-02-03
     body:
       encoding: US-ASCII
       string: ''
@@ -68,7 +68,7 @@ http_interactions:
   recorded_at: Thu, 06 Apr 2017 22:45:40 GMT
 - request:
     method: get
-    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/80738bb6-bc71-433a-b0b4-88f15ee01b3b?export=true&version=2017-02-03
+    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/c6f27505-bc6c-4914-bd8d-b570d8ff2720?export=true&version=2017-02-03
     body:
       encoding: US-ASCII
       string: ''

data/spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_delete_workspace_.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: delete
-    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/e8c1caa7-2e28-4c7c-be5a-5422c420c899?version=2017-02-03
+    uri: https://gateway.watsonplatform.net/conversation/api/v1/workspaces/c6f27505-bc6c-4914-bd8d-b570d8ff2720?version=2017-02-03
     body:
       encoding: US-ASCII
       string: ''

data/spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_message_.yml

@@ -242,7 +242,7 @@ http_interactions:
         how I am","previous_sibling":"Say hello"},{"go_to":null,"output":{"text":{"values":["Sure.
         Sounds good.","Okay. No problem.","Glad to hear it."],"selection_policy":"random"}},"parent":null,"context":null,"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"#no_problem","description":null,"dialog_node":"Tell
         me everything is okay","previous_sibling":"Asks a property question"},{"go_to":null,"output":{"choices":{"choices":[{"body":"Like
-        this?"}],"template":"realtor/intro_question_one"},"template":"realtor/intro"},"parent":null,"context":{"introduced":true,"initial_question":"\u003c?input.text?\u003e"},"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"$introduced
+        this?"}],"template":"realtor/intro_question_one"},"template":"realtor/intro"},"parent":null,"context":{"introduced":true,"initial_question":"<?input.text?>"},"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"$introduced
         == false","description":null,"dialog_node":"Introduce the Bot","previous_sibling":"Ask
         who I am"},{"go_to":{"return":null,"selector":"body","dialog_node":"Clear
         initial question"},"output":{"text":{"values":["Sure! You asked ''$initial_question'',
@@ -264,7 +264,7 @@ http_interactions:
         approve. I''m ready for your questions now."],"selection_policy":"sequential"}},"parent":"Like
         that.","context":null,"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"#thumbs_down","description":null,"dialog_node":"Thumbs
         Down","previous_sibling":"Thumbs Up"},{"go_to":{"return":null,"selector":"condition","dialog_node":"Talk
-        to my boss"},"output":{"message_template":"realtor/intro"},"parent":null,"context":{"listing":"none","introduced":false,"initial_question":"\u003c?input.text?\u003e"},"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"conversation_start","description":null,"dialog_node":"Conversation
+        to my boss"},"output":{"message_template":"realtor/intro"},"parent":null,"context":{"listing":"none","introduced":false,"initial_question":"<?input.text?>"},"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"conversation_start","description":null,"dialog_node":"Conversation
         Starts","previous_sibling":null},{"go_to":{"return":null,"selector":"condition","dialog_node":"Talk
         to my boss"},"output":{"text":{"values":[],"selection_policy":"sequential"}},"parent":"Introduce
         the Bot","context":null,"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"#talk_to_my_boss","description":null,"dialog_node":"Talk
@@ -297,7 +297,7 @@ http_interactions:
         I''ll search for @property-type less than than @sys-number for you.  Might
         be a few minutes."],"selection_policy":"sequential"}},"parent":"Ask about
         homes","context":null,"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"@property-type:home
-        \u0026\u0026 @under-filter:under \u0026\u0026 @sys-number","description":null,"dialog_node":"node_4_1489443566378","previous_sibling":"node_8_1489424344276"},{"type":"response_condition","go_to":null,"output":{"text":{"values":["The
+        && @under-filter:under && @sys-number","description":null,"dialog_node":"node_4_1489443566378","previous_sibling":"node_8_1489424344276"},{"type":"response_condition","go_to":null,"output":{"text":{"values":["The
         home I have for sale is 3520 willows road."],"selection_policy":"sequential"}},"parent":"Ask
         about homes","context":null,"created":"2017-03-25T00:48:38.808Z","updated":"2017-03-25T00:48:38.808Z","metadata":null,"conditions":"
         @property-type:home","description":null,"dialog_node":"node_9_1489424359166","previous_sibling":"node_4_1489443566378"},{"type":"response_condition","go_to":null,"output":{"text":{"values":["Yes,

data/spec/vcr_cassettes/ibm_watson/nlu/service/ibm_watson_nlu_service_keyword_extraction_.yml

@@ -0,0 +1,66 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://gateway.watsonplatform.net/natural-language-understanding/api/v1/analyze?version=2017-02-27
+    body:
+      encoding: UTF-8
+      string: '{"text":"sure, I''ll bite. My name is Kieran","language":"en","features":{"keywords":{}}}'
+    headers:
+      Accept:
+      - application/json
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=UTF-8
+      Host:
+      - gateway.watsonplatform.net
+      User-Agent:
+      - http.rb/2.2.1
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Backside-Transport:
+      - OK OK
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Thu, 13 Apr 2017 19:45:28 GMT
+      X-Request-Id:
+      - n06mov7ud0bcnk7r66n8341l8ktt3skt
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Content-Type:
+      - application/json;charset=utf-8
+      Server:
+      - "-"
+      Set-Cookie:
+      - Watson-DPAT=qzhOiFUiHa7cAHj4sTZsl1E7IgiZ2OJf30q9zfLpP8%2FwxM5Db9jOyL6qKc4VgIWphye%2FDOLsNeNUS5eVoQxx8tM%2BfI%2BLtMHl831DouJrmWKMEqFRUC0oYt8PrOtAp%2BhL2rBgIzb30egtL733g4WbzH7B5ZUuznEehmsPCHZO8G9UNT39dr7YtNcrmQAVaOKp4ZRuBlshu%2Fxrcp94hsKdc%2BsCe4hsNXFH64DM9HhPig4SbnYLy4EhfPQCpn9Of17LEJnl5LUOA%2FpJ43x72QjvcA%2F1qL%2BZvNGAp00oLvxHulOlCRw1LJHE%2FekQgehQTIZHzxYNcg7YVzcq9zak%2B4D63lZ0cBR3z8MMlrYnXTqpBQC16VVG%2F1PrPwP8uhl93VXwiyN%2FQtKbyifcAPKriOvXzKDX93e5agPp6sotply9X%2B%2Bry01teq4qO9rCtafOLJiXcwRzqfIbv4%2FMS7fTjkmWvrikwHlWSJlQup9mIVcuJMpkC6YKtuFvdLPRe9ANQ7jsplvLTdOyUL9hTwy8logTTEhflRwPNwkjZ%2BkQ2zvzxXneGu8HAAmyzl4u8XtzcWVdrG6X6Xs4rFdwyqKnPq2Tfl2iqHp7x5rVwPmO5SklqU5so%2BgAehpLM34uDm5CRviNHlMtBKKFLPpHxoiR85zQTlKez01gPf3AjX8pXJ2sU%2B4bcUfsILUXTY1SIFzz3boZaXZPlLsa%2BJJzb2NTWbbENiWN9nJPiMFUx1REVA1u%2BVxeegCaajUbCq2a85M%2B1RNMoGmCDrRNnU9jpiinmMEw%2BH5mYGheSZOqQm2PS2gfKrc%2BDIFtyX3RFtpBOEwSX78fuWwYgAf1uaevROkA7R17BGsCRwcyLMr1BmNLUzZvasBT8GdOwlHH15ErrCvDEyPiWb8HSGFPpmiqKk%2Bko3%2Ba67g8YZRGZImvnj8aHTeZLlZN%2FxBqQAh3eEIAaNAkSqyw1GIR1SpapgA%3D;
+        path=/natural-language-understanding/api; secure; HttpOnly
+      X-Client-Ip:
+      - 50.67.27.28
+      X-Global-Transaction-Id:
+      - '725228624'
+      Strict-Transport-Security:
+      - max-age=31536000;
+      X-Dp-Watson-Tran-Id:
+      - gateway-dp01-725228624
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "language": "en",
+          "keywords": [
+            {
+              "text": "Kieran",
+              "relevance": 0.970239
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 13 Apr 2017 19:45:29 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm-watson-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bram Whillock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,12 +150,55 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "."
 email: bramski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -153,14 +210,20 @@ files:
 - lib/ibm_watson/conversation.rb
 - lib/ibm_watson/conversation/dialog_node.rb
 - lib/ibm_watson/conversation/intent.rb
-- lib/ibm_watson/conversation/intent_result.rb
-- lib/ibm_watson/conversation/result.rb
+- lib/ibm_watson/conversation/message_response.rb
+- lib/ibm_watson/conversation/runtime_entity.rb
+- lib/ibm_watson/conversation/runtime_intent.rb
 - lib/ibm_watson/conversation/service.rb
 - lib/ibm_watson/conversation/workspace.rb
 - lib/ibm_watson/errors.rb
+- lib/ibm_watson/nlu.rb
+- lib/ibm_watson/nlu/analyze_result.rb
+- lib/ibm_watson/nlu/service.rb
 - lib/ibm_watson/version.rb
+- lib/ibm_watson_ruby.rb
 - spec/assets/poc_workspace.json
 - spec/ibm_watson/conversation/service_spec.rb
+- spec/ibm_watson/nlu/service_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_create_workspace_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_delete_workspace_.yml
@@ -168,6 +231,7 @@ files:
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_message_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_update_workspace_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_workspace_.yml
+- spec/vcr_cassettes/ibm_watson/nlu/service/ibm_watson_nlu_service_keyword_extraction_.yml
 homepage: https://github.com/imrealtor/watson-ruby
 licenses:
 - MIT
@@ -195,6 +259,7 @@ summary: IBM Watson services in ruby
 test_files:
 - spec/assets/poc_workspace.json
 - spec/ibm_watson/conversation/service_spec.rb
+- spec/ibm_watson/nlu/service_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_create_workspace_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_delete_workspace_.yml
@@ -202,3 +267,4 @@ test_files:
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_message_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_update_workspace_.yml
 - spec/vcr_cassettes/ibm_watson/conversation/service/ibm_watson_conversation_service_workspace_.yml
+- spec/vcr_cassettes/ibm_watson/nlu/service/ibm_watson_nlu_service_keyword_extraction_.yml

data/lib/ibm_watson/conversation/result.rb

@@ -1,24 +0,0 @@
-module IBMWatson
-  module Conversation
-    class Result < IBMWatson::BaseModel
-      attribute :entities
-      attribute :input
-      attribute :output
-      attribute :context
-      attribute :alternate_intents
-
-      def intents=(values)
-        @intents = values.map do |value|
-          ::IBMWatson::Conversation::IntentResult.new(value)
-        end
-      end
-      attr_reader :intents
-
-      def as_json(*)
-        super.merge({
-          "intents" => intents.as_json
-        })
-      end
-    end
-  end
-end