blackstack_commons 1.1.31 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c422b39239eaf255aedc0c99080824e8adcd37b6
-  data.tar.gz: 78274d2f142589e44fca0de63325539063ee24b4
+  metadata.gz: 655f2f5de9ac34605dea9510a33abf62f0a92394
+  data.tar.gz: ea0ae62678e670306f23ddd19ff8a5fd1a9eb063
 SHA512:
-  metadata.gz: d3d6f5a2b41b4c3cc442d5debb6d48a68b4ac59d63d1afe3cccd435eaf5fd176a8cc33637fd94a0458c5b7744f3989a51aa1ef09840e5869798f4c7ae7748451
-  data.tar.gz: 0877f4c7dd9465320ef64c9d8289aec213866cc6e7dcecbf15fcb93e1c120733ca309dc72ef9fbb0b9429d5498763a80d6c7b4df734d3fc0e0be83cc60456f43
+  metadata.gz: 8aaf3a174708159ca6779b349facb50da208004671d0806c27cf031963f7fdd5c9f1396eeed2cff32599e72adfe1cf380088a6e9dba740bf94c1968550108050
+  data.tar.gz: 04d07be65bb552f1247b836e0d71cc8df20a6fbf8bf8e00b0436c12839f3063f033a8d0cec58ccdbd9cd3bab64a3200edb75ed6d7c9c47c1aa31ea7c4c554e48

data/lib/functions.rb

@@ -11,9 +11,12 @@ module BlackStack
 		# script is running inside an OCRA temp folder, since the local folder
 		# of the running command is not the filder where the exe file is hosted.
 		# 
-		# More information: https://stackoverflow.com/questions/1937743/how-to-get-the-current-working-directorys-absolute-path-from-irb
+		# More information: 
+		#	* https://stackoverflow.com/questions/1937743/how-to-get-the-current-working-directorys-absolute-path-from-irb
+		# * 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=__FILE__,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
@@ -509,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|
@@ -518,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
@@ -531,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
@@ -540,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|
@@ -553,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.31
+  version: 1.1.36
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning