blackstack_commons 1.1.33 → 1.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96d14cd4096908b9904b488cb6d0b50f4ba46e1a
-  data.tar.gz: 39cf2e762c291ca387e954efc5ce83919a61637a
+  metadata.gz: c8acfc5933e79875afb408c20432834ff6b53fe3
+  data.tar.gz: f6cc85064a417aadc4704d4b288a8b412647350b
 SHA512:
-  metadata.gz: b9a3ac449388ea64b55f269397ec5dd304b54ab748b1e3aea83fdc731cabc552dc4e542996b96b7a058043c7622ded33a8ccc290aa12c736b2b1e7d2b323f934
-  data.tar.gz: 4d61c4496735d814c33559705940998ae8cb6718ba35b6f8faddf5b64585328fd545d82bc39b825301925e883287aed6f5c0acb761a4e85830ba7d66442b909a
+  metadata.gz: ab382d63132e69f50a0c17f821f5672230e0deb75c6aebc8c9a95118cf194886a8a4cf80f8c40a227fd320b95a5a473093350c3a003ab9479a99c0135cd87682
+  data.tar.gz: d45eaf198ec84572d13ab34768ba4b596aee4ab30bd8bf0ad84ec159968527490b309ff059e94882df46c9aeb04b8c577428170e455c26fec3445691e19df7fb

data/lib/extend_string.rb

@@ -108,4 +108,13 @@ class String
     BlackStack::Strings::Encoding::encode_html(self.to_s)    
   end
   
+  # Escapes carriage returns and single and double quotes for JavaScript segments.
+  # reference: https://api.rubyonrails.org/classes/ActionView/Helpers/JavaScriptHelper.html
+  def escape_javascript
+    s = self.dup
+    js_escape_map = { '\\' => '\\\\', "</" => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'", "`" => "\\`", "$" => "\\$" }
+    js_escape_map.each { | x, y | s.gsub!(x,y) }
+    s
+  end
+  
 end # class String

data/lib/functions.rb

@@ -16,7 +16,7 @@ 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
@@ -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.33
+  version: 1.1.39
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning