operationable 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edf66c7b75e60f58aa296b89200a5e19d19628c0b8d80b54369fb40cf5f232c
-  data.tar.gz: 60ac229144e1f919746746e86d7cdd373cb6aa619c81d650e13c64e8f3874a1f
+  metadata.gz: 040e59f59c21f9ef4173c7c6a8b92361b0322a0c8665050025fca4d31928601d
+  data.tar.gz: 9452b615efa14ab19318a586d1b28fb3f4c2e9a3bb9d72993242cde7ae2f0ce4
 SHA512:
-  metadata.gz: 8f52d31a1f5e413efa3155071943b2eaf6a13c49bb3e12b5241969da6f90cec8434a14d32d4de3f693f4ef8c9f5343585e9450e1c9c78d62e12244072e5b0af5
-  data.tar.gz: 835fde7f0528eb95ec8bb3faf09844e2b8ae6134796676b40a89a643b103bdb01daa3c7b9e75a742e1b65c7470005d5ad2afab055472cb9cbd1cc14d79e141be
+  metadata.gz: 31144ef82aad7945a9a1b8a7fb749c1e0130d5fe3a0a78e3da76781f3cc42a699a6448ea8293d23e335212588f4e349243fee4b2c9cd66e8ff4055ce77b88040
+  data.tar.gz: ebd984eca0102f0883037087308580ad098607319e046c27c2389a27a50099f7e81143d23c7b8db70c51a1ed87bf0a0fceab9eb25700c13fa033341921456eb6

data/README.md

@@ -59,11 +59,23 @@ module EntityOperation
       end
     end
 
+    class Delayer < Operationable::Delayer
+      def delay_callback_one
+        { wait_until: Date.tomorrow.noon } # or wait
+      end
+    end
+
     class Runner < Operationable::Runners::Separate
       def initialize_callbacks
         push_to_queue(:callback_one)
-        push_to_queue(:callback_two, :low)
-        push_to_queue(:callback_three, :high)
+        push_to_queue(:callback_two, queue: :low)
+        push_to_queue(:callback_three, queue: :high, job_class_name: MySpecialJob)
+        push_to_queue(:callback_four, queue: :high, params: {hello: 123})
+      end
+
+      # This is default behaviour, but you can redefine it, to use with other adapter for example
+      def perform(job_class_name, args, delayed_params)
+        job_class_name.to_s.constantize.set(delayed_params).method(perform_method).call(args)
       end
     end
 
@@ -101,6 +113,10 @@ push_to_queue(callback_name, queue_name) if queue_name not passed, callback will
 
 Operations work via ActiveJob, so you can use any adapter that you want.
 
+### Delayer
+
+This class process when process job
+
 ### Job
 
 I get rid of ActiveJob dependency. So, extend you exting job class with code below
@@ -118,7 +134,7 @@ end
 
 ```
 
-Define job class name at your initializers (config/initializers/operationable.rb)
+Define global job class name at your initializers (config/initializers/operationable.rb)
 
 ```ruby
 module Operationable
@@ -127,18 +143,11 @@ module Operationable
       def job_class
         'OpJob'
       end
-
-      # This is default behaviour, but you can redefine it, to use with other adapter
-      def perform(job_class_name, args)
-        job_class_name.to_s.constantize.method(perform_method).call(args)
-      end
     end
   end
 end
 ```
 
-
-
 ### Serializer
 
 Serializer used to define what values should be passed to job(redis do not accept AR instances or other complex structures).

data/lib/operationable/delayer.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module Operationable
+  class Delayer
+    attr_reader :record, :user, :params, :activity, :action_name
+
+    def initialize(record, user, params={}, activity='', action_name='')
+      @record = record
+      @user = user
+      @params = params
+      @activity = activity
+      @action_name = action_name
+    end
+  end
+end

data/lib/operationable/runners/base.rb

@@ -54,8 +54,8 @@ module Operationable
       def initialize_callbacks
       end
 
-      def push_to_queue(*callback_method_names, queue: nil, params: {})
-        callback_method_names.each do |callback_method_name, job_class_name|
+      def push_to_queue(*callback_method_names, job_class_name: nil, queue: nil, params: {})
+        callback_method_names.each do |callback_method_name|
           callbacks << {
             callback_method_name: callback_method_name.to_s,
             job_class_name: job_class_name.nil? ? job_class.to_s : job_class_name.to_s,
@@ -65,10 +65,6 @@ module Operationable
         end
       end
 
-      def callback_names
-        check_callbacks.map { |callback| callback[:callback_method_name] }
-      end
-
       def check_callbacks
         callbacks.find_all do |callback|
           satisfy = specification&.try("should_#{callback[:callback_method_name]}".to_sym)
@@ -77,7 +73,11 @@ module Operationable
       end
 
       def serializer_instance
-        serializer_class_name.constantize.new(record, user, params, result, activity, action_name)
+        @serializer_instance ||= serializer_class_name.constantize.new(record, user, params, result, activity, action_name)
+      end
+
+      def delayer
+        @delayer ||= delayer_class_name.constantize.new(record, user, params, result, activity, action_name)
       end
 
       def specification
@@ -96,6 +96,10 @@ module Operationable
         "#{operation_class_name}::Specification"
       end
 
+      def delayer_class_name
+        "#{operation_class_name}::Delayer"
+      end
+
       def operation_class_name
         self.class.name.chomp('::Runner')
       end
@@ -116,8 +120,8 @@ module Operationable
         sync? ? job_sync_execute_method : job_async_execute_method
       end
 
-      def perform(job_class_name, args)
-        job_class_name.to_s.constantize.method(perform_method).call(args)
+      def perform(job_class_name, args, delayed_params)
+        job_class_name.to_s.constantize.set(delayed_params).method(perform_method).call(args)
       end
 
       def sync?

data/lib/operationable/runners/separate.rb

@@ -15,7 +15,12 @@ module Operationable
           props: props.merge(params)
         }
 
-        queue.blank? ? self.class.call(args) : perform(job_class_name, args)
+        queue.blank? ? self.class.call(args) : perform(job_class_name, args, get_delayed_params(callback_method_name))
+      end
+
+      def get_delayed_params(callback_method_name)
+        delay = delayer&.try("delay_#{callback_method_name}".to_sym)
+        delay.nil? ? {} : delay
       end
 
       def q_options(callback_method_name, queue)

data/lib/operationable/runners/serial.rb

@@ -26,6 +26,10 @@ module Operationable
           queue: queue })
       end
 
+      def callback_names
+        check_callbacks.map { |callback| callback[:callback_method_name] }
+      end
+
       private
 
       def queue

data/lib/operationable/version.rb

@@ -1,3 +1,3 @@
 module Operationable
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operationable
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Kirill Suhodolov
@@ -74,6 +74,7 @@ files:
 - lib/operationable.rb
 - lib/operationable/builder.rb
 - lib/operationable/callback.rb
+- lib/operationable/delayer.rb
 - lib/operationable/operation.rb
 - lib/operationable/runners/base.rb
 - lib/operationable/runners/separate.rb