sinatra-hexacta 0.3.5 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde8163291184a0486d85a908aac0803c8fcd82fd28a8d970e1b0696c7e8b654
-  data.tar.gz: 6e654ceeefaff79b2d1566a9db49d19e71bc02eb119225b5bc22005252d7a1bd
+  metadata.gz: a30ba69a60abe8d2c4d4759c82edf7afd5d079a7dc4e1b9fa44f4de0ca9ec141
+  data.tar.gz: b818302b6ff34967f195d6e59d67b65feafa6e1de6ab41747b64cb6550cf30ea
 SHA512:
-  metadata.gz: 6e54193cd5641d2daf0ad25019ca91ef1dab1f6a5898ab5baec12e6d828e86bb929a683377afb7334830ae6c0b7d83906aed2552a90507262e8a3093aa705977
-  data.tar.gz: 5e8fd50c2dec2e8f2841cfb2a018efd9fb69ee58f70153c5a65b44194796584380ad1aef5e83eacc9a3ad79c3e0ffa37624bc600f93421b9ad441c4d3a320c96
+  metadata.gz: 0e45db2dad9dc2c44115290af7f7dc3d2edc9756f8ead2f7a3c3ede018ef779b61bcb911e49f4d760bdbc164b58506663c533dc15e79a1bcd77581c94bbd5752
+  data.tar.gz: 8f71f3b2d0fda29e8c26a48d45968e2ad2822d030d3549c11ada3201494bd4082458f91387253e4bb140e4582db413325cf4689c6c170578f60ef42cdd404ce5

data/lib/sinatra/extensions/init.rb

@@ -6,3 +6,4 @@ require_relative 'mailsender'
 require_relative 'mail'
 require_relative 'generalmail'
 require_relative 'mailbuilder'
+#require_relative 'processmanager'

data/lib/sinatra/extensions/processmanager.rb

@@ -0,0 +1,106 @@
+# encoding: utf-8
+
+class AsyncProcess
+  include SuckerPunch::Job
+  attr_reader :handler
+end
+
+class ExampleProcess < AsyncProcess
+
+  attr_reader :log, :error, :interrupted, :name, :id
+  
+  def self.name
+    "THE NAME"
+  end
+
+  def perform(handler, other_params)
+    @handler = handler
+    @handler.total = params[:ids].count
+    # loop
+    # if error @handler.log("error no falta", e.message)
+    # @handler.increase
+    #
+  end
+end
+
+class ProcessHandler
+
+  attr_reader :log, :error, :interrupted, :name, :id, :performed, :total, :clazz
+  attr_accessor :total
+
+  def initialize(id, name, clazz)
+    @id = id
+    @total = 0
+    @performed = 0
+    @log = []
+    @error = ""
+    @interrupted = false
+    @name = name
+    @clazz = clazz
+  end
+
+  def progress
+    return 0 if @total == 0
+    (@performed.to_f / @total.to_f)*100.0
+  end
+
+  def increase
+    @performed += 1
+  end
+
+  def log(severity, message)
+    @log << "[#{severity}] #{Time.now} #{message}"
+  end
+
+  def interrupt
+    @interrupted = true
+  end
+
+  def running?
+    @total != @performed
+  end
+end
+
+class ProcessManager
+  include Singleton
+
+  attr_reader :handlers
+
+  def initialize
+    @handlers = []
+  end
+
+  def find(clazz)
+    @handlers.find { |handler| handler.clazz == clazz }
+  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)
+      clazz = args.first
+      args[0] = handler
+      clazz.perform_async(*args)
+      @handlers << handler
+      handler
+    else
+      find(args.first.to_s)
+    end
+  end
+
+  def finish(handler)
+    @handlers -= [handler]
+  end
+
+  def clean(clazz)
+    @handlers.select { |handler| !handler.running? }.each do |handler|
+      handler.interrupt
+      self.finish(handler)
+    end
+  end
+
+  def running?(clazz)
+    !@handlers.select { |handler| handler.clazz == clazz }.empty?;
+  end
+
+end

