blackstack_commons 1.1.26 → 1.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc95c11625700337bb0e751d017c74576e88928
-  data.tar.gz: 2d59f66329d8a08b2a8ed24df9daa5d86e0f0b5f
+  metadata.gz: b57115faaf3a00b4a0cc954244de3d33fa9b00fa
+  data.tar.gz: 58107d6e5250b684e336d02bac25e8790599ac60
 SHA512:
-  metadata.gz: b497184aa100f95b4e5339f67d7a3f82ef15554467c785f98eb41342b2c0644bf30d7ad12b37c8432601e7d4b9e3e6ece79b83193601a93f0a804447c5dd36b1
-  data.tar.gz: 53b0926d2ccc8697d9702bec33ad63fc7ab89b4f691f24d5937f4cb1f422bf839548b361ef2e940f95b367c872f29b40633a56c47aaaa4764771c46e9166326c
+  metadata.gz: ecc986a230a3bd4bc56c59c5240349ecb887cf4ed84656dab07b4cc2196a859eccf66f5bdb513727bc806627f63cb515f345aa42a53c369c4d3f95087f385993
+  data.tar.gz: 1f9ddbcc4429c33a55643a8379f60f169379343b2841f06c3b1abfa634b5ea2496ea28a8458c88e0e7fd988e6658c4b626fef9e5ef88eee143fb5aa4167938ad

data/lib/functions.rb

@@ -1,20 +1,27 @@
+
 module BlackStack
 
-  # This method does a require of the config.rb that must then then
-  # ruby script that is running, or where an .exe file genrated by 
-  # OCRA is running. 
-  #
-  # When you run an OCRA .exe file, such .exe will unpackage the ruby
-  # script in a temporal folder. So any require will look for conf.rb
-  # into the temporal folder.
-  #
-  # This function resolves that problem, by forcing the require to look
-  # into the folder where the .exe command is hosted.
-  #
-  def self.require_local(source_dir, filename='config.rb')
-    source_dir = File.expand_path('..', source_dir)
-    require File.expand_path('config', source_dir)
-  end
+  # ----------------------------------------------------------------------------------------- 
+  # OCRA Supporting Functions
+  # ----------------------------------------------------------------------------------------- 
+  module OCRA
+		# OCRA files run into a temp folder, where the script is unpacked.
+		# 
+		# This function is useful to require a configuration file when the
+		# 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
+		# 
+		def self.require_in_working_path(filename, show_path_info=false)
+			puts '' if show_path_info
+			path = File.expand_path File.dirname(__FILE__)
+			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
+			require file
+		end
+	end # module OCRA
 
   # ----------------------------------------------------------------------------------------- 
   # DateTime Functions
@@ -523,18 +530,18 @@ 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, allow_redirection=true)
+    def self.call_post(url, params = {}, ssl_verify_mode=BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, use_lockfile=true)
       # build the lockfile name
       x = 0
-
       if BlackStack::Netting.max_api_call_channels.to_i > 0
         raise "Max Channels cannot be higher than #{BlackStack::Netting.lockfiles.size.to_s}" if BlackStack::Netting.max_api_call_channels > BlackStack::Netting.lockfiles.size
         x = rand(BlackStack::Netting.max_api_call_channels)
         # lock the file
         BlackStack::Netting.lockfiles[x].flock(File::LOCK_EX) if use_lockfile
       end
-
+            
       begin
+        
         # 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|
@@ -545,23 +552,25 @@ 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, false) if allow_redirection
+          when Net::HTTPRedirection then BlackStack::Netting::call_post(URI(res['location']), params, BlackStack::Netting::DEFAULT_SSL_VERIFY_MODE, false)
           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
       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
+        
         # 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
       end
+      
       # return 
       ret
     end

metadata

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