joblin 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8da74810ea7a5b63274a757c844947d8f9c70d2a04bd69c43ecc25d28ad53fc
-  data.tar.gz: c13aeaf271018036449c8cde653275bde37a6b383b46cef7e558a044b090a9ad
+  metadata.gz: c23bb12d2e39399c6211b0ed5bbfecf1b2b7aa538cd2d5ba252ea9621bf81ec1
+  data.tar.gz: ccaff17b2024b75ea3084f664e49b45701200e69377e2c6ffe1ed9f6348778e9
 SHA512:
-  metadata.gz: 69259dcda6c3b247fe1822744b99d1e8f8316d9e930ab6c5d7a5290d0cf9c09fa90d0bd8759831bb325ff2c5f0647a6337009efea5f174234ae5d91e04dd4a76
-  data.tar.gz: 70b002dd9071babd100fa3b5e024839b41f09e5dbd2c43fd619487d8c0e1c77502b87bb980593dabe33e9d17e9e74087401c40b874bf40de8a22f8100dc32f19
+  metadata.gz: b4902bf5d9a9a46d8b3933df45c9c23e2b2571c43202244a25a408d24a14079e4bf331997c53ea174a673646775de2beeac7a872f3e0234c68090c052609baf9
+  data.tar.gz: 84a99c0d34a9b11a6cfc6a342d7aba127126347d7d4fbc2be58e2ac58a71b383c132ee417bfc154baee77af300a909ac946ed771e9aa5b773fe8add5b27ef23f

data/app/models/joblin/background_task/api_access.rb

@@ -16,7 +16,7 @@ module Joblin
       end
 
       def allow_api_access!(&blk)
-        include ApiAccess::Mixin unless self < ApiAccess::Mixin
+        include Mixin unless self < Mixin
         @api_access_allowed = true
         api_access_rules(&blk) if blk
       end
@@ -28,7 +28,7 @@ module Joblin
 
       def find_for_api(id)
         task = find(id)
-        raise ActiveRecord::RecordNotFound unless task.class.api_access_allowed?
+        raise ActiveRecord::RecordNotFound unless task.api_access_allowed?
         task
       end
 
@@ -42,9 +42,9 @@ module Joblin
 
         task_type = self == BackgroundTask ? params[:type].safe_constantize : self
         raise ActiveRecord::RecordNotFound unless task_type && task_type <= BackgroundTask
-        raise ActiveRecord::RecordNotFound unless task_type.api_access_allowed?
 
         task = task_type.new
+        raise ActiveRecord::RecordNotFound unless task.api_access_allowed?
         rule_sets = task_type.api_access_rules
 
         # Apply permitted options
@@ -64,6 +64,8 @@ module Joblin
         # Apply any additional/hard-coded options
         task.options.merge!(options)
 
+        raise ActiveRecord::RecordInvalid.new(task) unless task.api_access_allowed?
+
         val_errors = task.api_validate_options
         raise ActiveRecord::ValidationError.new(val_errors) unless val_errors.empty?
 
@@ -77,14 +79,20 @@ module Joblin
       end
     end
 
+    def api_access_allowed?
+      self.class.api_access_allowed?
+    end
+
     module Mixin
       extend ActiveSupport::Concern
 
       included do
-        if defined?(BackgroundTaskChannel)
+        begin
+          ::BackgroundTaskChannel
           after_commit do
-            BackgroundTaskChannel.broadcast_to(self, api_serialize)
+            ::BackgroundTaskChannel.broadcast_to(self, api_serialize) if api_access_allowed?
           end
+        rescue NameError
         end
       end
 

data/app/models/joblin/background_task/attachments.rb

@@ -2,6 +2,8 @@ module Joblin
   module BackgroundTask::Attachments
     extend ActiveSupport::Concern
 
+    include Concerns::JobWorkingDirs
+
     def attachment_path(key, expires_in: true)
       if !expires_in || Rails.env.development? || Rails.env.test?
         return Rails.application.routes.url_helpers.rails_blob_path(

data/app/models/joblin/background_task/executor.rb

@@ -19,10 +19,26 @@ module Joblin
       delegate :queue_as, :sidekiq_options, to: :job_executor_class
 
       %i[before around after].each do |hook_type|
-        define_method(:"#{hook_type}_perform") do |*args, &blk|
-          blk ||= args[0].to_proc
-          job_executor_class.send(:"#{hook_type}_perform") do |*args|
-            the_task.instance_exec(&blk)
+        define_method(:"#{hook_type}_perform") do |*args, &callback|
+          callback ||= args[0]
+          if callback.is_a?(Symbol) || callback.is_a?(String)
+            job_executor_class.define_method(callback) do |*margs, &blk|
+              the_task.send(callback, *margs, &blk)
+            end
+            job_executor_class.send(:"#{hook_type}_perform", callback)
+          elsif callback.is_a?(Proc)
+            # Not exactly pretty...
+            proc = case callback.arity
+            when 0
+              -> { the_task.instance_exec(&callback) }
+            when 1
+              ->(a) { the_task.instance_exec(a, &callback) }
+            when 2
+              ->(a, b) { the_task.instance_exec(a, b, &callback) }
+            else
+              raise ArgumentError, "Unsupported callback arity #{callback.arity}"
+            end
+            job_executor_class.send(:"#{hook_type}_perform", &proc)
           end
         end
       end

data/app/models/joblin/background_task/options.rb

@@ -6,6 +6,13 @@ module Joblin
       def bt_passthrough_values
         @bt_passthrough_values ||= (instance_methods - ActiveRecord::Base.instance_methods - %i[options= batch_id= id_value= type=]).map(&:to_s).select { |m| m.end_with?('=') }.map { |m| m[0..-2] }
       end
+
+      def new(*args, **kwargs, &blk)
+        options = kwargs.delete(:options) || {}
+        super.tap do |instance|
+          instance.options.merge!(options)
+        end
+      end
     end
 
     included do

data/app/models/joblin/background_task.rb

@@ -34,6 +34,10 @@ module Joblin
       update!(workflow_state: 'cancelled')
     end
 
+    def handle_batch_stagnation
+      Joblin::Batching::Batch.cleanup_redis(batch_id)
+    end
+
     protected
 
     def perform
@@ -46,6 +50,7 @@ module Joblin
         b.description = "BackgroundTask #{id}"
         b.on(:complete, BackgroundTaskCallbacks, id: id)
         b.on(:success, BackgroundTaskCallbacks, id: id)
+        b.on(:stagnated, BackgroundTaskCallbacks, id: id)
         b.context[:background_task_id] = id
       end
       b.jobs(&blk)
@@ -67,6 +72,11 @@ module Joblin
         tracker.workflow_state = 'completed'
         tracker.save! if tracker.changed?
       end
+
+      def on_stagnated(status, options)
+        tracker = BackgroundTask.find(options['id'])
+        tracker.handle_batch_stagnation
+      end
     end
   end
 end

data/joblin.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rediconn', '~> 0.1.0'
   spec.add_dependency 'rails', '>= 5', '< 9.0'
 
+  spec.add_dependency 'ostruct'
+
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'redis'
   spec.add_development_dependency 'rspec-rails'

data/lib/joblin/version.rb

@@ -1,3 +1,3 @@
 module Joblin
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.4".freeze
 end