sinatra-hexacta 0.1.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf0915f37eb2114c97ebb4b7ff954a90e3c5dac391fe217d3a75053dc228220
-  data.tar.gz: 2f0a31fcc9b14ddf883c633fc6a1ba7926cbc61bb3549f167871fa494b2ad2f6
+  metadata.gz: 486d724d40440586e2c909583687a5aa34f9d4f348ff6d56cd6d35085f5ab9fb
+  data.tar.gz: d0ed9a2ded7adcc993e4e4cdbeed68938793e7da4b3510c108ec66222af94844
 SHA512:
-  metadata.gz: a5bfbf816b5b2f5def09972de96976262de368922ac80a858d61610f17cd91c09f35b41cff946fb8da759be407701c7b4489d60cf44700e19fa2843061a766bf
-  data.tar.gz: 6bda67520e9f593a7524703e765066af1738b199dfa23870f8ab14ff9d79244e83bf533aaf09b658d04d0a26c82894ebde1f6cd61228ef51ed9043196ec9da5f
+  metadata.gz: bd96c1d6eef238d9c1a929c0339483c9ee9e934b2bed2399fffe776543506ae930c700898a16bade0df3ca4e8672fa57cc8a14b0be6393fde0bc2b4d5e46bc9a
+  data.tar.gz: 0726a9d33be03576cceab798ad59aae29e8df592929ad89150d5827c3c8d35a8e1d2b5ac368c156e064a3bec475b64f0b17e3894f5e89779fd46b166c5e69b7a

data/lib/sinatra/extensions/generalmail.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+class GeneralMail < Mail
+  
+  def initialize(args)
+    super(args)
+    @subject = args[:subject]
+    @description = args[:description]
+    @link = args[:link]
+  end
+
+  def template
+    'general'
+  end
+
+  def subject
+    @subject
+  end
+
+  def values
+    data = {}
+    data["{description}"] = @description
+    data["{link}"] = @link
+    data
+  end
+
+end

data/lib/sinatra/extensions/generalmailnolink.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+class GeneralMailNoLink < Mail
+  
+  def initialize(args)
+    super(args)
+    @subject = args[:subject]
+    @description = args[:description]
+  end
+
+  def template
+    'general_no_link'
+  end
+
+  def subject
+    @subject
+  end
+
+  def values
+    data = {}
+    data["{description}"] = @description
+    data
+  end
+
+end

data/lib/sinatra/extensions/init.rb

@@ -2,3 +2,7 @@
 require_relative 'date'
 require_relative 'antiquity'
 require_relative 'notification'
+require_relative 'mailsender'
+require_relative 'mail'
+require_relative 'generalmail'
+require_relative 'mailbuilder'

data/lib/sinatra/extensions/mail.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+class Mail
+
+  def initialize(args)
+    @receivers = args[:to]
+    @sender = args[:from]
+  end
+
+  def template
+    raise Exception, "You have to override 'template' method in #{self.class}"
+  end
+
+  def subject
+    raise Exception, "You have to override 'subject' method in #{self.class}"
+  end
+
+  def values
+    raise Exception, "You have to override 'values' method in #{self.class}"
+  end
+
+  def to
+    _receivers = {}
+    @receivers.each { |user| _receivers[user.full_name] = "Persons" }
+    _receivers
+  end
+
+  def from 
+    @sender ||= "apps@hexacta.com"
+  end
+
+  def send
+    MailSender.perform_async(self)
+  end
+
+end