data/lib/sinatra/handlers/init.rb

@@ -2,4 +2,5 @@
 require_relative 'errors'
 require_relative 'notifications'
 require_relative 'params'
-require_relative 'reports'
+require_relative 'reports'
+#require_relative 'processes'

data/lib/sinatra/handlers/processes.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Sinatra
+  module ProcessesHandler
+    extend Hexacta
+
+    def enable_processes
+      p "Enabling processes..."
+
+      get '/processes' do
+        return "" if ProcessManager.instance.find(params[:class]).nil?
+        content_type :json
+        return { "progress" => ProcessManager.instance.find(params[:class]).progress }.to_json
+      end
+
+      post '/processes/:id' do |id|
+        ProcessManager.instance.interrupt(id)
+      end
+
+      post '/process' do
+        a_handler = ProcessManager.instance.run(params)
+        a_handler.to_json
+      end
+    end
+
+  end
+  register ProcessesHandler
+end
+

data/lib/sinatra/helpers/init.rb

@@ -2,7 +2,6 @@
 require_relative 'libraries'
 require_relative 'inputs'
 require_relative 'charts'
-require_relative 'subscriptions'
 require_relative 'cas'
 require_relative 'schedule'
 require_relative 'alerts'

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

@@ -469,7 +469,7 @@ $(document).ready(function(){
     * Modal hide
     */
     $('.modal').bind('shown.bs.modal', function (e) {
-      $(this).find(' type="submit"').attr("disabled",false);
+      $(this).find(':submit').attr("disabled",false);
     });
 
 });

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

@@ -6,14 +6,25 @@
   - placeholder = "..."
 -unless defined? onkeyup
   -onkeyup = ''
+-unless defined? readonly
+  -readonly = false
+- unless defined? clazz
+  - clazz = nil
 
 -if required
   .form-group.has-feedback.has-success
     label #{title}
     .fg-line
-      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" required="" value="#{value}" onkeyup="#{onkeyup}"
+      -if readonly
+        input.form-control.fg-input id="#{id}" type="#{type}" placeholder="#{placeholder}" name="#{name}" required="" value="#{value}" class="#{clazz}" onkeyup="#{onkeyup}" readonly=''
+      -else
+        input.form-control.fg-input id="#{id}" type="#{type}" placeholder="#{placeholder}" name="#{name}" required="" value="#{value}" class="#{clazz}" onkeyup="#{onkeyup}"
+
 -else
   .form-group
     label #{title}
     .fg-line
-      input.form-control.fg-input id="#{id}" type="#{type}" placeholder=("#{placeholder}") name="#{name}" value="#{value}" onkeyup="#{onkeyup}"
+      -if readonly
+        input.form-control.fg-input id="#{id}" type="#{type}" placeholder="#{placeholder}" name="#{name}" value="#{value}" onkeyup="#{onkeyup}" class="#{clazz}" readonly=''
+      -else
+        input.form-control.fg-input id="#{id}" type="#{type}" placeholder="#{placeholder}" name="#{name}" value="#{value}" onkeyup="#{onkeyup}" class="#{clazz}" 

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

@@ -4,7 +4,8 @@
   - id = "#{name}_#{rand(1000)}"
 - unless defined? placeholder
   - placeholder = "Selecciona..."
-
+- unless defined? clazz
+  - clazz = nil
 - unless defined? selected_elements
   - selected_elements = []
 - if selected_elements.nil?
@@ -14,7 +15,7 @@
 -if required
   .form-group.has-success
     label.fg-label #{placeholder}
-    select.chosen id="#{id}" name="#{name}[]" data-placeholder=("#{placeholder}") chosen="" multiple="" style=("display: none;") required=""
+    select.chosen id="#{id}" class="#{clazz}" name="#{name}[]" data-placeholder=("#{placeholder}") chosen="" multiple="" style=("display: none;") required=""
       -for element in elements
         -if selected_elements.include?(element[:value].to_s)
           option value="#{element[:value]}" selected="" #{element[:text]} 

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

@@ -6,12 +6,13 @@
   - placeholder = "Selecciona..."
 - unless defined? chosen
   - chosen = nil
-
+- unless defined? clazz
+  - clazz = nil
 
 -if required
   .form-group.has-success
     label #{placeholder}
-    select.chosen.form-control id="#{id}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;") required=""
+    select.chosen.form-control id="#{id}" class="#{clazz}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;") required="" 
       -for element in elements
         -if chosen == element[:value]
           option value="#{element[:value]}" selected="" #{element[:text]}
@@ -21,7 +22,7 @@
 -else
   .form-group
     label #{placeholder}
-    select.chosen id="#{id}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;")
+    select.chosen id="#{id}" class="#{clazz}" name="#{name}" data-placeholder=("#{placeholder}") style=("display: none;")
       -for element in elements
         -if chosen == element[:value]
           option value="#{element[:value]}" selected="" #{element[:text]}

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

@@ -11,6 +11,6 @@
   .fg-line
     label.fg-label #{title}
     - if required
-      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" required="" #{value}
+      textarea.form-control id="#{id}" name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" required="" #{value}
     - else
-      textarea.form-control name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" #{value}
+      textarea.form-control id="#{id}" name="#{name}" placeholder=("#{placeholder}") rows="#{rows}" maxlength="#{length}" #{value}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.10
 platform: ruby
 authors:
 - Marco Zanger
@@ -67,10 +67,12 @@ files:
 - lib/sinatra/extensions/mailbuilder.rb
 - lib/sinatra/extensions/mailsender.rb
 - lib/sinatra/extensions/notification.rb
+- lib/sinatra/extensions/processmanager.rb
 - lib/sinatra/handlers/errors.rb
 - lib/sinatra/handlers/init.rb
 - lib/sinatra/handlers/notifications.rb
 - lib/sinatra/handlers/params.rb
+- lib/sinatra/handlers/processes.rb
 - lib/sinatra/handlers/reports.rb
 - lib/sinatra/helpers/alerts.rb
 - lib/sinatra/helpers/cas.rb
@@ -80,7 +82,6 @@ files:
 - lib/sinatra/helpers/libraries.rb
 - lib/sinatra/helpers/reports.rb
 - lib/sinatra/helpers/schedule.rb
-- lib/sinatra/helpers/subscriptions.rb
 - lib/sinatra/hexacta.rb
 - lib/sinatra/public/css/app.min.1.css
 - lib/sinatra/public/css/app.min.2.css

data/lib/sinatra/helpers/subscriptions.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-module Sinatra
-  module SubscriptionHelper
-
-    def notify_to(user,creator,title,message,label,link=nil)
-      notification = Notification.find_or_create(:user_id => user.id,
-                                  :creator_id => creator.id,
-                                  :title => title,
-                                  :message => message,
-                                  :label => label,
-                                  :link => link,
-                                  :creation_date => Date.today)
-      if link.nil?
-        notification.link = "/notifications/#{notification.id}"
-        notification.save
-      end
-      notification
-    end
-
-    def notify(creator,title,message,label,link=nil)
-      Subscription.where(:label => label).all.each do |subscription|
-        notification = notify_to(subscription.user,creator,title,message,label,link)
-      end
-    end
-
-    def notify_error(creator,title,message)
-      Subscription.where(:label => 'error').all.each do |subscription|
-        creator = subscription.user if creator.nil?
-        notification = Notification.find(:user_id => subscription.user_id,
-                                         :creator_id => creator.id,
-                                         :title => title,
-                                         :message => message,
-                                         :label => 'error',
-                                         :read_date => nil)
-        if notification.nil?
-          notification = notify_to(subscription.user,creator,title,message,'error')
-        end
-      end
-
-    end
-  end
-
-  helpers SubscriptionHelper
-end