sinatra-hexacta 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22856830fec4131abdb9b5038fc1e6862c053e11e1e0e47a90d238340512a678
-  data.tar.gz: 02adea101a40283d74e4f557b813db101e971fb02331e59d802bcfe2775164ad
+  metadata.gz: 8e27f66144b0ee4048817d8c92a6fc993ab63ca176a79ac1feb9288175e93103
+  data.tar.gz: 5abf03f218822c22896a9200c05912afed6994e2b3b9fc872dcad45a8cb32072
 SHA512:
-  metadata.gz: a62841ea84938b005e46aa7fe7b78900f525cf09a00f3c33b9cb000406401a6b85ff8f2a0c5acab54880b05f27f7d75a473cc9c36f8ae12ad5e3939645537489
-  data.tar.gz: c5af975ac9d455609eca202196decc3dd5efa9e703e9a5f8cec16ac6491e3adb6b7bfaab9226953cb3ec19de964c3b3ae34495edd7e4643987f5eb5bde24df96
+  metadata.gz: a4738793bb01253652be89cb9b8462c96663c9d4ffcfdd161cccd7fa6fa07437d48e2fb90ce82a74fa08548d878c0f827fcc31d515bcfa80421564645fce43a8
+  data.tar.gz: a9931739f2585cc09789a9a116f75b2303d967c9e2d73350386d79f5c9b71f073d4000bfb863ed80380be61564d0a5eaabbe59de9fa8a24ced6a140980d084cb

data/lib/sinatra/extensions/mailsender.rb

@@ -20,16 +20,32 @@ class MailSender
     http.start { |http| http.request(request) }
   end
 
+
   def _authorize_mail
     params = [ [ "grant_type", "password" ], [ "client_id", "MailApp" ], [ "client_secret", "MailAppPRD2018!" ] ]
-    response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+    retry_times = 0
+    begin
+      response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+    rescue StandardError => bang
+      response = nil
+    end
+    until response.is_a?( Net::HTTPSuccess ) || retry_times > 10 do
+      begin
+        retry_times = retry_times + 1
+        sleep(retry_times)
+        response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+      rescue StandardError => bang
+      end
+    end
     if( response.is_a?( Net::HTTPSuccess ) )
       token = JSON.parse(response.body)
       @access_token = token["access_token"]
       @refresh_token = token["refresh_token"]
       @expire  = DateTime.parse(token[".expires"])
+      return true
     else
       NotificationSender.instance.send_error(nil,'Authorize mail failed',response.body)
+      return false
     end
   end
 
@@ -54,26 +70,34 @@ class MailSender
   end
 
   def _expired?
-    expire.nil? || DateTime.now < expire
+    @expire.nil? || DateTime.now < @expire
   end
 
+
   def do_send(mail)
-    begin
-      if _expired?
-        _authorize_mail
-      end
+    authorized = _expired?? _authorize_mail : true
 
+    if authorized
       params = [ [ "ApplicationCode", 2009 ], [ "Name", mail.template ], [ "Subject", mail.subject ], [ "EmailAddress", mail.from ] ]
       params = params + _build_map_values(mail.values) + _build_to_map(mail.to)
 
-      response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
-
+      retry_times = 0
+      begin
+        response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
+      rescue StandardError => bang
+        response = nil
+      end
+      until response.is_a?( Net::HTTPSuccess ) || retry_times > 10 do
+        begin
+          retry_times = retry_times + 1
+          sleep(retry_times)
+          response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
+        rescue StandardError => bang
+        end
+      end
       if( !response.is_a?( Net::HTTPSuccess ) )
         NotificationSender.instance.send_error(nil,'Send mail failed',response.body)
       end
-    rescue StandardError => error
-      message = error.backtrace.join(',');
-      NotificationSender.instance.send_error(nil,"Mail send error",message)
     end
   end
 

data/lib/sinatra/handlers/constants.rb

@@ -9,7 +9,7 @@ module Sinatra
       ConstantHandler.copy_all_files("/lib/sinatra/views/constants","/app/views/#{Hexacta::GEM_FILE_DIR}/constants")
 
       before '/constant*' do
-        error(403) if authenticated(User).permissions.empty?
+        error(403) unless authenticated(User).admin?
       end
 
       get '/constants' do

data/lib/sinatra/handlers/cross_origin.rb

@@ -11,7 +11,7 @@ module Sinatra
       end
 
       before do
-        response.headers['Access-Control-Allow-Origin'] = 'http://*.hexacta.com https://*.hexacta.com'
+        response.headers['Access-Control-Allow-Origin'] = '*'
       end
 
     end

data/lib/sinatra/handlers/reports.rb

@@ -52,7 +52,7 @@ module Sinatra
       end
 
       before '/reports/*' do
-        error(403) if authenticated(User).permissions.empty?
+        error(403) unless authenticated(User).admin?
       end
 
       get '/reports' do

data/lib/sinatra/public/js/app.js

@@ -5,7 +5,24 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(naviga
    $('html').addClass('ismobile');
 }
 
