watson-conversation 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0e117d6dce11dd2e1ff1b95395a8e5a497f19c
-  data.tar.gz: 9ca1cf55e74bb19cce4f0562fb4fac8bead51911
+  metadata.gz: f8500f42f435bf34b7533cf729703621dff4e367
+  data.tar.gz: 867e0c1def23362ab8fdc668964e96cda7fe1706
 SHA512:
-  metadata.gz: cd1587082622e36e950fbe09e3ce1f423624d0b01878d96181dd023f2caeb00fa699374a41a26da73d30971ebea8172ad2a71f15870e0a35c4be7d06e584bc45
-  data.tar.gz: 123649e1ff064298bca871a4d24956d258155e9e689c475140a0039f106bcb1390b2eb4f794dee3926a63bd0283b65c674e5d50b2e7a589c8f6a5c051d697d74
+  metadata.gz: e8f79b51b8b56e1ab25592d394affb42f6ee7aa0b0c00a446b7ea6420296d87576380b373cce154b2be95abaccaa8fd8d58da3cdc89ebb52b1f98dee9c9cd34f
+  data.tar.gz: 355c63ca5868c884bc540dd934eb6e1a228035bfe9d20ecb3f5134fcff288936e0e5f0afdfc7fac1d8d55f67f5baf3920a93db8aae3fdda2317314dcd9e29d44

data/README.md

@@ -26,10 +26,12 @@ require 'watson/conversation'
 manage = Watson::Conversation::ManageDialog.new(
   username: [username],
   password: [password],
-  workspace_id: [workspace_id]
+  workspace_id: [workspace_id],
+	# Where to link the freely-selected user name with the conversation_id
+	storage: "hash" or "uri for redis like 'redis://127.0.0.1:6379'"
 )
 
-# Get a greet message from a conversation system.
+# Get a greet message from a conversation service.
 puts response1 = manage.talk("user1", "")
 #=> {user: user1, status_code: 200, output: [\"What would you like me to do?\"]}
 
@@ -38,12 +40,10 @@ puts response2 = manage.talk("user1", "I would like you to ...")
 #=> {user: user1, status_code: 200, output: [\"I help you ...\"]}
 
 # Check if the user exists
-puts manage.has_user?("user1")
-#=> {"code":true, "description":"shinya exists."}
+puts manage.has_key?("user1")
 
 # Delete the user
-puts manage.delete_user("user1")
-#=> {"code":0,"description":"user1 was deleted."}
+puts manage.delete("user1")
 ```
 
 ## Development

data/lib/watson/conversation.rb

@@ -2,6 +2,8 @@ require "watson/conversation/version"
 require 'rest-client'
 require "json"
 require "thread"
+require "redis"
+
 
 
 module Watson
@@ -11,7 +13,6 @@ module Watson
 			def initialize(username: "", password: "", workspace_id: "")
 				url = "https://#{username}:#{password}@gateway.watsonplatform.net/conversation/api"
 				version="2016-07-11"
-				
 				@endpoint = "#{url}/v1/workspaces/#{workspace_id}/message?version=#{version}"
 			end
 
@@ -30,7 +31,6 @@ module Watson
 						context: context,
 					}.to_json
 				end
-				
 
 				Thread.start do
 					begin
@@ -41,14 +41,14 @@ module Watson
 						code = e.response.code
 						body = e.response.body
 					end
-					future_data.setRealData(code, body)
+					future_data.set_real_data(code, body)
 				end
 	
 				return future_data
 			end
 
 
-			def getData()
+			def get_data()
 				return code, body
 			end
 		end
@@ -64,9 +64,9 @@ module Watson
 			end
 
 
-			def setRealData(code, body)
+			def set_real_data(code, body)
 				@mutex.synchronize do
-					if (@is_ready == true)
+					if @is_ready == true
 						return
 					end
 				end
@@ -78,9 +78,9 @@ module Watson
 			end
 
 
-			def getData()
+			def get_data()
 				@mutex.synchronize do
-					while (@is_ready == false)
+					while @is_ready == false
 						@cv.wait(@mutex)
 					end
 				end
@@ -88,56 +88,64 @@ module Watson
 			end
 		end
 
-				
 
-		class ManageDialog
-			def initialize(username: "", password: "", workspace_id: "")
-				@mutex = Mutex.new
 
+
+		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
 				)
 			
-				@users = {}
-			end
+				if storage == "hash"
+					@users = Hash.new
+				else
+					@users = Redis.new(:url => storage)
+				end
 
+				@mutex = Mutex.new
+			end
 
-			def has_user?(user)
-				@mutex.synchronize do
-					if @users.has_key?(user)
-						{code: true, description: "#{user} exists."}.to_json
-					else	
-						{code: false, description: "#{user} does not exists."}.to_json
-					end
-				end
+			def users
+				@users
 			end
 
 
-			def delete_user(user)
-				if @users.has_key?(user)
-					@mutex.synchronize do
-						@users.delete(user)
-					end
-					{code: 0, description: "#{user} was deleted."}.to_json
-				else
-					{code: 1, description: "#{user} does not exist."}.to_json
-				end
-			end
-		
-		
 			def talk(user, question)
 				future_data = nil
-				@mutex.synchronize do
-					if @users.key?(user) == false
-						future_data = @cnv.talk("", "")
-					else
-						future_data = @cnv.talk(question, context = @users[user])
-					end
+
+				if @users.has_key?(user) == false
+					future_data = @cnv.talk("", "")
+				else
+					future_data = @cnv.talk(question, context = @users.fetch(user))
 				end
 
-				code, response = future_data.getData()	
+				code, response = future_data.get_data()	
 
 				output_texts = []
 				if code == 200
@@ -147,13 +155,10 @@ module Watson
 					end
 				end
 
-
-				@mutex.synchronize do
-					if code == 200
-						@users[user] = context
-					else
-						@users.delete(user)
-					end
+				if code == 200
+					@users.store(user, context)
+				else
+					@users.delete(user)
 				end
 
 				return {user: user, status_code: code, output: output_texts}.to_json

data/lib/watson/conversation/version.rb

@@ -1,5 +1,5 @@
 module Watson
   module Conversation
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/watson-conversation.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rest-client", "~> 2.0"
   spec.add_development_dependency "json", "~> 2.0"
+  spec.add_development_dependency "redis", "~> 3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-conversation
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - alpha.netzilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Client library to use the IBM Watson Conversation service
 email:
 - alpha.netzilla@gmail.com