navi_client 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7810ed026c2d49433d2b0e25ac0fcd49cd2c15823bd44b2308d18c44d462f02
-  data.tar.gz: d24ddc1054dbdfc6c8c20ed2a458c9b2240a216caf5f9c775a8ec2d4adbede40
+  metadata.gz: 35a451ff83ce2920c09bcdafee34f8e4d22f9d11a44bc4bec4989954ff4ba56f
+  data.tar.gz: 3190e61415272e72b9a8cd0a093346689d090b31065de1d76f1ee32eae897ed3
 SHA512:
-  metadata.gz: ad4631fd864a936100708cdd5b66c25416ba0d47e6b7ffb65ffcdc0c4767038854820aa0369e7608df5483f22e6976e19c00b4e87b76f0b1b95c4431d322cd13
-  data.tar.gz: 96c3c79eced0d78cf52ed03585f4ee3478ee1938fbeabadeca1533577c6958b8394e7e5ce0929b04941f93fc8545f4cf05044986362f78469a7204603820d461
+  metadata.gz: 7019517eeb16bcf04bbe60603021fd8d47a16a871e9989c68b835e7e1d170318ed971ef8cbe5628ba29afc474ffa0cd2c822da17449b2a678c880640ab5e1d0b
+  data.tar.gz: f2db4f8ab1f38fdc531a0b34e2729d34621485545cb2afbf889904a8e81ae8867d79779faf027be8f36734cfa638eae4a716cef316447d9279d34c020cd1cd39

data/lib/client.rb

@@ -80,8 +80,8 @@ module Client
 
     message_ids = imap.uid_search(search_condition)
 
-    meta_dir = @download_path + config['username'] + '/meta/'
-    message_ids_saved = File.directory?(meta_dir) || @client_type == "cloud" ? (Dir.entries meta_dir).map { |i| i.split("_").first.to_i } : []
+    meta_dir = @download_path + 'meta/'
+    message_ids_saved = File.directory?(meta_dir) ? (Dir.entries meta_dir).map { |i| i.split("_").first.to_i } : []
 
     message_ids = message_ids - message_ids_saved
 

data/lib/cloud/navi_cloud_client.rb

@@ -58,6 +58,7 @@ module NaviClient
 
     def set_current_user_email(email)
       @current_user_email = email
+      @download_path = config[:s3_download_folder] + '/' + email + "/"
     end
 
     ##
@@ -69,7 +70,7 @@ module NaviClient
         filepath = download_path + "/inputs/" + (Time.now.to_f * 1000).to_s
         filename = upload_to_s3(filepath, in_filenames.join("\n"))
 
-        HTTPService::NaviAI.start(filepath: filename, client_id: @id, client_type: @client_type, token: @token)
+        HTTPService::NaviAI.start(filepath: filename, client_id: @id, client_type: @client_type, token: @token, email: @current_user_email)
       end
     end
 

data/lib/http_service/naviai.rb

@@ -3,12 +3,12 @@ require "httparty"
 module HTTPService
   class NaviAI
 
-    def self.start(filepath:, client_id: nil, client_type:, token:)
+    def self.start(filepath:, client_id: nil, client_type:, token:, email:)
       go_url = 'http://localhost:9090/v2/metas'
       if client_type == 'cloud'
         go_url = 'http://34.214.134.104:9090/v2/metas'
       end
-      HTTParty.post(go_url, body: { client_id: client_id, client_type: client_type, list_meta_path: filepath, token: token }.to_json)
+      HTTParty.post(go_url, body: { client_id: client_id, client_type: client_type, list_meta_path: filepath, token: token, email: email }.to_json)
     end
 
     def self.generate_csv(email)

data/lib/local/navi_local_client.rb

@@ -10,7 +10,7 @@ module NaviClient
     include Client
     CONFIG_PATH = File.join(ENV['HOME'], '/.navi/config.yml')
 
-    def initialize(sso_web_url = 'http://localhost:3008')
+    def initialize(sso_web_url = 'http://localhost:3008', client_type = "local")
       # flag to print Ruby library debug info (very detailed)
       @net_imap_debug = false
 
@@ -29,10 +29,10 @@ module NaviClient
       # authentication token received from sso_web used to authenticate the request to database_api
       @token = nil
 
-      @download_path = config['download_path']
+      @download_path = config['download_path'] + config['username'] + '/'
 
       # client_type
-      @client_type = "local"
+      @client_type = client_type
     end
 
     #
@@ -100,7 +100,7 @@ module NaviClient
           in_filenames.each { |element| f.puts(element) }
         end
 
-        HTTPService::NaviAI.start(filepath: filename, client_type: @client_type, token: @token)
+        HTTPService::NaviAI.start(filepath: filename, client_type: @client_type, token: @token, email: config['username'])
       end
     end
 

data/lib/navi_client/version.rb

@@ -1,3 +1,3 @@
 module NaviClient
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navi_client
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Sujit
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler