sinatra-hexacta 1.3.0 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0b5543f96de1b88e37c6eaf7bc8cfcf61a3419fda741a9597f333a49f4ec1b
-  data.tar.gz: 4224a9d29c78106f70fcef411891a9d54efbe62025becd73201d0740198e4d20
+  metadata.gz: 309f78d43f4e7447e920edaa8e90d36f4992e1cdc0fde8a40ee7ad8f0e17498a
+  data.tar.gz: 66e5d4cceb9b6bf3e1f83919bc2f0962827ef6fba83d459eec4aceea85ac6675
 SHA512:
-  metadata.gz: e22aa655547b0c55ab14163e7043dbf4e4fee7d321d51e99ccc7823dff01cda2139df7fd7fc7b68d51f999453239fc199d7af663109ab32283d5069e1c1ab473
-  data.tar.gz: 885f0a1b6b4d3324217067cee4e976b25a967e7888b8ce5404c9a46c80c3e1faef444462bc409f1b85836f598d877b491633f1443cedca776858a47a3bd26d52
+  metadata.gz: 8c0c94b820a01db53ae1450f5dd014ca2d1541b6c9f2bb1a0f216e6579b64352ef59bfb2940e405e69a8ae7f19eef4b0f3e434d178a51d75cf3bfe75751b019e
+  data.tar.gz: 3536f3971f4cb17aa0674a496b98d33d2794a0dfe84bf5418ce88b8b4b9e65354d7a7784226b2bf3378cf9de4a775d9f72ef740280b4afc6c0d134c8f5e55e74

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/cross_origin.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module Sinatra
+  module CrossOriginHandler
+    extend Hexacta
+
+    def enable_cross_origin
+      p "Enabling cross origin..."
+
+      configure do
+        enable :cross_origin
+      end
+
+      before do
+        response.headers['Access-Control-Allow-Origin'] = '*'
+      end
+
+    end
+
+  end
+  register CrossOriginHandler
+end
+

data/lib/sinatra/handlers/init.rb

@@ -6,3 +6,4 @@ require_relative 'reports'
 require_relative 'processes'
 require_relative 'constants'
 require_relative 'user_configurations'
+require_relative 'cross_origin'

data/lib/sinatra/helpers/user_configurations.rb

@@ -14,7 +14,6 @@ module Sinatra
     p "Setting up user configurations directory..."
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/user_configurations")
     copy_all_files("/lib/sinatra/views/user_configurations","/app/views/#{Hexacta::GEM_FILE_DIR}/user_configurations")
-
   end
 
   helpers UserConfigurationHelper

data/lib/sinatra/hexacta.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'sinatra/base'
+require 'sinatra/cross_origin'
 require 'fileutils'
 require 'sucker_punch'
 require 'rufus-scheduler'

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

@@ -677,4 +677,8 @@ function read_notify(id,url) {
       window.location = url;
     }
   });
+}
+
+function capitalize(word) {
+  return word[0].toUpperCase() + word.slice(1).toLowerCase();
 }

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");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.4
 platform: ruby
 authors:
 - Marco Zanger
 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
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: sinatra-cross_origin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com
 executables: []
@@ -84,6 +98,7 @@ files:
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/extensions/processmanager.rb
 - lib/sinatra/handlers/constants.rb
+- lib/sinatra/handlers/cross_origin.rb
 - lib/sinatra/handlers/errors.rb
 - lib/sinatra/handlers/init.rb
 - lib/sinatra/handlers/notifications.rb