joblin 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 279121368956a3b2aadd8e8f7941e4901a5ce2f5b66b6571b44893b9303db121
-  data.tar.gz: '09d69ee51f5e66187bb53ee919e03f8b41d17c42146579f8b88c4af26b89d170'
+  metadata.gz: d79f8417c584523ab669a7e4c4d13df180eaad4c921b915073aec83e2c8b6197
+  data.tar.gz: 334c035490eeb2537a8503df28585ef6cf736c25ca8822e82e812c2f0841a443
 SHA512:
-  metadata.gz: f6e9a084d5609fa974c07d9a371186ea1f48d5ce62965129717b7027bc8f7b91c55ec08c63d6d338956ae0ab3a1d416cca26ebfd6edc2ad3d4d5c6fcc166a3d9
-  data.tar.gz: b9712224c67f906d710953034f9132f7d56fe5caad37b33a10a1d69186aee0642fd20998b4d1c5452d5e5e8d92e322bfd1b3fac5ec11ed4c8d575aae3eceba2c
+  metadata.gz: 48b1d7e9370ca38d31a1a4f4f17943210cd3203a2e0e0c397be45878c520e2a7c50653147e1feb6596cf17ab32fdbccd681938b13fbcf528d660fb358282444b
+  data.tar.gz: 7deceab65a315fb8534db3d436fab18ebf96e1452c4d01887a7c35c4b6e57831a6b96299e86f3d3623e1f4b33cab01b78cf9aed664ed6e989b017c28744654da

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/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.1".freeze
+  VERSION = "0.1.3".freeze
 end