blackstack_commons 1.1.34 → 1.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf323bf87e9ad791105370e7fbd0a41c7fc50ae
-  data.tar.gz: 1c7bf646475bb5ab9c1b05080b68c0ded854bced
+  metadata.gz: 56845620e1eb854129f21d7bcc71bd7246cc3ef5
+  data.tar.gz: 67d73bb64e3c2e2b2157249fd23a2000cfcd39ce
 SHA512:
-  metadata.gz: 7914ab263ca9f5ba3d853212bebeea28298aad8e0626cfca93f1904c3bc52c4ca342277bec7f619af3e8737b8b08e4cf7483cb006e2fcb3ae6b39584505b1b46
-  data.tar.gz: 162f8cb3bfc71412a2ca5e29e9c31c53a09fefa073172c716d014fe4376d35284b67b2ce7b0369119ea93ae875871b2605d316284e013b9324a0a673bb499102
+  metadata.gz: f1637f9e742b5bbe7c6df3ef1d83d3917b33896f016bd56b171a46f4611f8fa28308be8d15b3a714b37e15854463c506af71828aaec3a96f13b278d7ae7c2935
+  data.tar.gz: ccc0a9d82965d4464d22ea19d3129c18439699f9acd8fb537da3b44c1ed53101da58c55c841242cf96042c31862404334c8925bc1e9d7d05849ba4ab79d3ba2c

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

@@ -120,7 +120,7 @@ module BlackStack
     MATCH_PASSWORD                = /(?=.*[a-zA-Z])(?=.*[0-9]).{6,}/ 
     MATCH_GUID                    = /{?[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]\-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]\-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]\-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]}?/
     MATCH_FILENAME                = /[\w\-\_\.]+/
-    MATCH_EMAIL                   = /[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}/
+    MATCH_EMAIL                   = /[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{1,25}/
     MATCH_DOMAIN                  = /(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}/
     MATCH_DATE_STANDARD           = /\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])/
     MATCH_PHONE                   = /(?:\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}/
@@ -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,7 @@ 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
@@ -546,7 +546,8 @@ module BlackStack
       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|
@@ -557,7 +558,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack_commons
 version: !ruby/object:Gem::Version
-  version: 1.1.34
+  version: 1.1.40
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning