watson-assistant 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34ec00470ba489bfb761007e1d47196dc7467d6fd2cd637811842d84ac70e89
-  data.tar.gz: 5ad3c782d225e9e9fbe2837da5306d73d5cd97ba352d68406f010f791455ef11
+  metadata.gz: d0f42066725c714943c166bbdc840d5daec03fd20d7388112a9923ed659f7a44
+  data.tar.gz: 9ec171368bb3de5f3d5b3e2a0bdefde0d7d646ee44540f4d24b38f1f25a11482
 SHA512:
-  metadata.gz: a70c552eae26b1bd5b971d960f2e55951edd155c17d4e476419b4c602c3da95f0742f2ec142d24fca6aafcd30699aa76ccf5c1a38d51e5818f2babd6ccc3794d
-  data.tar.gz: fd79a8e5b940844edf401a1044ec2fe899df1b064705cbe6179a17f683a705342df122405741064af909421d8d4517d735bd97976f9e284e440316f4b80832b5
+  metadata.gz: a141a7e63bbb8e0dc0b42bf1b702d94283ad4d0534c5d56cc498197fd3ba17250bc45b8ce0235a4b67516c9e2f420adaadb793c866f006b4d4043d204d2c8d7f
+  data.tar.gz: 3e43bee62e27afd4280881124a261debd3711092b91701ea40290e547b802ee6d65465054b8ec47fcaea5cbb3196af633496664fb0577076c576c91b237dc349

data/Gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    watson-assistant (1.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    netrc (0.11.0)
+    rake (10.5.0)
+    redis (3.3.3)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  rake (~> 10.0)
+  redis (~> 3.3)
+  rest-client (~> 2.0)
+  rspec (~> 3.0)
+  watson-assistant!
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -19,18 +19,31 @@ Or install it yourself as:
     $ gem install watson-assistant
 
 ## Usage
+```sh
+export USERNAME="***"
+export PASSWORD="***"
+export WORKSPACE_ID="***"
+
+# Optional
+# Default region is "gateway.watsonplatform.net"
+export REGION="gateway.watsonplatform.net"
+
+# Optional
+# Default storage is ruby hash.
+# You can select ruby hash or a redis server for managing users.
+export STORAGE="hash" # Default
+#export STORAG="redis://127.0.0.1:6379"
+```
 
 ```ruby
 require 'watson/assistant'
 
 manage = Watson::Assistant::ManageDialog.new(
-  username: [username],
-  password: [password],
-  workspace_id: [workspace_id],
-  # Where to link the freely-selected user name with the conversation_id
-  storage: 'hash'  #means that you use Ruby hash. If you restart the app, the info will be disappeared.
-  # OR
-  storage: 'redis://127.0.0.1:6379'  #means that you use exteranl database like redis(This gem currently supports redis only).
+  username: ENV["USERNAME"],
+  password: ENV["PASSWORD"],
+  workspace_id: ENV["WORKSPACE_ID"],
+  region: ENV["REGION"],
+  storage: ENV["STORAGE"]
 )
 
 # Get a greet message from a assistant service.

data/lib/watson/assistant.rb

@@ -1,128 +1,6 @@
-require "watson/assistant/version"
 require 'rest-client'
 require "json"
 require "thread"
 require "redis"
+require "watson/assistant/manage"
 
-
-
-module Watson
-  module Assistant
-
-    class Dialog      
-      def initialize(username: "", password: "", workspace_id: "")
-        url = "https://#{username}:#{password}@gateway.watsonplatform.net/assistant/api"
-        version="2018-02-16"
-        @endpoint = "#{url}/v1/workspaces/#{workspace_id}/message?version=#{version}"
-      end
-
-    
-      def talk(question, context)
-        if context == ""
-          body = {}.to_json
-        else
-          body = {
-            input: {
-              text: question
-            },
-            alternate_intents: true,
-            context: context,
-          }.to_json
-        end
-
-        begin
-          response = RestClient.post @endpoint, body, content_type: :json, accept: :json
-          code = response.code
-          body = JSON.parse(response.body)
-        rescue RestClient::ExceptionWithResponse => e
-          code = e.response.code
-          body = JSON.parse(e.response.body)
-        end
-  
-        return code, body
-      end
-    end
-
-
-
-    class Redis < ::Redis
-      def fetch(user)
-        JSON.parse(get(user))
-      end
-
-
-      def store(user, data)
-        set(user, data.to_json)
-      end
-
-
-      def delete(user)
-        del(user)
-      end
-
-
-      def has_key?(user)
-        exists(user) 
-      end
-    end
-
-
-  
-    class ManageDialog
-      def initialize(username: "", password: "", workspace_id: "", storage: "hash")
-        @cnv = Dialog.new(
-          username: username,
-          password: password,
-          workspace_id: workspace_id
-        )
-      
-        if storage == "hash"
-          @users = Hash.new
-        else
-          @users = Redis.new(:url => storage)
-        end
-      end
-
-
-      def users()
-        @users
-      end
-
-
-      def has_key?(user) 
-        @users.has_key?(user)
-      end
-
-
-      def delete(user)
-        @users.delete(user)
-      end
-
-
-      def talk(user, question)
-        future_data = nil
-
-        if @users.has_key?(user) == false
-          code, body = @cnv.talk("", "")
-        else
-          code, body = @cnv.talk(question, context = @users.fetch(user))
-        end
-
-        if code == 200
-          context = body["context"]
-          output = body["output"]["text"]
-        else
-          output = body["error"]
-        end
-
-        if code == 200
-          @users.store(user, context)
-        else
-          @users.delete(user)
-        end
-
-        return {user: user, status_code: code, output: output}.to_json
-      end
-    end
-  end
-end

data/lib/watson/assistant/dialog.rb

@@ -0,0 +1,49 @@
+require 'rest-client'
+require 'json'
+
+module Watson
+  module Assistant
+
+    class Dialog      
+      def initialize(config)
+        username = config[:username]
+        password = config[:password]
+        workspace_id = config[:workspace_id]
+        region = config[:region] || "gateway.watsonplatform.net"
+ 
+        url = "https://#{username}:#{password}@#{region}/assistant/api"
+        version="2018-02-16"
+        @endpoint = "#{url}/v1/workspaces/#{workspace_id}/message?version=#{version}"
+      end
+
+    
+      def talk(question, context)
+        if context == ""
+          body = {}.to_json
+        else
+          body = {
+            input: {
+              text: question
+            },
+            alternate_intents: true,
+            context: context,
+          }.to_json
+        end
+
+        begin
+          response = RestClient.post @endpoint, body, content_type: :json, accept: :json
+          code = response.code
+          body = JSON.parse(response.body)
+        rescue RestClient::ExceptionWithResponse => e
+          code = e.response.code
+          body = JSON.parse(e.response.body)
+        end
+  
+        return code, body
+      end
+    end
+
+  end
+end
+
+

data/lib/watson/assistant/manage.rb

@@ -0,0 +1,86 @@
+require 'rest-client'
+require "json"
+require "watson/assistant/dialog"
+
+module Watson
+  module Assistant
+    class Manage
+      def initialize(config)
+        storage = config[:storage] || "hash"
+        @cnv = Dialog.new(
+          config
+        )
+      
+        if storage == "hash"
+          @users = Hash.new
+        else
+          @users = Redis.new(:url => storage)
+        end
+      end
+
+
+      def users()
+        @users
+      end
+
+
+      def has_key?(user) 
+        @users.has_key?(user)
+      end
+
+
+      def delete(user)
+        @users.delete(user)
+      end
+
+
+      def talk(user, question)
+        future_data = nil
+
+        if @users.has_key?(user) == false
+          code, body = @cnv.talk("", "")
+        else
+          code, body = @cnv.talk(question, context = @users.fetch(user))
+        end
+
+        if code == 200
+          context = body["context"]
+          output = body["output"]["text"]
+        else
+          output = body["error"]
+        end
+
+        if code == 200
+          @users.store(user, context)
+        else
+          @users.delete(user)
+        end
+
+        return {user: user, status_code: code, output: output}.to_json
+      end
+    end
+
+
+    class Redis < ::Redis
+      def fetch(user)
+        JSON.parse(get(user))
+      end
+
+
+      def store(user, data)
+        set(user, data.to_json)
+      end
+
+
+      def delete(user)
+        del(user)
+      end
+
+
+      def has_key?(user)
+        exists(user) 
+      end
+    end
+
+  end
+end

data/lib/watson/assistant/version.rb

@@ -1,5 +1,5 @@
 module Watson
   module Assistant
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-assistant
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - alpha.netzilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,12 +92,15 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/watson/assistant.rb
+- lib/watson/assistant/dialog.rb
+- lib/watson/assistant/manage.rb
 - lib/watson/assistant/version.rb
 - watson-assistant.gemspec
 homepage: https://github.com/alpha-netzilla/watson-assistant.git