watson-assistant 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64e0346348a5061e8991030b46ad9b354e13f6fbbbc010a550647b80c4ccfd6
-  data.tar.gz: 8c44a215c328cde4390d5c3948de14311e591613f23ec6ad5a6ba6be25fd870b
+  metadata.gz: c7ee9693b9ba30e8f47c2593223454ea6abafb606b74cfdb3f1a5598438fd1b7
+  data.tar.gz: d2c70aeabbae5a0091a647e2f4ba0a94c7732eed4951730abded88d168d6b617
 SHA512:
-  metadata.gz: 5627c957be62c43d0e7a8b7016d3cd33367cec06e7f64bafef06e64786dfec268bdb3d97137f62e42fa14cce86b79e52fd2ee6a3c02d031383e980f676047607
-  data.tar.gz: 200ddd3c09a1b25d8202282d2a6c146b7c79c3bd809754e7b235c65d229b33cce47feac540618a64fcac057c98289bf947cba723db042512188e7fba73552eaf
+  metadata.gz: f89ad65776d04ab7c301fce0e432110b4f85325f2c8870700b02b479893aac4ac1c9cc4f900f000477164e31f11633625c03bfa785abe50f0ea8e73ca651a35e
+  data.tar.gz: '09f5bc7341ec7a0c75a1b8d6fafd0f939c172aa8d3285a05d7b3569257c3a0e982c9c08736703e70ea27ab9571cd3724a757607ec16fddb5b60df85a1b543f47'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watson-assistant (1.0.4)
+    watson-assistant (1.0.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/watson/assistant/dialog.rb

@@ -6,16 +6,14 @@ module Watson
 
     class Dialog      
       def initialize(config)
-        username = config[:username]
-        password = config[:password]
+        auth = config[:auth]
         workspace_id = config[:workspace_id]
         region = config[:region] || "gateway.watsonplatform.net"
- 
-        url = "https://#{username}:#{password}@#{region}/assistant/api"
-        version="2018-02-16"
+
+        url = "https://#{auth}@#{region}/assistant/api"
+        version = "2018-02-16"
         @endpoint = "#{url}/v1/workspaces/#{workspace_id}/message?version=#{version}"
       end
-
     
       def talk(question, context)
         if context == ""

data/lib/watson/assistant/manager.rb

@@ -6,11 +6,25 @@ module Watson
   module Assistant
     class Manager
       def initialize(config)
-        storage = config[:storage] || "hash"
-        @cnv = Dialog.new(
-          config
+        @config = config
+        check = check_config()
+
+        if check == true
+          create_dialog()
+          prepare_storage()
+       end
+
+      end
+
+      def create_dialog
+        @dlg = Dialog.new(
+          @config
         )
-      
+      end
+
+
+      def prepare_storage
+        storage = @config[:storage] || "hash"
         if storage == "hash"
           @users = Hash.new
         else
@@ -19,8 +33,28 @@ module Watson
       end
 
 
-      def users()
-        @users
+      def check_config()
+        if @config[:apikey]
+          if @config[:username] || @config[:password]
+            puts "Error: 'Both API key' and 'Username and Password' are used"
+            return false
+          end
+          @config[:auth] = "apikey:#{@config[:apikey]}"
+
+        elsif @config[:username] && @config[:password]
+          @config[:auth] = "#{@config[:username]}:#{@config[:password]}"
+
+        else
+          puts "Error: Not authorized"
+          return false
+        end
+
+        return true
+      end
+
+
+      def has_dlg?
+        return @dlg
       end
 
 
@@ -38,9 +72,9 @@ module Watson
         future_data = nil
 
         if @users.has_key?(user) == false
-          code, body = @cnv.talk("", "")
+          code, body = @dlg.talk("", "")
         else
-          code, body = @cnv.talk(question, context = @users.fetch(user))
+          code, body = @dlg.talk(question, context = @users.fetch(user))
         end
 
         if code == 200

data/lib/watson/assistant/version.rb

@@ -1,5 +1,5 @@
 module Watson
   module Assistant
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-assistant
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - alpha.netzilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,8 @@ files:
 - bin/console
 - bin/setup
 - lib/watson/assistant.rb
+- lib/watson/assistant/.dialog.rb.swp
+- lib/watson/assistant/.manager.rb.swp
 - lib/watson/assistant/dialog.rb
 - lib/watson/assistant/manager.rb
 - lib/watson/assistant/version.rb