joblin 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb0e0c2038030615d4e6a50e08aac0166f022a6af89f2a5d157d977e2f03f58
-  data.tar.gz: f25744584d54054fe566770b10870159ac9c2a422c8e44cb609aca67116f4c03
+  metadata.gz: 23c16a1c4a23f6ad9d6f254c0d0ee5aea54fa3e4501222c2e93ccf2bdf8f94b6
+  data.tar.gz: 22785e30a3229741a3daa125c89f93ba17ab285f614d1e9546eeb491a5296ac3
 SHA512:
-  metadata.gz: 726db8abb51ae0697aa6299df1179c7ef7a5e7de96681b6da9341d97242d4a39928ca4a274a26d58b35ba519f29c3b7d18b8d19dc4cf66bbdd7f25f0c5f83a2b
-  data.tar.gz: 83ca76bd6c338207259f08e4115920613c525c5bbe3be431a6a1299bfc0b79282f69a986ce3c04fa17078b0c2dce24f1de1e8556e8d371bda03bcb7231c5ba15
+  metadata.gz: aa29ff4cb1af77eb546f1d5b0963c4b7b22145d067b991a82912bd8d071cbd8829e64b748d75c031d8c67d849ea7c36047a85b5fcd3d1e5454239b0593926f2d
+  data.tar.gz: c08af787c49c3ecfba70c675534c26174de20e97c742952652696428aae5290b79fcbb6b63391504d02acc2ad413909e7d9aa721f05242cf571eb0f52cf93162

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

@@ -3,6 +3,8 @@ module Joblin
     module Executor
       extend ActiveSupport::Concern
 
+      BACKGROUND_TASK_THREAD_KEY = :joblin_current_background_task
+
       class_methods do
         def inherited(subclass)
           subclass.const_set(:ExecutorJob, Class.new(self::ExecutorJob))
@@ -48,6 +50,10 @@ module Joblin
 
         # delegate :before_perform, :around_perform, :after_perform, to: :job_executor_class
         # delegate :before_enqueue, :around_enqueue, :after_enqueue, to: :job_executor_class
+
+        def current
+          Thread.current[BACKGROUND_TASK_THREAD_KEY] || BackgroundTask.find(Batch.current_context[:background_task_id])
+        end
       end
 
       included do
@@ -61,6 +67,14 @@ module Joblin
       end
 
       class ExecutorJob < ActiveJob::Base
+        around_perform do |job, block|
+          pretask = Thread.current[BACKGROUND_TASK_THREAD_KEY]
+          Thread.current[BACKGROUND_TASK_THREAD_KEY] = job.the_task
+          block.call
+        ensure
+          Thread.current[BACKGROUND_TASK_THREAD_KEY] = pretask
+        end
+
         def perform
           the_task.update(workflow_state: "started") if the_task.workflow_state == "scheduled"
           the_task.perform

data/db/migrate/20250903184852_create_joblin_background_tasks.rb

@@ -1,4 +1,4 @@
-class CreateJoblinBackgroundTasks < ActiveRecord::Migration[5.2]
+class CreateJoblinBackgroundTasks < Joblin::MiscHelper::MigrationClass
   def change
     create_table :joblin_background_tasks do |t|
       t.references :creator, polymorphic: true

data/db/migrate/20250916184852_add_results_to_joblin_background_tasks.rb

@@ -1,4 +1,4 @@
-class AddResultsToJoblinBackgroundTasks < ActiveRecord::Migration[5.2]
+class AddResultsToJoblinBackgroundTasks < Joblin::MiscHelper::MigrationClass
   def change
     add_column :joblin_background_tasks, :results, :jsonb
     add_column :joblin_background_tasks, :error_message, :text

data/lib/joblin/misc_helper.rb

@@ -0,0 +1,15 @@
+require 'active_record'
+
+module Joblin
+  module MiscHelper
+    MigrationClass = Rails.version < '5.0' ? ActiveRecord::Migration : ActiveRecord::Migration[5.2]
+
+    def self.to_boolean(v)
+      if Rails.version < '5.0'
+        ActiveRecord::Type::Boolean.new.type_cast_from_user(v)
+      else
+        ActiveRecord::Type::Boolean.new.deserialize(v)
+      end
+    end
+  end
+end

data/lib/joblin/version.rb

@@ -1,3 +1,3 @@
 module Joblin
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.7".freeze
 end

data/lib/joblin.rb

@@ -6,6 +6,7 @@ require "active_support/lazy_load_hooks"
 require "rediconn"
 
 require "joblin/engine"
+require "joblin/misc_helper"
 
 require "joblin/lazy_access"
 require "joblin/batching/batch"