blackstack_commons 1.1.35 → 1.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8162064b7ca165d7dfc2e916e105350788ff8ee
-  data.tar.gz: be908cce3827d4442170fddd947b09bfbb2ca805
+  metadata.gz: d5c3c238d33d3d4c366b1364178a6528467d81d1
+  data.tar.gz: c4394a462575874d317f2b836a2f2f6863c281b0
 SHA512:
-  metadata.gz: 1ebe389a3dd4b8acf045956440ee5d5b896a37c1dba36623edef362c8ebc5bbc534c8ca40a7640cbedb97ecfda3abebebb580240f7e64c3c18be1b76960b2428
-  data.tar.gz: a729018e8cd9325575c855ab2e86325ac1d2b71349c962cfb05170ccd75a3ac32306ecfa60234ddbd2b0866731bee285395b386d6c6c1e09308e35ba5fa74da5
+  metadata.gz: 9968fb30305ca9a039281dd8fa7cf4a63fb8819036f8fb55688151850141e6ebce24acd327c947b371b1d08bf8deffba3230680b2ddf836b8d968c8132bd68ed
+  data.tar.gz: 4ab64b6387a58d8f406e762fa4b8e51837c499e56e6cc716fbbeecaa25e07f6c0be8c96e1569fdfbf505f9ba7288ba1eb5ae88cacc55f1c4eebba34e91f42c69

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,8 +120,8 @@ 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_DOMAIN                  = /(?:[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,10}/
     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}/
     MATCH_URL                     = /(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ # /(?:\+\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,8 +546,8 @@ module BlackStack
       end
 =end
       begin
-puts 
-puts "call_post:#{url}:."
+#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|
@@ -558,7 +558,7 @@ puts "call_post:#{url}:."
           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) if use_lockfile
+          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.35
+  version: 1.1.41
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content_spinning