Merge branch 'new_calamares' into 'master'

New calamares

See merge request !8

Gemfile.lock

 PATH
   remote: .
   specs:
-    zoholib (0.0.5b)
+    zoholib (0.22)
       http (~> 4.4.0)
       httparty (~> 0.18.0)
       launchy (~> 2.5.0)
       logger (~> 1.4.2)
-      savon (~> 2.12.0)
+      savon (~> 2.12.1)
+      wasabi (= 3.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -69,7 +70,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    savon (2.12.0)
+    savon (2.12.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
@@ -96,8 +97,9 @@ DEPENDENCIES
   logger (~> 1.4.2)
   rake (~> 13.0.1)
   rspec (~> 3.0)
-  savon (~> 2.12.0)
+  savon (~> 2.12.1)
+  wasabi (= 3.5.0)
   zoholib!
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

lib/zoholib.rb

 # frozen_string_literal: true
-require 'zoholib/configuration'
-require 'zoholib/version'
-require 'zoholib/zoho_request'
-require 'zoholib/response'
-require 'zoholib/grant_request'
-require 'zoholib/refresh_request'
-require 'zoholib/authorization_request'
-require 'zoholib/adamo_client'
-require 'zoholib/b12_client'
-require 'zoholib/zoho_basic_client'
-require 'zoholib/zoho_client'
+require './zoholib/configuration'
+require './zoholib/version'
+require './zoholib/zoho_request'
+require './zoholib/response'
+require './zoholib/grant_request'
+require './zoholib/refresh_request'
+require './zoholib/authorization_request'
+require './zoholib/adamo_client'
+require './zoholib/b12_client'
+require './zoholib/zoho_basic_client'
+require './zoholib/zoho_client'
+require './zoholib/adamo2_client'
 
 
 ##

lib/zoholib/adamo2_client.rb

@@ -3,6 +3,7 @@ require 'pp'
 require 'json'
 require 'logger'
 require 'date'
+require 'active_support/core_ext/hash/keys' 
 
 module Wedoops
   module Zoholib
@@ -11,7 +12,8 @@ module Wedoops
         include HTTParty
         
         debug_output $stdout
-        base_uri 'https://zoho-adaptor-staging.adamo.es/'
+        base_uri 'https://zoho-adaptor-uat.adamo.es/'
+        #base_uri 'https://zoho-adaptor-staging.adamo.es/'
         http_proxy "prx.wedoops.io", "443", "adamo" , "fSJxGqibztyvGPb9"
 
         attr_reader :subdomain, :uri
@@ -21,14 +23,48 @@ module Wedoops
           set_key
         end
 
-        def search(phone)
-          self.class.get("/v1/leads/phone/#{phone}",headers:{'Content-Type' => 'application/json','x-apikey' => "#{@key}"})
+        def search_by_phone(phone)
+          resultado = self.class.get("/v1/leads/phone/#{phone}",headers:{'Content-Type' => 'application/json','x-apikey' => "#{@key}"})
+          return resultado["lead"].symbolize_keys
+        end
+
+        def search_by_id(id)
+          resultado = self.class.get("/v1/leads/#{id}",headers:{'Content-Type' => 'application/json','x-apikey' => "#{@key}"})
+          return resultado["lead"].symbolize_keys
+        end
+
+        def lifetime(id)
+          resultado = self.class.get("/v1/leads/#{id}/lifetime",headers:{'Content-Type' => 'application/json','x-apikey' => "#{@key}"})
+          resultado = resultado.deep_symbolize_keys
+          return resultado
+        end
+
+        def leads(date)
+          page=1
+          limit=50000
+          resultado_final=Array.new
+          r=Array.new
+          leads=Array.new
+          loop do
+            print "Pagina #{page} "
+            resultado = self.class.get("/v1/leads?page=#{page}&date=#{date}&limit=#{limit}",headers:{'Content-Type' => 'application/json','x-apikey' => "#{@key}"})
+            pp resultado
+            r=resultado.deep_symbolize_keys
+            total=r[:total]
+            resultado_final.concat(r[:leads])
+            print "(#{resultado_final.size}/#{total})"
+            break if resultado_final.size.eql? total
+            break if r[:leads].blank?
+            page+=1
+          end
+          return resultado_final
         end
 
         private
   
         def set_key
-          @password = 'ZnsVmfSZwxq7KH1FquCIG8P9UrKDixHRAhci4UuYpRdzZ'
+          #@password = 'ZnsVmfSZwxq7KH1FquCIG8P9UrKDixHRAhci4UuYpRdzZ' ##Staging password 
+          @password = '7KqI8FWVVfPayhcvYo9wxoUHZf3U0HWxYIuouyLizyF2N' ##Production (uat) password
           @salt = (DateTime.now.strftime("%s").to_i / 86400).to_s
           @key = Digest::SHA1.hexdigest(@password + @salt)
         end

lib/zoholib/version.rb

 # frozen_string_literal: true
 module Wedoops
   module Zoholib
-    VERSION = '0.22'
+    VERSION = '0.30' #introduces Sys02
   end
 end
\ No newline at end of file