sinatra-hexacta 0.9.10 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7237053cbdcc440bd4fde16b66c6ff8cc28d6d63a27596b4a9b962dc1e678ae2
-  data.tar.gz: 0523dc1442a53cf68febcaed9ebe460a96f80daa7f1d89a1470f73eafcda26ca
+  metadata.gz: af7c99e68c553f97a92ec0b45c94ada65f2203910e836c7a76920c0953c3dd3c
+  data.tar.gz: 03de8cc91fda70f02f480603709e7a941e6e5e4b282f7f0359a35851f940678f
 SHA512:
-  metadata.gz: 9561c5a10a2b0c49283f19c4ac79a09af68ab7c11d5c219b61800ce642faebd1aaeb3059411bfbd7b8b489bcd17ac05e4ea8234b5ca2a64eb0e47c2ee90d8a7e
-  data.tar.gz: 7752262c0cd58d447facd1aabaab19e0fd2451c58d19f4accd908b5ba08b63bdf06fad992161c7399be4e816377cbddcde2e8ca4f621b13052cf8ebb2a0a3c62
+  metadata.gz: 2ff2d364a803e18b86e93d319a2aeb5c80a5d7e7875f3a57f830920e11edf0c39f9347be9054eee9deeab019dbd381301d4e6aeda568021b1b744b86c85de715
+  data.tar.gz: 1c9309b67b4b182aec31225af8ccc6faa1c534e4bc6ea132744be2b35c2b6d838e013f39c9019f805ea570e132e127dab7f69d43b332901af164086b1996c43b

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 'mail'
 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

metadata

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