sinatra-hexacta 1.7.15 → 1.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aabdd0fb02e996cf538594108b6423a1ba8e784628d48c75419d75ac09413aa
-  data.tar.gz: 410dda8303a38de19a2296887cf002c59ef38103464461418af3db349e551b0c
+  metadata.gz: d01443ebb1b12e1ceb49cbf169aa512cfead5d8cd4115982b1d22e6e15f63497
+  data.tar.gz: fc8b3a9171e2fcd4ebac49d3cff5282794620137aefd1a4c988a3e24d9de25f4
 SHA512:
-  metadata.gz: b1cdd4b009077b130502881ab36838a5c285c1cb02a4bb2fefdc969f657171b636967ef2d93dd6a8f5139ccce913f8f667d0ff0a9a6f3c3da90848edd39334ba
-  data.tar.gz: ade57d891f9f39c949fc4cee131f6a29c4d37ac1fbfff728127b98ee3d8ef69fbc61fb915da3453a704ef775dea7a34339fe9ab567e9c7e06188e89af3a6bab2
+  metadata.gz: 0d5da392906cdf62184f1b8a3733884981b367f8113cd185d8b036df36697375ed7eedf00395f18587dec8d408d1ae492a4da87e8c07a34f74d7e9e42b1558c6
+  data.tar.gz: 17756b64a15a6024be29f234806df72f1741bb08867d55dc49af2c67520a19045ca450e6996010d6f969f2db060ccd8feec7f1652003a581c66dd8f17daaf223

data/lib/sinatra/extensions/init.rb

@@ -10,3 +10,4 @@ require_relative 'generalmailnolink'
 require_relative 'menu'
 require_relative 'notification'
 require_relative 'processmanager'
+require_relative 'report_generator'

data/lib/sinatra/extensions/report_generator.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+class ReportGenerator
+
+  def build(report_columns,query)
+    workbook = RubyXL::Workbook.new
+    worksheet = workbook[0]
+
+    report_columns.each_with_index do |report_column, i|
+      worksheet.add_cell(0, i, report_column.name)
+    end
+
+    query.all.each_with_index do |element, x|
+      report_columns.each_with_index do |report_column, y|
+        worksheet.add_cell(x+1, y, report_column.value(element))
+      end
+    end
+
+    IO.copy_stream(workbook.stream, out)
+  end
+
+end

data/lib/sinatra/helpers/schedule.rb

@@ -5,61 +5,83 @@ module Sinatra
 
     @@scheduler = Rufus::Scheduler.new
 
-    def schedule_every(time) 
+    def check_file_locked?(specific_lock_file=nil)
+      return false if specific_lock_file.nil?
+      f = File.open("/tmp/#{specific_lock_file}", File::CREAT)
+      Timeout::timeout(0.001) { f.flock(File::LOCK_EX) }
+      f.flock(File::LOCK_UN)
+      false
+    rescue 
+      true
+    ensure
+      unless f.nil?
+        f.close
+      end
+    end
+
+    def schedule_every(time,specific_lock_file) 
       @@scheduler.every time do
-        begin
-          file_path = "/tmp/schedule.lock";
-          f = File.open(file_path, "w+")
-          # if file was previosly locked then flock throw a exception
-          f.flock(File::LOCK_EX)
-          ten_minutes = 600
-          # if the process overcome ten minutes, the timeout api throw a exception
-          Timeout::timeout(ten_minutes) do 
 
-            begin
-              yield
-            rescue StandardError => error
-              title = error.message.split(':')[0].gsub('#<','');
-              message = error.backtrace.join(',');
-              NotificationSender.instance.send_error(nil,title,message)
-            end
+        unless check_file_locked?(specific_lock_file)
+          begin
+            file_path = specific_lock_file.nil?? "/tmp/schedule.lock" : "/tmp/#{specific_lock_file}";
+            f = File.open(file_path, "w+")
+            # if file was previosly locked then flock throw a exception
+            f.flock(File::LOCK_EX)
+            ten_minutes = 600
+            # if the process overcome ten minutes, the timeout api throw a exception
+            Timeout::timeout(ten_minutes) do 
 
-          end
-        ensure
-          unless f.nil?
-            f.flock(File::LOCK_UN)
-            f.close
+              begin
+                yield
+              rescue StandardError => error
+                title = error.message.split(':')[0].gsub('#<','');
+                message = error.backtrace.join(',');
+                NotificationSender.instance.send_error(nil,title,message)
+              end
+
+            end
+          ensure
+            unless f.nil?
+              f.flock(File::LOCK_UN)
+              f.close
+            end
           end
         end
+
       end
     end
 
-    def schedule_at(cron_expression) 
+    def schedule_at(cron_expression,specific_lock_file) 
       @@scheduler.cron cron_expression do
-        begin
-          file_path = "/tmp/schedule.lock";
-          f = File.open(file_path, "w+")
-          # if file was previosly locked then flock throw a exception
-          f.flock(File::LOCK_EX)
-          ten_minutes = 600
-          # if the process overcome ten minutes, the timeout api throw a exception
-          Timeout::timeout(ten_minutes) do 
 
-            begin
-              yield
-            rescue error
-              title = error.message.split(':')[0].gsub('#<','');
-              message = error.backtrace.join(',');
-              NotificationSender.instance.send_error(nil,title,message)
-            end
+        unless check_file_locked?(specific_lock_file)
+          begin
+            file_path = specific_lock_file.nil?? "/tmp/schedule.lock" : "/tmp/#{specific_lock_file}";
+            f = File.open(file_path, "w+")
+            # if file was previosly locked then flock throw a exception
+            f.flock(File::LOCK_EX)
+            ten_minutes = 600
+            # if the process overcome ten minutes, the timeout api throw a exception
+            Timeout::timeout(ten_minutes) do 
 
-          end
-        ensure
-          unless f.nil?
-            f.flock(File::LOCK_UN)
-            f.close
+              begin
+                yield
+              rescue error
+                title = error.message.split(':')[0].gsub('#<','');
+                message = error.backtrace.join(',');
+                NotificationSender.instance.send_error(nil,title,message)
+              end
+
+            end
+          ensure
+            unless f.nil?
+              f.flock(File::LOCK_UN)
+              f.close
+            end
           end
         end
+
       end
     end
   end

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

@@ -76,6 +76,7 @@ function update_html_elements() {
           }
           $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="min-width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="f-900 c-gray">' + error.responseText + '</div></div></div></div></div>');
           $('#error-modal').modal('show');
+          $(this).find(':submit').attr("disabled",false);
         }
       });
     });

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

@@ -11,8 +11,8 @@
               a.bgm-blue.c-white #{i}
           -else
             li.page-pre
-              a href="#" onclick="advance_search(#{report.id},#{i-1},'#{format}');" #{i}
+              a href="#" onclick="advance_search('#{url}',#{i-1},'#{format}');" #{i}
     ul.pagination.no-margin style="vertical-align:middle"
       -if offset < pages -1
         li.page-last
-          a onclick="advance_search(#{report.id},#{pages-1},'#{format}');" »
+          a onclick="advance_search('#{url}',#{pages-1},'#{format}');" »

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.7.15
+  version: 1.7.17
 platform: ruby
 authors:
 - Marco Zanger
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rubyXL
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.25
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.25
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com
 executables: []
@@ -98,6 +112,7 @@ files:
 - lib/sinatra/extensions/menu.rb
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/extensions/processmanager.rb
+- lib/sinatra/extensions/report_generator.rb
 - lib/sinatra/handlers/constants.rb
 - lib/sinatra/handlers/cross_origin.rb
 - lib/sinatra/handlers/errors.rb