+// create a new instance of `MutationObserver` named `observer`,
+// passing it a callback function
+const observer = new MutationObserver(function() {
+  update_html_elements();
+});
+
 $(document).ready(function(){
+    /*
+     * Waves Animation
+     */
+    (function(){
+      Waves.attach('.btn:not(.btn-icon):not(.btn-float)');
+      Waves.attach('.btn-icon, .btn-float', ['waves-circle', 'waves-float']);
+      Waves.init();
+    })();
+});
+
+function update_html_elements() {
 
     // Fix modal inside other components
     $('.modal').appendTo("body");
@@ -340,15 +357,6 @@ $(document).ready(function(){
       });
     }
 
-    /*
-     * Waves Animation
-     */
-    (function(){
-      Waves.attach('.btn:not(.btn-icon):not(.btn-float)');
-      Waves.attach('.btn-icon, .btn-float', ['waves-circle', 'waves-float']);
-      Waves.init();
-    })();
-
     /*
      * Lightbox
      */
@@ -499,7 +507,14 @@ $(document).ready(function(){
       $(this).find(':submit').attr("disabled",false);
     });
 
-});
+}
+
+const elementToObserve = document.querySelector("body");
+
+if (elementToObserve != null) {
+  observer.observe(elementToObserve, {subtree: true, childList: true});
+}
+
 
 function start_load() {
   if (!$("#loader")[0]) {
@@ -677,4 +692,8 @@ function read_notify(id,url) {
       window.location = url;
     }
   });
+}
+
+function capitalize(word) {
+  return word[0].toUpperCase() + word.slice(1).toLowerCase();
 }

data/lib/sinatra/public/vendors/bootstrap-validator/validator.js

@@ -394,12 +394,26 @@
 
   // VALIDATOR DATA-API
   // ==================
+  const elementToObserve = document.querySelector("body");
 
-  $(window).on('load', function () {
+  // create a new instance of `MutationObserver` named `observer`,
+  // passing it a callback function
+  const observer = new MutationObserver(function() {
     $('form[data-toggle="validator"]').each(function () {
       var $form = $(this)
       Plugin.call($form, $form.data())
     })
-  })
+  });
+
+  // call `observe()` on that MutationObserver instance,
+  // passing it the element to observe, and the options object
+  observer.observe(elementToObserve, {subtree: true, childList: true});
+
+  //$(window).on('load', function () {
+  //  $('form[data-toggle="validator"]').each(function () {
+  //    var $form = $(this)
+  //    Plugin.call($form, $form.data())
+  //  })
+  //})
 
 }(jQuery);

data/lib/sinatra/views/inputs/select.slim

@@ -11,7 +11,16 @@
 -unless defined? readonly
   -readonly = false
   
--if required
+-if readonly
+  .form-group
+    label #{placeholder}
+    select.chosen id="#{id}" class="#{clazz}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;") disabled=""
+      -for element in elements
+        -if chosen == element[:value]
+          option value="#{element[:value]}" selected="" #{element[:text]}
+        -else
+          option value="#{element[:value]}" #{element[:text]}
+-elsif required
   .form-group.has-success
     label #{placeholder}
     select.chosen.form-control id="#{id}" class="#{clazz}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;") required="" 
@@ -29,4 +38,11 @@
         -if chosen == element[:value]
           option value="#{element[:value]}" selected="" #{element[:text]}
         -else
-          option value="#{element[:value]}" #{element[:text]}
+          option value="#{element[:value]}" #{element[:text]}
+
+
+/ For enabling
+/ var myselect=$('select');
+/ myselect.chosen();
+/ myselect.prop('disabled', true);
+/ myselect.trigger("chosen:updated");

data/lib/sinatra/views/notifications.slim

@@ -45,7 +45,7 @@
 -total_pending = Notification.pending.for(authenticated(User)).exclude_message.count
 
 .footer-btn
-  -unless authenticated(User).permissions.empty?
+  -if authenticated(User).admin?
     a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float data-toggle="modal" data-target="#new-notification"
       i.zmdi.zmdi-notifications-active
   -if total_pending > 0
@@ -55,13 +55,13 @@
     i.zmdi.zmdi-delete
 
 .footer-text
-  -unless authenticated(User).permissions.empty?
+  -if authenticated(User).admin?
     a.text.btn.bgm-white.c-gray data-toggle="modal" data-target="#new-notification" Nueva notificación
   -if total_pending > 0
     a.text.btn.bgm-white.c-gray onclick="read_all_notifications(#{{Notification.pending.for(authenticated(User)).exclude_message.all.collect { |notification| notification.id}}});this.onclick='';" Marcar como leidas
   a.text.btn.bgm-white.c-gray.delete-notifications.hidden.animated.bounceIn onclick="delete_all_notifications();this.onclick='';" Borrar notificaciones
 
--unless authenticated(User).permissions.empty?
+-if authenticated(User).admin?
   == slim :'sinatra-hexacta/notifications/new'
 
 javascript:

data/lib/sinatra/views/notifications/view.slim

@@ -48,7 +48,7 @@
               .media-body
                 .lv-title Fecha de lectura
                 small.lv-small #{notification.read_date.display}
-          -unless (authenticated(User).permissions.collect { |permission| permission.class } & [ Superadmin ]).empty?
+          -if authenticated(User).superadmin?
             a.lv-item
               .media
                 .media-body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Marco Zanger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sucker_punch
@@ -250,7 +250,7 @@ homepage: https://rubygems.org/gems/sinatra-hexacta
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Hexacta general tools!
 test_files: []