data/lib/sinatra/extensions/mailbuilder.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+class MailBuilder
+
+  def to(receivers)
+    @to = receivers
+    return self
+  end
+
+  def from(sender)
+    @from = "#{sender.hxt_id}@hexacta.com"
+    return self
+  end
+
+  def subject(a_subject)
+    @subject = a_subject
+    return self
+  end
+
+  def description(a_description)
+    @description = a_description
+    return self
+  end
+
+  def link(a_link)
+    @link = a_link
+    return self
+  end
+
+  def send
+    @from ||= "apps@hexacta.com"
+    if @link.nil?
+      GeneralMailNoLink.new({ :to => @to,
+                        :from => @from,
+                        :subject => @subject,
+                        :description => @description
+                      }).send
+    else
+      GeneralMail.new({ :to => @to,
+                        :from => @from,
+                        :subject => @subject,
+                        :description => @description,
+                        :link => @link
+                      }).send
+
+    end
+  end
+end

data/lib/sinatra/extensions/mailsender.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+require 'singleton'
+require 'sucker_punch'
+
+class MailSender
+  include SuckerPunch::Job
+
+  attr_reader :access_token, :expire, :refresh_token
+
+  def _do_connect(uri, form={},token=nil)
+    url = URI.parse("#{uri}")
+    http = Net::HTTP.new(url.host, url.port)
+    http.read_timeout = 1000
+    http.use_ssl = (url.scheme == 'https')
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    header = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+    header["Authorization"] = "Bearer #{token}" unless token.nil?
+    request = Net::HTTP::Post.new(url, header)
+    request.form_data = form
+    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)
+    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"])
+    else
+      NotificationSender.instance.send_error(nil,'Authorize mail failed',response.body)
+    end
+  end
+
+  def _build_map_values(mail_values)
+    values = []
+    for key in mail_values.keys
+      index = mail_values.keys.index(key)
+      values << ["MailValues[#{index}].Key", key]
+      values << ["MailValues[#{index}].Value", mail_values[key]]
+    end
+    values
+  end
+
+  def _build_to_map(to_map)
+    values = []
+    for key in to_map.keys
+      index = to_map.keys.index(key)
+      values << ["ResourcesRequest[#{index}].TypeGroup", to_map[key]]
+      values << ["ResourcesRequest[#{index}].Name", key]
+    end
+    values
+  end
+
+  def _expired?
+    expire.nil? || DateTime.now < expire
+  end
+
+  def do_send(mail)
+    begin
+      if _expired?
+        _authorize_mail
+      end
+
+      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)
+
+      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
+
+  def send(mail)
+    run(mail) #Async call
+  end
+
+  #For async method call
+  def perform(mail)
+    do_send(mail)
+  end
+end

data/lib/sinatra/extensions/notification.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
+require 'singleton'
+
 class NotificationSender
+  include Singleton
 
