sinatra-hexacta 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235207ce86479d51ab5c1852a286ab92d5b4de8fbd159d584bc79234bcafd5dc
-  data.tar.gz: 933097a5eca58c05479cb29e93543c9e9ca292eb45c61b940be4ab9c4cf80f9c
+  metadata.gz: '028a33ab389fa16403a18c0f0cc8eb21bd0dbdec629ad9aad4ff64edeefae4d4'
+  data.tar.gz: 81eaf1d3fd5c9acbfe46bf6e9a46688a36ec6ce55573b76402f3c2716ac1f7d2
 SHA512:
-  metadata.gz: c57ec64f35c7f71a043278ffc15e8e131f53cc8a29dfcb353475baa4763a27b09e323eacb16c0f652b209eb44d22383f8e91096403e42e35cfd73f08c5ec10ef
-  data.tar.gz: 2bfb5b976a50e30124bce1b534953b68e4c95f7398b4d34dace6afee55204b32adaec6bf67ac892f2cd33554a048a4f98be171a0ad17ac72581ef19aa32b8e5e
+  metadata.gz: 54f1e6150ddc605f57e5c4fa699f9754924702d8d458c781980f8725324f9c59e7750452fab0f575c615d526a40130f87aa8507a46a16307fb4e8107c1409594
+  data.tar.gz: 6c5016a956e3f9c1c376abe8b4578beb10c49044baa0d1b086cd6b0b13bb90e5c3aad7e3bb1f2bbdf405b5ba6687d58b946bc12d49e4543c936f4970dc05a029

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: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marco Zanger