navi_client 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64a81312f89b39114bd475b0742b210ae09c4ceaeb9f40602339fa1ee19a1e8
-  data.tar.gz: 89b65764d85e94e09fe00bf5ae890e77673d61ba11ec0d9052e523c887524a18
+  metadata.gz: 455132fb8d355d46bb9309a7616d6f293e640674612196f8b814c73924c40ef4
+  data.tar.gz: f7be2fcac208fa91cbc865223741a241e4d101d43d750feddd678392cb329f47
 SHA512:
-  metadata.gz: 906b815b2d1d63b52192181ce80ae0e073c9f62c18334befe666303d2453a364b5d55daa07140afda9f6b339c83ddcc3db7a966e0cd91d70140ac0420b606100
-  data.tar.gz: 487934bb4151ca197e6b38a1284189193b756c525b6de0c78462d6306ddd5040644b1afe619de25721d7304863f2edd46897358e27a6fb2c40d1e9c8290d565e
+  metadata.gz: 73d9a1109bcb3d6bc2167762e66304ca0189867c79faf9e609de89d935d5f6d78f113416c7323f3383caa8ce09dd2012c6ce09d7e8c863815d3a2a323909a5be
+  data.tar.gz: 1b3c23480c58316541d482c36317c7b95b268c3bf602142902d1d04b68cffccc2c46da942904c0ca6692bf8bcaeb9c9148f8d09ca1428eff413b9eb8d6940ebb

data/config/navi_client.sample.yml

@@ -0,0 +1,9 @@
+# Just copy paste the following format in application.yml and configure accordingly
+
+development:
+  api_url: http://localhost:3020/
+  parser_url: http://localhost:9090
+
+production:
+  parser_url: http://34.214.134.104:9090
+

data/lib/client.rb

@@ -131,7 +131,7 @@ module Client
   # Process each email downloaded from imap-server and creates meta file that will be sent over to the navi-ai service.
   # Meta will content information like: ['from', 'to', 'cc', ..., 'body_url']. This information is then used by navi-ai to parse the body content.
   #
-  def process_email(mail, uid)
+  def process_email(mail, uid, stamp = nil)
     meta = Hash.new
     custom_uid = (Time.now.to_f * 1000).to_s + "_" + mail.__id__.to_s
 
@@ -151,7 +151,12 @@ module Client
       meta.merge!(m) unless m.nil?
     end
 
-    save(meta, "meta/#{uid.to_s + '_' + custom_uid}")
+    if stamp.nil?
+      save(meta, "meta/#{uid.to_s + '_' + custom_uid}")
+    else
+      save(meta, "meta/#{uid.to_s + '_' + custom_uid}", stamp)
+    end
+
   end
 
   def encrypt(data)

data/lib/cloud/navi_cloud_client.rb

@@ -13,7 +13,7 @@ module NaviClient
 
     attr_reader :id
 
-    def initialize(sso_web_url = "http://localhost:3008/", env = "development")
+    def initialize(sso_web_url = ENV['api_url'], env = Rails.env)
       super()
 
       # client-id used to track the process

data/lib/http_service/naviai.rb

@@ -4,10 +4,7 @@ module HTTPService
   class NaviAI
 
     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
+      go_url = "#{ENV['parser_url']}/v2/metas"
       HTTParty.post(go_url, body: { client_id: client_id, client_type: client_type, list_meta_path: filepath, token: token, email: email }.to_json, timeout: 400)
     end
 

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', client_type = "local", gen_csv_url = "http://localhost:3020/v2/generate_csv_input", debug = true, env = "development")
+    def initialize(sso_web_url = ENV['api_url'], client_type = "local", gen_csv_url = "#{ENV['api_url']}/v2/generate_csv_input", debug = true, env = ENV['env']?ENV['env']:Rails.env )
       # flag to print Ruby library debug info (very detailed)
       @net_imap_debug = false
 
@@ -87,9 +87,9 @@ module NaviClient
     # save data to download_path with file named by filename params.
     # Input is hashmap, and it save the hashmap as yml format.
     #
-    def save(data={}, filename)
+    def save(data={}, filename, stamp)
       download_path = config['download_path'] + config['username'] + '/'
-      temp_path = config['download_path'] + config['username'] + '/inputs/temp'
+      temp_path = config['download_path'] + config['username'] + "/inputs/temp-#{stamp}"
       filepath = download_path + filename + ".yml"
 
       mkdir_if_not_exist(filepath)
@@ -108,12 +108,10 @@ module NaviClient
     ##
     # send bulk request to navi-ai service with list of input files downloaded from imap server.
     #
-    def send_request(in_filenames = [])
+    def send_request(in_filenames = [], stamp)
       unless in_filenames.empty?
         download_path = config['download_path']
-        filename = download_path + config['username'] + "/inputs/" + (Time.now.to_f * 1000).to_s
-
-        filename_temp = download_path + config['username'] + "/inputs/temp"
+        filename = download_path + config['username'] + "/inputs/#{stamp}"
 
         mkdir_if_not_exist(filename)
 
@@ -121,13 +119,7 @@ module NaviClient
           in_filenames.each { |element| f.puts(element) }
         end
 
-        # this step might not be required as it is done in the prev download step
-        File.open(filename_temp, 'w') do |f|
-          in_filenames.each { |element| f.puts(element) }
-        end
-
         response = HTTPService::NaviAI.start(filepath: filename, client_type: @client_type, token: @token, email: config['username'])
-        FileUtils.rm_f filename_temp if File.file? filename_temp
         return response
       end
     end
@@ -229,13 +221,11 @@ module NaviClient
 
     def parse_prev_failed_emails
       changes = false
-      file =  @download_path + 'inputs/temp'
-      if File.file? file
-        @logger.debug "Parsing previously fetched emails"
-        HTTPService::NaviAI.start(filepath: file, client_type: @client_type, token: @token, email: @current_user_email )
-        FileUtils.rm_f file
-        changes = true
-        @logger.debug "Complete Ok..."
+      Dir[@download_path + 'inputs/temp*'].each do |file_name|
+        if File.file? file_name
+          HTTPService::NaviAI.start(filepath: file_name, client_type: @client_type, token: @token, email: @current_user_email )
+          changes = true
+        end
       end
       return changes
     end

data/lib/navi_client/version.rb

@@ -1,3 +1,3 @@
 module NaviClient
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navi_client
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Sujit
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - bin/.DS_Store
 - bin/console
 - bin/setup
+- config/navi_client.sample.yml
 - lib/client.rb
 - lib/cloud/navi_cloud_client.rb
 - lib/http_service/naviai.rb