-  def self.send_to(user,creator,title,message,label,link=nil)
+  def send_to(user,creator,title,message,label,link=nil)
     notification = Notification.find_or_create(:user_id => user.id,
                                 :creator_id => creator.id,
                                 :title => title,
@@ -16,13 +19,13 @@ class NotificationSender
     notification
   end
 
-  def self.send_to_subscriptors(creator,title,message,label,link=nil)
+  def send_to_subscriptors(creator,title,message,label,link=nil)
     Subscription.where(:label => label).all.each do |subscription|
-      notification = NotificationSender.send_to(subscription.user,creator,title,message,label,link)
+      notification = send_to(subscription.user,creator,title,message,label,link)
     end
   end
 
-  def self.send_error(creator,title,message)
+  def send_error(creator,title,message)
     Subscription.where(:label => 'error').all.each do |subscription|
       creator = subscription.user if creator.nil?
       notification = Notification.find(:user_id => subscription.user_id,
@@ -32,7 +35,7 @@ class NotificationSender
                                        :label => 'error',
                                        :read_date => nil)
       if notification.nil?
-        notification = NotificationSender.send_to(subscription.user,creator,title,message,'error')
+        notification = send_to(subscription.user,creator,title,message,'error')
       end
     end
 

data/lib/sinatra/handlers/errors.rb

@@ -13,12 +13,12 @@ module Sinatra
     end
 
     def error_template(code)
-      ErrorHandler.symlink("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
+      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
       error code do
         if code == 500
           title = env['sinatra.error'].message.split(':')[0].gsub('#<','');
           message = (["in #{request.url}"] + env['sinatra.error'].backtrace).join(',');
-          NotificationSender.send_error(authenticated(User),title,message)
+          NotificationSender.instance.send_error(authenticated(User),title,message)
         end
         slim "#{Hexacta::GEM_FILE_DIR}/errors/#{code}".to_sym, locals: { :params => params }
       end

data/lib/sinatra/handlers/notifications.rb

@@ -6,15 +6,15 @@ module Sinatra
     def enable_notifications
       p "Enabling notifications..."
       NotificationHandler.setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
-      NotificationHandler.symlink("/lib/sinatra/views/notifications.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications.slim")
-      NotificationHandler.symlink_all("/lib/sinatra/views/notifications","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
+      NotificationHandler.copy_file("/lib/sinatra/views/notifications.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications.slim")
+      NotificationHandler.copy_all_files("/lib/sinatra/views/notifications","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
 
       post '/notification' do
         if params[:user_ids].blank?
-          NotificationSender.send_to_subscriptors(authenticated(User),params[:title],params[:message],params[:label])
+          NotificationSender.instance.send_to_subscriptors(authenticated(User),params[:title],params[:message],params[:label])
         else
           for id in params[:user_ids]
-            NotificationSender.send_to(User.find(:id => id),authenticated(User),params[:title],params[:message],params[:label])
+            NotificationSender.instance.send_to(User.find(:id => id),authenticated(User),params[:title],params[:message],params[:label])
           end
         end
         redirect back

data/lib/sinatra/handlers/reports.rb

@@ -14,7 +14,7 @@ module Sinatra
       end
 
       get '/reports/:report_name' do |report_name|
-        date = Date.parse(params["date"]) unless params["date"].nil?
+        date = Date.parse(params[:date]) unless params[:date].nil?
         date ||= Date.today
         headers "Content-Disposition" => "attachment;filename=#{report_name}.#{date}.xls",
           "Content-Type" => "application/octet-stream"

data/lib/sinatra/helpers/alerts.rb

@@ -20,7 +20,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
-    symlink_all("/lib/sinatra/views/alerts","/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
+    copy_all_files("/lib/sinatra/views/alerts","/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
   end
 
   helpers AlertHelper

data/lib/sinatra/helpers/charts.rb

@@ -24,7 +24,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
-    symlink_all("/lib/sinatra/views/charts","/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
+    copy_all_files("/lib/sinatra/views/charts","/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
   end
 
   helpers ChartsHelper

data/lib/sinatra/helpers/inputs.rb

@@ -40,7 +40,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
-    symlink_all("/lib/sinatra/views/inputs","/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
+    copy_all_files("/lib/sinatra/views/inputs","/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
   end
 
   helpers InputHelper

data/lib/sinatra/helpers/libraries.rb

@@ -18,7 +18,7 @@ module Sinatra
     p "Setting up libraries directory..."
     copy_dir_structure("/lib/sinatra/public","/app/public/#{Hexacta::GEM_FILE_DIR}")
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
-    symlink_all("/lib/sinatra/views/libraries","/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
+    copy_all_files("/lib/sinatra/views/libraries","/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
   end
 
   helpers LibrariesHelper

data/lib/sinatra/helpers/reports.rb

@@ -20,7 +20,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
-    symlink_all("/lib/sinatra/views/reports","/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
+    copy_all_files("/lib/sinatra/views/reports","/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
   end
 
   helpers ReportHelper

data/lib/sinatra/helpers/schedule.rb

@@ -21,7 +21,7 @@ module Sinatra
             rescue StandardError => error
               title = error.message.split(':')[0].gsub('#<','');
               message = error.backtrace.join(',');
-              NotificationSender.send_error(nil,title,message)
+              NotificationSender.instance.send_error(nil,title,message)
             end
 
           end
@@ -50,7 +50,7 @@ module Sinatra
             rescue error
               title = error.message.split(':')[0].gsub('#<','');
               message = error.backtrace.join(',');
-              NotificationSender.send_error(nil,title,message)
+              NotificationSender.instance.send_error(nil,title,message)
             end
 
           end

data/lib/sinatra/hexacta.rb

@@ -9,28 +9,26 @@ module Sinatra
   module Hexacta
     GEM_FILE_DIR = "sinatra-hexacta"
 
-    def symlink(original_path, link_path)
-      File.symlink "#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}", "#{link_path}" unless Gem.loaded_specs["sinatra-hexacta"].nil? || File.exist?("#{link_path}")
+    def gem_path
+      File.expand_path("../..",__dir__)
     end
 
-    def symlink_all(original_path, link_path)
-      Dir.foreach("#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}") do |child|
-        symlink("#{original_path}/#{child}","#{link_path}/#{child}") unless child == '.' || child == '..'
-      end unless Gem.loaded_specs["sinatra-hexacta"].nil?
+    def copy_file(original_path, link_path)
+      IO.copy_stream("#{gem_path}#{original_path}",link_path) unless File.exist?(link_path) && FileUtils.compare_file("#{gem_path}#{original_path}",link_path)
     end
 
-    def setup_dir(path)
-      unless Gem.loaded_specs["sinatra-hexacta"].nil?
-        FileUtils.remove_dir path if Dir.exist? path
-        FileUtils.mkdir_p path
+    def copy_all_files(original_path, link_path)
+      Dir.foreach("#{gem_path}#{original_path}") do |child|
+        copy_file("#{original_path}/#{child}","#{link_path}/#{child}") unless child == '.' || child == '..'
       end
     end
 
+    def setup_dir(path)
+      FileUtils.mkdir_p path
+    end
+
     def copy_dir_structure(original_path, destination_path)
-      unless Gem.loaded_specs["sinatra-hexacta"].nil?
-        FileUtils.remove_dir destination_path if Dir.exist? destination_path
-        FileUtils.copy_entry("#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}", destination_path)
-      end
+      FileUtils.copy_entry("#{gem_path}#{original_path}", destination_path)
     end
   end
 end

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

@@ -39,6 +39,7 @@ $(document).ready(function(){
         $(this).find('#submit').attr('disabled','disabled');
       }
     });
+
     $('.chosen[required]').on('change', function(change, deselected) { //selected OR deselected
       if ($(this).val() == "" || $(this).val() == null) {
         $(this).parent().removeClass("success");
@@ -48,36 +49,6 @@ $(document).ready(function(){
         $(this).parent().addClass("success");
       }
     });
-    /* --------------------------------------------------------
-        Layout
-    -----------------------------------------------------------*/
-    (function () {
-
-        //Get saved layout type from LocalStorage
-        var layoutStatus = localStorage.getItem('ma-layout-status');
-        $('#header').attr('data-current-skin', "pink");
-        if(!$('#header-2')[0]) {  //Make it work only on normal headers
-            if (layoutStatus == 1) {
-                $('body').addClass('sw-toggled');
-                $('#tw-switch').prop('checked', true);
-            }
-        }
-
-        $('body').on('change', '#toggle-width input:checkbox', function () {
-            if ($(this).is(':checked')) {
-                setTimeout(function () {
-                    $('body').addClass('toggled sw-toggled');
-                    localStorage.setItem('ma-layout-status', 1);
-                }, 250);
-            }
-            else {
-                setTimeout(function () {
-                    $('body').removeClass('toggled sw-toggled');
-                    localStorage.setItem('ma-layout-status', 0);
-                }, 250);
-            }
-        });
-    })();
 
     //Hack for modal to work on dropdown menu
     $('header .lv-item').click(function(e) {
@@ -110,30 +81,12 @@ $(document).ready(function(){
         }
     }
 
-    /*
-     * Top Search
-     */
-    (function(){
-        $('body').on('click', '#top-search > a', function(e){
-            e.preventDefault();
-
-            $('#header').addClass('search-toggled');
-            $('#top-search-wrap input').focus();
-        });
-
-        $('body').on('click', '#top-search-close', function(e){
-            e.preventDefault();
-
-            $('#header').removeClass('search-toggled');
-        });
-    })();
-
     /*
      * Sidebar
      */
     (function(){
         //Toggle
-        $('body').on('click', '#menu-trigger, #chat-trigger', function(e){
+        $('body').on('click', '#menu-trigger', function(e){
             e.preventDefault();
             var x = $(this).data('trigger');
 
@@ -146,58 +99,42 @@ $(document).ready(function(){
             $(this).find('ul').hide();
           });
 
+          $('.profile-menu .main-menu').hide();
 
+          if (x == '#sidebar') {
 
-      $('.profile-menu .main-menu').hide();
-
-            if (x == '#sidebar') {
-
-                $elem = '#sidebar';
-                $elem2 = '#menu-trigger';
-
-                $('#chat-trigger').removeClass('open');
-
-                if (!$('#chat').hasClass('toggled')) {
-                    $('#header').toggleClass('sidebar-toggled');
-                }
-                else {
-                    $('#chat').removeClass('toggled');
-                }
-            }
+              $elem = '#sidebar';
+              $elem2 = '#menu-trigger';
 
-            if (x == '#chat') {
-                $elem = '#chat';
-                $elem2 = '#chat-trigger';
+              $('#chat-trigger').removeClass('open');
 
-                $('#menu-trigger').removeClass('open');
-
-                if (!$('#sidebar').hasClass('toggled')) {
-                    $('#header').toggleClass('sidebar-toggled');
-                }
-                else {
-                    $('#sidebar').removeClass('toggled');
-                }
-            }
+              if (!$('#chat').hasClass('toggled')) {
+                  $('#header').toggleClass('sidebar-toggled');
+              }
+              else {
+                  $('#chat').removeClass('toggled');
+              }
+          }
 
-            //When clicking outside
-            if ($('#header').hasClass('sidebar-toggled')) {
-                $(document).on('click', function (e) {
-                    if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
-                        setTimeout(function(){
-                            $($elem).removeClass('toggled');
-                            $('#header').removeClass('sidebar-toggled');
-                            $($elem2).removeClass('open');
-                        });
-                    }
-                });
-            }
+          //When clicking outside
+          if ($('#header').hasClass('sidebar-toggled')) {
+              $(document).on('click', function (e) {
+                  if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
+                      setTimeout(function(){
+                          $($elem).removeClass('toggled');
+                          $('#header').removeClass('sidebar-toggled');
+                          $($elem2).removeClass('open');
+                      });
+                  }
+              });
+          }
         })
 
         //Submenu
         $('body').on('click', '.sub-menu > a', function(e){
-            e.preventDefault();
-            $(this).next().slideToggle(200);
-            $(this).parent().toggleClass('toggled');
+          e.preventDefault();
+          $(this).next().slideToggle(200);
+          $(this).parent().toggleClass('toggled');
         });
     })();
 
@@ -229,7 +166,7 @@ $(document).ready(function(){
 
       //Popup empty message
       setTimeout(function(){
-          $('#notifications').addClass('empty');
+         $('#notifications').addClass('empty');
       }, (z*150)+200);
     });
 
@@ -380,9 +317,9 @@ $(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();
+      Waves.attach('.btn:not(.btn-icon):not(.btn-float)');
+      Waves.attach('.btn-icon, .btn-float', ['waves-circle', 'waves-float']);
+      Waves.init();
     })();
 
     /*
@@ -462,87 +399,6 @@ $(document).ready(function(){
         });
     }
 
-    /*
-     * Login
-     */
-    if ($('.login-content')[0]) {
-        //Add class to HTML. This is used to center align the logn box
-        $('html').addClass('login-content');
-
-        $('body').on('click', '.login-navigation > li', function(){
-            var z = $(this).data('block');
-            var t = $(this).closest('.lc-block');
-
-            t.removeClass('toggled');
-
-            setTimeout(function(){
-                $(z).addClass('toggled');
-            });
-
-        })
-    }
-
-    /*
-     * Fullscreen Browsing
-     */
-    if ($('[data-action="fullscreen"]')[0]) {
-      var fs = $("[data-action='fullscreen']");
-      fs.on('click', function(e) {
-          e.preventDefault();
-
-          //Launch
-          function launchIntoFullscreen(element) {
-            if(element.requestFullscreen) {
-              element.requestFullscreen();
-            } else if(element.mozRequestFullScreen) {
-              element.mozRequestFullScreen();
-            } else if(element.webkitRequestFullscreen) {
-              element.webkitRequestFullscreen();
-            } else if(element.msRequestFullscreen) {
-              element.msRequestFullscreen();
-            }
-          }
-
-          //Exit
-          function exitFullscreen() {
-            if(document.exitFullscreen) {
-              document.exitFullscreen();
-            } else if(document.mozCancelFullScreen) {
-              document.mozCancelFullScreen();
-            } else if(document.webkitExitFullscreen) {
-              document.webkitExitFullscreen();
-            }
-          }
-
-          launchIntoFullscreen(document.documentElement);
-          fs.closest('.dropdown').removeClass('open');
-      });
-    }
-
-    /*
-     * Clear Local Storage
-     */
-    if ($('[data-action="clear-localstorage"]')[0]) {
-        var cls = $('[data-action="clear-localstorage"]');
-
-        cls.on('click', function(e) {
-            e.preventDefault();
-
-            swal({
-                title: "¿Estás seguro?",
-                text: "Todos tus datos locales serán borrados.",
-                type: "warning",
-                showCancelButton: true,
-                confirmButtonColor: "#DD6B55",
-                confirmButtonText: "Borrar",
-                cancelButtonText: "Cancelar",
-                closeOnConfirm: false
-            }, function(){
-                localStorage.clear();
-                swal("Hecho!", "Cache borrada", "success");
-            });
-        });
-    }
 
     /*
      * Profile Edit Toggle
@@ -785,10 +641,6 @@ function advance_search(url,offset,format) {
   }
 };
 
-$(document).ready(function(){
-  $( ".paginator" ).clone().appendTo( "#content" );
-});
-
 function read_notify(id,url) {
   $.ajax({
     url: '/notifications/' + id,

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

@@ -4,15 +4,16 @@
   - id = "#{name}_#{rand(1000)}"
 - unless defined? placeholder
   - placeholder = "..."
-
+-unless defined? onkeyup
+  -onkeyup = ''
 
 -if required
   .form-group.has-feedback.has-success
     label #{title}
     .fg-line
-      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" required="" value="#{value}"
+      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" required="" value="#{value}" onkeyup="#{onkeyup}"
 -else
   .form-group
     label #{title}
     .fg-line
-      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" value="#{value}"
+      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" value="#{value}" onkeyup="#{onkeyup}"

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

@@ -4,11 +4,13 @@
   - id = "#{name}_#{rand(1000)}"
 - unless defined? placeholder
   - placeholder = "Escribe aquí..."
+- unless defined? rows
+  - rows = 5
 
 .form-group
   .fg-line
     label.fg-label #{title}
     - if required
-      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="5" maxlength="#{length}" required="" #{value}
+      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" required="" #{value}
     - else
-      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="5" maxlength="#{length}" #{value}
+      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" #{value}

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

@@ -9,6 +9,8 @@
         == multiple_select_input({ :name => "user_id", :elements => notifications.collect { |notification| { :value => notification.creator.id, :text => notification.creator.full_name } }.uniq, :placeholder => "Empleados", :selected_elements => filters[:user_id] })
       .col-md-12
         == multiple_select_input({ :name => "label", :elements => Notification.labels.collect { |notification| { :value => notification.label, :text => notification.label.upcase } }, :placeholder => "Etiquetas", :selected_elements => filters[:label] })
+      .col-md-12
+        == multiple_select_input({ :name => "status", :elements => Notification.labels.collect { |notification| { :value => notification.label, :text => notification.label.upcase } }, :placeholder => "Etiquetas", :selected_elements => filters[:label] })
   .pm-body.clearfix
     ul.tab-nav.tn-justified role="tablist"
       li.waves-effect.active role="presentation"

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Marco Zanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
-dependencies: []
+date: 2020-06-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sucker_punch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2019'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2019'
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com
 executables: []
@@ -18,7 +60,12 @@ extra_rdoc_files: []
 files:
 - lib/sinatra/extensions/antiquity.rb
 - lib/sinatra/extensions/date.rb
+- lib/sinatra/extensions/generalmail.rb
+- lib/sinatra/extensions/generalmailnolink.rb
 - lib/sinatra/extensions/init.rb
+- lib/sinatra/extensions/mail.rb
+- lib/sinatra/extensions/mailbuilder.rb
+- lib/sinatra/extensions/mailsender.rb
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/handlers/errors.rb
 - lib/sinatra/handlers/init.rb
@@ -31,7 +78,6 @@ files:
 - lib/sinatra/helpers/init.rb
 - lib/sinatra/helpers/inputs.rb
 - lib/sinatra/helpers/libraries.rb
-- lib/sinatra/helpers/mailer.rb
 - lib/sinatra/helpers/reports.rb
 - lib/sinatra/helpers/schedule.rb
 - lib/sinatra/helpers/subscriptions.rb

data/lib/sinatra/helpers/mailer.rb

@@ -1,74 +0,0 @@
-# encoding: utf-8
-require 'sucker_punch'
-
-module Sinatra
-  module MailHelper
-
-    attr_reader :access_token, :expire, :refresh_token
-
-    def _do_connect(uri, form={},token=nil)
-      url = URI.parse("#{uri}")
-      http = Net::HTTP.new(url.host, url.port)
-      http.read_timeout = 1000
-      http.use_ssl = (url.scheme == 'https')
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      header = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-      header["Authorization"] = "Bearer #{token}" unless token.nil?
-      request = Net::HTTP::Post.new(url, header)
-      request.form_data = form
-      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)
-      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"])
-      else
-        p "Didn't succeed :("
-      end
-    end
-
-    def _build_map_values(mail_values)
-      values = []
-      for key in mail_values.keys
-        index = mail_values.keys.index(key)
-        values << ["MailValues[#{index}].Key", key]
-        values << ["MailValues[#{index}].Value", mail_values[key]]
-      end
-      values
-    end
-
-    def _build_to_map(to_map)
-      values = []
-      for key in to_map.keys
-        index = to_map.keys.index(key)
-        values << ["ResourcesRequest[#{index}].TypeGroup", to_map[key]]
-        values << ["ResourcesRequest[#{index}].Name", key]
-      end
-      values
-    end
-
-    def _expired?
-      expire.nil? || DateTime.now < expire
-    end
-
-    def send_mail(template,subject,mail_values={},to_map)
-      if _expired?
-        _authorize_mail
-      end
-      params = [ [ "ApplicationCode", 1 ], [ "Name", template ], [ "Subject", subject ], [ "EmailAddress", "apps@hexacta.com" ] ]
-      params = params + _build_map_values(mail_values) + _build_to_map(to_map)
-      response = do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
-      if( !response.is_a?( Net::HTTPSuccess ) )
-        p "Didn't succeed :("
-      end
-    end
-
-  end
-
-  helpers MailHelper
-end