sinatra-hexacta 0.9.9 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1527a6976dccdc8e0671ca368db4dede08837652c36ca2c544543d3ff9fcb3be
-  data.tar.gz: c3e02dbeeead7c8615df1a93b10755388f824a129f097b159658e00db3a2c073
+  metadata.gz: '028a33ab389fa16403a18c0f0cc8eb21bd0dbdec629ad9aad4ff64edeefae4d4'
+  data.tar.gz: 81eaf1d3fd5c9acbfe46bf6e9a46688a36ec6ce55573b76402f3c2716ac1f7d2
 SHA512:
-  metadata.gz: 898e87e91e11e7927f95d2176f8b1a68dbd71ee4ac64c0ba892effe154b43b0e86af7ce9e767243f5a2fc661dea24cddfcff40b8262b1ce4849174a38c98d9f1
-  data.tar.gz: 220b078e0f853f178245153a18de06a3e68f4a556e2ea0a8d01d38c6c4b372f1379b4f30ac22568840b78ad03fbe2f508e2bd975c70d20773f153289e834d6b0
+  metadata.gz: 54f1e6150ddc605f57e5c4fa699f9754924702d8d458c781980f8725324f9c59e7750452fab0f575c615d526a40130f87aa8507a46a16307fb4e8107c1409594
+  data.tar.gz: 6c5016a956e3f9c1c376abe8b4578beb10c49044baa0d1b086cd6b0b13bb90e5c3aad7e3bb1f2bbdf405b5ba6687d58b946bc12d49e4543c936f4970dc05a029

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,10 +1,11 @@
 # encoding: utf-8
-require_relative 'date'
 require_relative 'antiquity'
-require_relative 'notification'
+require_relative 'date'
+require_relative 'mailbuilder'
 require_relative 'mailsender'
 require_relative 'mail'
 require_relative 'generalmail'
-require_relative 'mailbuilder'
-require_relative 'processmanager'
+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,9 +7,10 @@ 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|
@@ -18,6 +19,7 @@ module Sinatra
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.1
 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