sinatra-hexacta 0.9.11 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5340f49fa2a15a3830fc98bbe482d45c2ed66de5f73bf61e9c7f32d38707b49c
-  data.tar.gz: 763cccc64fb33aabc02c28d0c4e3e5057145736e3297a719edc6caec5ac6936d
+  metadata.gz: b7b030f298091b86eff87999817b7e167b7f23f70a1cb96cc82571785ab4fecd
+  data.tar.gz: 89f21adaf020ba14de57ef7b890ae23013bf827e96dd2cf5d6e7cc793d8d42ad
 SHA512:
-  metadata.gz: 3ab73f472328e27b8871a9524d5889c1e55c23f84542193c4b1463cd2712cf900b54914b757d173ab9d18cc984d70a105b859f1506f9810aa59b5a22aed69324
-  data.tar.gz: f726c79a155d2f5bb55b07064d74024d08d39819c72e61f98ab75f0d965121eac9fa75f3bcb6b296722cf798467390d2db849f1c4cf8a0378cb134616d4d5807
+  metadata.gz: '04543278f129084cd3c67cc5e7aa83ae5c2ee6ef7e9e5cf730927637629b8151384d0fbdc9800e5bf5ccc8748ea3d8ec88fe762289a782c59162ea2b2fc3fc0c'
+  data.tar.gz: 39ffb8a63ecd557b5700c8b7d8feac27ba97d884e979087fe33e2333bd44990381e2a003c3c2f72e15374d180b8f4f2d06006aa647a13660360250ffbc1d5968

data/lib/sinatra/extensions/antiquity.rb

@@ -5,16 +5,16 @@ class Antiquity
     @periods = periods.sort { |a,b| a.start_date <=> b.start_date }
   end
 
-  def days
-    @periods.inject(0) { |total, period| total + period.days }
+  def days(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.days(upto_date) }
   end
 
-  def months
-    @periods.inject(0) { |total, period| total + period.months }
+  def months(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.months(upto_date) }
   end
 
-  def years
-    months.divmod(12).first
+  def years(upto_date=Date.today)
+    months(upto_date).divmod(12).first
   end
 
   def to_s(upto_date=Date.today)
@@ -22,11 +22,13 @@ class Antiquity
     result = ""
     return result if @periods.empty?
     if date >= @periods.first.start_date
-      result += years > 1 ? "#{years} años" : "#{years} año" unless years == 0
-      result += ", " if years >= 1 && !(months.modulo(12).eql?(0))
-      result += months.modulo(12) > 1 ? "#{months.modulo(12)} meses" : "#{months.modulo(12)} mes" unless months.modulo(12) == 0
-      result += "#{(date - @periods.last.start_date).to_i} dias" if months.modulo(12) == 0 && years == 0 && date > @periods.last.start_date
-      result += "Hoy!" if months.modulo(12) == 0 && date == @periods.last.start_date
+      years_upto_date = years(date)
+      months_upto_date = months(date)
+      result += years_upto_date > 1 ? "#{years_upto_date} años" : "#{years_upto_date} año" unless years_upto_date == 0
+      result += ", " if years_upto_date >= 1 && !(months_upto_date.modulo(12).eql?(0))
+      result += months_upto_date.modulo(12) > 1 ? "#{months_upto_date.modulo(12)} meses" : "#{months_upto_date.modulo(12)} mes" unless months_upto_date.modulo(12) == 0
+      result += "#{(date - @periods.last.start_date).to_i} dias" if months_upto_date.modulo(12) == 0 && years_upto_date == 0 && date > @periods.last.start_date
+      result += "Hoy!" if months_upto_date.modulo(12) == 0 && date == @periods.last.start_date
     end
     result += "En unos días..." if date < @periods.first.start_date
     result

data/lib/sinatra/extensions/init.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 require_relative 'antiquity'
 require_relative 'date'
-require_relative 'generalmail'
-require_relative 'generalmailnolink'
 require_relative 'mailbuilder'
 require_relative 'mailsender'
 require_relative 'mail'
+require_relative 'generalmail'
+require_relative 'generalmailnolink'
 require_relative 'menu'
 require_relative 'notification'
 require_relative 'processmanager'

data/lib/sinatra/extensions/processmanager.rb

@@ -3,6 +3,7 @@
 class AsyncProcess
   include SuckerPunch::Job
   attr_reader :handler
+  attr_reader :user_id
 end
 
 class ExampleProcess < AsyncProcess
@@ -25,10 +26,10 @@ end
 
 class ProcessHandler
 
-  attr_reader :log, :error, :interrupted, :name, :id, :performed, :total, :clazz
+  attr_reader :log, :error, :interrupted, :name, :id, :performed, :total, :clazz, :user_id
   attr_accessor :total
 
-  def initialize(id, name, clazz)
+  def initialize(id, name, clazz, user_id)
     @id = id
     @total = 0
     @performed = 0
@@ -37,6 +38,7 @@ class ProcessHandler
     @interrupted = false
     @name = name
     @clazz = clazz
+    @user_id = user_id
   end
 
   def progress
@@ -74,21 +76,22 @@ class ProcessManager
     @handlers = []
   end
 
-  def find(clazz)
-    @handlers.find { |handler| handler.clazz == clazz }
+  def find(clazz,user_id)
+    @handlers.find { |handler| handler.clazz == clazz && handler.user_id == user_id }
   end
 
   def run(*args)
-    clean(args.first.to_s)
-    if !running?(args.first.to_s)
-      handler = ProcessHandler.new(rand(1..100000000), args.first.name, args.first.to_s)
+    user_id = args[1][:user_id]
+    clean(args.first.to_s,user_id)
+    if !running?(args.first.to_s,user_id)
+      handler = ProcessHandler.new(rand(1..100000000), args.first.name, args.first.to_s, user_id)
       clazz = args.first
       args[0] = handler
       clazz.perform_async(*args)
       @handlers << handler
       handler
     else
