blackstack_commons 1.1.32 → 1.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2a3706d12af1ed68a4fe8ee11fab224a47859d
-  data.tar.gz: 6d7bd517914e50690ff504a4431311294d5a7b5d
+  metadata.gz: 199db793bb9c9280c62317c5b51e0da27464a728
+  data.tar.gz: 45541c5c9d023f34edd95b8af1b152b1d519a22d
 SHA512:
-  metadata.gz: e66f18f3903ad218d5241ca74c8b9e074c3a2689d81f8e3421d68ac7d8a9801038e424b6206f752b35e87ffac0de815d391a395a17e63498577929995771237f
-  data.tar.gz: 82b5657efed2447d1bd7ac7095882378117221c23b7fb1bcb19e88a4506be777c9f822c9eda853b38b0fca1c2c6679c5c2dca127e56ed60d3d9ca219f3098c63
+  metadata.gz: 1818dcf6bf275b0640d3a93d22a3a680fb85a0f470aa5cfc849eb3e1a0d0b06bed185ae71c649bbb20ec823be3a83f63e30757014fa447d02e52084d40065567
+  data.tar.gz: db6156e7f22d49667ebfe85609ece58caadf90176ff80490cf28f64be6e94a6ba7a929d5faa87f585db4851e10b0e757682e37839ab7cccd9767a17a71daa848

data/lib/functions.rb

@@ -16,10 +16,10 @@ module BlackStack
 		# * https://stackoverflow.com/questions/8577223/ruby-get-the-file-being-executed
 		# * https://stackoverflow.com/questions/7399882/ruby-getting-path-from-pathfilename/7400057
 		# 
-		def self.require_in_working_path(filename, path,show_path_info=false)
+		def self.require_in_working_path(filename, path, show_path_info=false)
 			puts '' if show_path_info
-			#path = File.expand_path File.dirname(path)
-			path = Dir.pwd
+			path = File.expand_path File.dirname(path)
+			#path = Dir.pwd
 			puts "require_in_working_path.path:#{path}:." if show_path_info
 			file = "#{path}/#{filename}"
 			puts "require_in_working_path.file:#{file}:." if show_path_info
@@ -246,7 +246,7 @@ module BlackStack
       # units: it is a positive integer  
       def self.encode_period(period, units)
         s = "Last "
-        s += units.to_s + " " if units.to_i > 1
+        s += units.to_i.to_s + " " if units.to_i > 1
         s += "Hours" if period.upcase == "H" && units.to_i != 1
         s += "Days" if period.upcase == "D" && units.to_i != 1
         s += "Weeks" if period.upcase == "W" && units.to_i != 1
@@ -512,7 +512,7 @@ module BlackStack
     end
     
     # New call_get
-    def self.call_get(url, params = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE) 
+    def self.call_get(url, params = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, support_redirections=true) 
       uri = URI(url)
       uri.query = URI.encode_www_form(params)
       Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', :verify_mode => ssl_verify_mode) do |http|
@@ -521,7 +521,7 @@ module BlackStack
         res = http.request req
         case res
         when Net::HTTPSuccess then res
-        when Net::HTTPRedirection then BlackStack::Netting::call_get(URI(res['location']), params)
+        when Net::HTTPRedirection then BlackStack::Netting::call_get(URI(res['location']), params, false) if support_redirections
         else
           res.error!
         end
@@ -534,7 +534,8 @@ module BlackStack
     # ssl_verify_mode: you can disabele SSL verification here. 
     # max_channels: this method use lockfiles to prevent an excesive number of API calls from each datacenter. There is not allowed more simultaneous calls than max_channels.
     # TODO: setup max_simultaneus_calls in the configurtion file.
-    def self.call_post(url, params = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, use_lockfile=true)
+    def self.call_post(url, params = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, support_redirections=true)
+=begin
       # build the lockfile name
       x = 0
       if BlackStack::Netting.max_api_call_channels.to_i > 0
@@ -543,9 +544,10 @@ module BlackStack
         # lock the file
         BlackStack::Netting.lockfiles[x].flock(File::LOCK_EX) if use_lockfile
       end
-            
+=end
       begin
-        
+#puts 
+#puts "call_post:#{url}:."
         # do the call
         uri = URI(url)
         ret = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', :verify_mode => ssl_verify_mode) do |http|
@@ -556,23 +558,23 @@ module BlackStack
           res = http.request req
           case res 
           when Net::HTTPSuccess then res
-          when Net::HTTPRedirection then BlackStack::Netting::call_post(URI(res['location']), params, BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, false)
+          when Net::HTTPRedirection then BlackStack::Netting::call_post(URI(res['location']), params, BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, false) if support_redirections
           else
             res.error!
           end
         end
         
         # release the file
-        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
+#        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
       rescue => e
         # release the file
-        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
+#        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
         
         # elevo la excepcion
         raise e
       ensure
         # release the file
-        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
+#        BlackStack::Netting.lockfiles[x].flock(File::LOCK_UN) if use_lockfile && BlackStack::Netting.max_api_call_channels.to_i > 0
       end
       
       # return 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack_commons
 version: !ruby/object:Gem::Version
-  version: 1.1.32
+  version: 1.1.37
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning