sinatra-hexacta 0.3.16 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2addd64e7ebac42c4aeccc65414240b0ffb714dd94ac81630c5741c0d5ec6a57
-  data.tar.gz: 86adc8490e9cca2edc1e46140ae7a7caed7f8af4fa849ccfb17eceb5a7fddd5f
+  metadata.gz: 728aa24903dfacd5848f5cf2fc1f88927f658951a69a5f92ef691851c42cd856
+  data.tar.gz: e80174daa95bb53cd75ad0478d96fde0ebbbb7616e2da79a6b52ec04378be60e
 SHA512:
-  metadata.gz: 71e3834fe92195381910b5ced4353737e0a889730d04776b8a9a5db24035103f33441f1c4107ff73efb83a58917e10d8a64805e222160d71d47c5e66ddf154d0
-  data.tar.gz: 46b458692b2ea24a3892b3f3c25e4402c28bb56bdc88171ddbcac83cc836c0282b2cfcc7d3ba762f03b27f58dc24cff5fa7ea86c4aefd33566715c96663668c0
+  metadata.gz: 6ad49dbe7dcf2d8b4863455ba676313a8963b5569a322e73e5e1401db20d4a8b537b32827ede670c228673a10a4d2c50e703d60e785f79b76dcdb3c3effb043d
+  data.tar.gz: 5d9a06abb2fce33e637f5a9b436139d6c466e6992ad6aa937ff5fc90025e567581db96000e5a6dab8ae264c48135619a51e20e41e343b49f2b9058e9bf1df8b4

data/lib/sinatra/handlers/errors.rb

@@ -10,17 +10,24 @@ module Sinatra
       error_template(404)
       error_template(403)
       error_template(500)
+      error_template(Sequel::DatabaseDisconnectError)
+      error_template(Sequel::DatabaseConnectionError)
     end
 
     def error_template(code)
-      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
+      if code.is_a? Numeric
+        template_code = code
+      else
+        template_code = code.to_s.split('::').last
+      end
+      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{template_code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{template_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.instance.send_error(authenticated(User),title,message)
         end
-        slim "#{Hexacta::GEM_FILE_DIR}/errors/#{code}".to_sym, locals: { :params => params }
+        slim "#{Hexacta::GEM_FILE_DIR}/errors/#{template_code}".to_sym, locals: { :params => params }
       end
     end
 

data/lib/sinatra/public/css/app.min.1.css

@@ -11247,10 +11247,6 @@ body:not(.sw-toggled) #sidebar {
   }
 }
 
-.listview.lv-lg .lv-item:hover {
-  background-color: #FFFFDB;
-}
-
 .listview .lv-item {
   position: relative;
   display: block;
@@ -16359,4 +16355,35 @@ svg.ct-chart-bar, svg.ct-chart-line{
 .ct-legend .ct-series-14:before {
   background-color: #a748ca;
   border-color: #a748ca;
-}
+}
+
+/* HEADER RESULTS */
+
+#header .results {
+  display:block;
+  position: absolute;
+  width: 500px;
+  background: white;
+  margin-left: 20px;
+  margin-top: 5px;
+  border-radius: 2px;
+  overflow: auto;
+  max-height: 0px;
+  opacity: 0;
+  -webkit-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#header .results.toggled {
+  opacity: 1;
+  max-height: 400px;
+}
+
+.progressive {
+  animation: load 5s cubic-bezier(0.165, 0.840, 0.440, 1.000) forwards;
+}
+
+@keyframes load {
+  0% { width: 0; }
+  100% { width: 100%; }
+}

data/lib/sinatra/public/js/finder.js

@@ -0,0 +1,79 @@
+class Finder {
+
+  static find(query){
+    $.ajax({
+        url: "/find",
+        type: 'GET',
+        data: { query: query }
+    }).done(function(result) {
+      $("#header .results").html(result);
+    });
+  }
+
+  static do_find(url,query,html){
+    $.ajax({
+        url: url,
+        type: 'GET',
+        data: { query: query }
+    }).done(function(result) {
+      $(html).html(result);
+    });
+  }
+}
+
+var last_query = null;
+var header_input_timeout = null;
+$.xhrPool = [];
+
+$.xhrPool.abortAll = function() {
+    $(this).each(function(idx, jqXHR) {
+        jqXHR.abort();
+    });
+    $(this).each(function(idx, jqXHR) {
+        var index = $.inArray(jqXHR, $.xhrPool);
+        if (index > -1) {
+            $.xhrPool.splice(index, 1);
+        }
+    });
+};
+
+$.ajaxSetup({
+    beforeSend: function(jqXHR) {
+        $.xhrPool.push(jqXHR);
+    },
+    complete: function(jqXHR) {
+        var index = $.inArray(jqXHR, $.xhrPool);
+        if (index > -1) {
+            $.xhrPool.splice(index, 1);
+        }
+    }
+});
+
+$(document).ready(function(){
+
+  $("#header input").focusin(function() {
+    $("#header .results").addClass("toggled");
+  })
+  $("#header input").focusout(function() {
+    $("#header .results").removeClass("toggled");
+  })
+  $('#header .results').click(function() {
+    $("#header input").focus();
+  });
+  $('#header input').keyup(function() {
+      clearTimeout(header_input_timeout);
+
+      if($('#header input').val().length > 2 && $.trim($('#header input').val())) {
+        header_input_timeout = setTimeout(function() {
+          $.xhrPool.abortAll();
+          if (last_query != $.trim($('#header input').val())) {
+            last_query = $.trim($('#header input').val());
+            console.log(last_query);
+            if (last_query.length > 2) {
+              Finder.find(last_query);
+            }
+          }
+        }, 1000);
+      }
+  });
+});

data/lib/sinatra/views/errors/DatabaseConnectionError.slim

@@ -0,0 +1,27 @@
+.row
+  .col-xs-12
+    .progress.progress-striped.active.bgm-red style="height:80px;"
+      .progress-bar.progress-bar-danger aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" style="width: 0%;text-align:left;"
+        .lv-item.p-20.p-fixed
+          .media
+            .pull-left
+              i.zmdi.zmdi-hc-3x.zmdi-cloud-off.c-white
+            .media-body
+              .lv-title.c-white Error de conexión con la base de datos
+              small.lv-small.c-white Espera unos segundos mientras se reestablece la conexión.
+
+
+javascript:
+  $(document).ready(function() {
+    setTimeout(function(){
+       window.location.reload(1);
+    }, 5000);
+
+    update_progress();
+
+    function update_progress() {
+        var current = $(".progress-bar").width() / $('.progress-bar').parent().width() * 100;
+        $(".progress-bar").width( current + 10 + "%");
+        setTimeout(update_progress, 100);
+    }
+  });

data/lib/sinatra/views/errors/DatabaseDisconnectError.slim

@@ -0,0 +1,29 @@
+.row
+  .col-xs-12
+    .progress.progress-striped.active.bgm-orange style="height:80px;"
+      .progress-bar.progress-bar-warning aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" style="width: 0%;text-align:left;"
+        .lv-item.p-20.p-fixed
+          .media
+            .pull-left
+              i.zmdi.zmdi-hc-3x.zmdi-cloud-off.c-white
+            .media-body
+              .lv-title.c-white Conexión con la base de datos
+              small.lv-small.c-white Espera unos segundos mientras se reestablece la conexión.
+
+
+
+javascript:
+  $(document).ready(function() {
+    setTimeout(function(){
+       window.location.reload(1);
+    }, 5000);
+
+    update_progress();
+
+    function update_progress() {
+        var current = $(".progress-bar").width() / $('.progress-bar').parent().width() * 100;
+        $(".progress-bar").width( current + 10 + "%");
+        setTimeout(update_progress, 100);
+    }
+  });
+

data/lib/sinatra/views/libraries/include_js_before.slim

@@ -6,3 +6,4 @@ script src="/sinatra-hexacta/vendors/chartist/chartist.min.js"
 script src="/sinatra-hexacta/vendors/chartist/chartist-plugin-legend.js"
 
 script src="/sinatra-hexacta/js/app.js?ver=#{settings.version}" type='text/javascript'
+script src="/sinatra-hexacta/js/finder.js?ver=#{settings.version}" type='text/javascript'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.4.2
 platform: ruby
 authors:
 - Marco Zanger
@@ -110,10 +110,11 @@ files:
 - lib/sinatra/public/fonts/roboto/Roboto-Thin-webfont.svg
 - lib/sinatra/public/fonts/roboto/Roboto-Thin-webfont.ttf
 - lib/sinatra/public/fonts/roboto/Roboto-Thin-webfont.woff
+- lib/sinatra/public/img/finder.jpg
 - lib/sinatra/public/img/select.png
 - lib/sinatra/public/img/select@2x.png
 - lib/sinatra/public/js/app.js
-- lib/sinatra/public/js/form_validator.js
+- lib/sinatra/public/js/finder.js
 - lib/sinatra/public/vendors/animate.css/animate.min.css
 - lib/sinatra/public/vendors/bootstrap-validator/validator.js
 - lib/sinatra/public/vendors/bootstrap/bootstrap.min.js
@@ -157,6 +158,8 @@ files:
 - lib/sinatra/views/errors/403.slim
 - lib/sinatra/views/errors/404.slim
 - lib/sinatra/views/errors/500.slim
+- lib/sinatra/views/errors/DatabaseConnectionError.slim
+- lib/sinatra/views/errors/DatabaseDisconnectError.slim
 - lib/sinatra/views/inputs/date.slim
 - lib/sinatra/views/inputs/input.slim
 - lib/sinatra/views/inputs/month.slim

data/lib/sinatra/public/js/form_validator.js

@@ -1,29 +0,0 @@
-
-$(':input[required]').each(function() {
-  console.log($(this).val());
-  if ($(this).val() == "" || $(this).val() == null) {
-    $(this).parent().removeClass("has-success");
-    $(this).parent().addClass("has-error");
-  } else {
-    $(this).parent().removeClass("has-error");
-    $(this).parent().addClass("has-success");
-  }
-})
-
-
-$(function() { //shorthand document.ready function
-    $('form').on('submit', function(e) { //use on if jQuery 1.7+
-      $(this).find(':input[required]').each(function() {
-        if ($(this).val() == "" || $(this).val() == null) {
-          $(this).parent().removeClass("success");
-          $(this).parent().addClass("error");
-        } else {
-          $(this).parent().removeClass("error");
-          $(this).parent().addClass("success");
-        }
-      })
-      if ($(this).find(':input[required]').length > 0) {
-        e.preventDefault();
-      }
-    });
-});