-      find(args.first.to_s)
+      find(args.first.to_s,user_id)
     end
   end
 
@@ -96,15 +99,15 @@ class ProcessManager
     @handlers -= [handler]
   end
 
-  def clean(clazz)
-    @handlers.select { |handler| handler.clazz == clazz }.each do |handler|
+  def clean(clazz,user_id)
+    @handlers.select { |handler| handler.clazz == clazz && handler.user_id == user_id }.each do |handler|
       handler.interrupt
       self.finish(handler)
     end
   end
 
-  def running?(clazz)
-    !@handlers.select { |handler| handler.clazz == clazz }.empty?
+  def running?(clazz,user_id)
+    !@handlers.select { |handler| handler.clazz == clazz && handler.user_id == user_id }.empty?
   end
 
 end

data/lib/sinatra/handlers/processes.rb

@@ -7,17 +7,19 @@ module Sinatra
       p "Enabling processes..."
 
       get '/processes' do
-        return "" if ProcessManager.instance.find(params[:class]).nil?
+        return "" if ProcessManager.instance.find(params[:class],authenticated(User).id).nil?
         content_type :json
-        return { 'name' => ProcessManager.instance.find(params[:class]).name, 'progress' => ProcessManager.instance.find(params[:class]).progress }.to_json
+        process = ProcessManager.instance.find(params[:class],authenticated(User).id)
+        return { 'name' => process.name, 'progress' => process.progress }.to_json
       end
 
       post '/processes/:clazz' do |clazz|
-        ProcessManager.instance.clean(clazz)
+        ProcessManager.instance.clean(clazz,authenticated(User).id)
         200
       end
 
       post '/process' do
+        params[:user_id] = authenticated(User).id
         klass = Object.const_get("#{params[:class]}")
         a_handler = ProcessManager.instance.run(klass,params)
         a_handler.to_json

data/lib/sinatra/views/charts/bar.slim

@@ -1,56 +1,59 @@
-.ct-chart.bar-chart id="#{id}"
+-if labels.empty? || series.empty?
+  == empty_alert({ :title => "Sin datos suficientes", :message => "No hay suficientes datos para mostrar esta información."})
+-else
+  .ct-chart.bar-chart id="#{id}"
 
-.table-responsive.chart-table
-  table.table.table-striped
-    tbody
-      tr
-        -for label in labels
-          th #{label}
-      -for serie in series
+  .table-responsive.chart-table
+    table.table.table-striped
+      tbody
         tr
-          -for element in serie
-            td #{element}
+          -for label in labels
+            th #{label}
+        -for serie in series
+          tr
+            -for element in serie
+              td #{element}
 
 
-javascript:
-  var labels = #{{labels}};
-  var series = #{{series}};
+  javascript:
+    var labels = #{{labels}};
+    var series = #{{series}};
 
-  var options = {
-    seriesBarDistance: 30,
-    fullWidth: true,
-    chartPadding: {
-      right: 40
-    },
-    height: '300px',
-    showLabel: true,
-    plugins: [
-      Chartist.plugins.legend({
-          legendNames: #{{names}},
-      })
-    ]
-  };
+    var options = {
+      seriesBarDistance: 30,
+      fullWidth: true,
+      chartPadding: {
+        right: 40
+      },
+      height: '300px',
+      showLabel: true,
+      plugins: [
+        Chartist.plugins.legend({
+            legendNames: #{{names}},
+        })
+      ]
+    };
 
-  var responsiveOptions = [
-    ['screen and (max-width: 640px)', {
-      seriesBarDistance: 5,
-      axisX: {
-        labelInterpolationFnc: function (value) {
-          return value[0];
+    var responsiveOptions = [
+      ['screen and (max-width: 640px)', {
+        seriesBarDistance: 5,
+        axisX: {
+          labelInterpolationFnc: function (value) {
+            return value[0];
+          }
         }
-      }
-    }]
-  ];
+      }]
+    ];
 
-  new Chartist.Bar("##{id}", {
-      labels: labels,
-      series: series
-    },
-    options,
-    responsiveOptions
-  );
+    new Chartist.Bar("##{id}", {
+        labels: labels,
+        series: series
+      },
+      options,
+      responsiveOptions
+    );
 
-css:
-  ##{{id}} .ct-bar {
-    stroke-width:  #{{100/(labels.count*series.count)}}%
-  }
+  css:
+    ##{{id}} .ct-bar {
+      stroke-width:  #{{100/(labels.count*series.count)}}%
+    }

data/lib/sinatra/views/charts/pie.slim

@@ -9,6 +9,10 @@
       tr
         -for element in serie
           td #{element}
+      tr
+        -total = [1,serie.reduce(:+)].max
+        -for element in serie
+          td #{(element.to_f*100/total).round(0)}%
 
 javascript:
   var labels = #{{labels}};
@@ -25,7 +29,7 @@ javascript:
         Chartist.plugins.legend()
       ]
     }
-    );
+  );
 
 css:
   .pie .ct-legend.ct-legend-inside {

data/lib/sinatra/views/charts/stacked_bar.slim

@@ -18,8 +18,8 @@ javascript:
   var series = #{{series}};
 
   new Chartist.Bar("##{id}", {
-      labels: labels,
-      series: series
+    labels: labels,
+    series: series
   }, {
     stackBars: true,
     axisY: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.3
 platform: ruby
 authors:
 - Marco Zanger
@@ -163,7 +163,6 @@ files:
 - lib/sinatra/public/vendors/malihu-custom-scrollbar-plugin/mCSB_buttons.png
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.css
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.min.css
-- lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff