delayed_job_prevent_duplicate 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9dddeb211dc3682bcf52ea61c6fbae09b2f53b464dfc77be09d41e802c81451
-  data.tar.gz: 9235b96c6047126767f6412ad1bf0e216f2f3172e244caecdf22880256a852c6
+  metadata.gz: 69b7a99d109637043b9b5fae631f1bc3c308784b65e069b8a047f747df21ac7a
+  data.tar.gz: a52a2c8e82930c06edd4af24d807c8d394bfc46e475ad0e101e16994d01d510b
 SHA512:
-  metadata.gz: fe9167455f11e23771989414b78731394123d339884bf607acef3d11ab32e4b46f1cdd5e62b7fbac8e3e3443e6f31b8dcbf7f63a9f1c162544856d37f97282b9
-  data.tar.gz: f35d3fa2c117f58d946180d396e7bb39564def02d09cde27ebe60b107e2de6ab853a205fed52bc446029e2a56c8a0b4efd69758920ea39e1e5d407bdf8abae1f
+  metadata.gz: a9cd69b947323438067b1efb1124cf33987e31da085a637b0a3e2229d69c94ac5b4a821eef5ed57b17bb4adbad97295aeb399038b9ffc41b3f7ea417691ab1a2
+  data.tar.gz: e3a1ceb195982d9cb0796a0d7b7b2fa68eac6dd775e1ae209c616807fd71eb47186bf5e19324141f0874e064e269f95c28a5f5dc8c7cace99290892a63fcda41

data/README.md

@@ -6,7 +6,7 @@ And then when creating a new job we look in the "pending" jobs if there is anoth
 
 ## Note
 
-This gem is based based on the [synth](https://github.com/synth) work: https://gist.github.com/synth/fba7baeffd083a931184
+This gem is based on the [synth](https://github.com/synth) work: https://gist.github.com/synth/fba7baeffd083a931184
 
 ## Installation
 
@@ -43,4 +43,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 https://groups.google.com/g/delayed_job/c/gZ9bFCdZrsk#2a05c39a192e630c
 https://github.com/collectiveidea/delayed_job/blob/master/lib/delayed/backend/base.rb
-https://github.com/ignatiusreza/activejob-trackable
+https://github.com/ignatiusreza/activejob-trackable

data/lib/delayed_duplicate_prevention_plugin.rb

@@ -15,21 +15,54 @@ class DelayedDuplicatePreventionPlugin < Delayed::Plugin
     private
 
     def add_signature
-      self.signature = generate_signature
-      self.args = self.payload_object.args
+      # If signature fails, id will keep everything working (though deduplication will not work)
+      self.signature = generate_signature || generate_signature_random
+      self.args = get_args
     end
 
     def generate_signature
-      pobj = payload_object
-      if pobj.object.respond_to?(:id) and pobj.object.id.present?
-        sig = "#{pobj.object.class}"
-        sig += ":#{pobj.object.id}"
+      begin
+        if payload_object.is_a?(Delayed::PerformableMethod)
+          generate_signature_for_performable_method
+        else
+          generate_signature_random
+        end
+      rescue
+        generate_signature_failed
+      end
+    end
+
+    # Methods tagged with handle_asynchronously
+    def generate_signature_for_performable_method
+      if payload_object.object.respond_to?(:id) and payload_object.object.id.present?
+        sig = "#{payload_object.object.class}:#{payload_object.object.id}"
       else
-        sig = "#{pobj.object}"
+        sig = "#{payload_object.object}"
       end
+      sig += "##{payload_object.method_name}"
+      sig
+    end
+
+    # # Regular Job
+    # def generate_signature_for_job_wrapper
+    #   sig = "#{payload_object.job_data["job_class"]}"
+    #   payload_object.job_data["arguments"].each do |job_arg|
+    #     string_job_arg = job_arg.is_a?(String) ? job_arg : job_arg.to_json
+    #   end
+    #   sig += "#{payload_object.job_data["job_class"]}"
+    #   sig
+    # end
+
+    def generate_signature_random
+      SecureRandom.uuid
+    end
+
+    def generate_signature_failed
+      puts "DelayedDuplicatePreventionPlugin could not generate the signature correctly."
+    end
 
-      sig += "##{pobj.method_name}"
-      return sig
+    def get_args
+      self.payload_object.respond_to?(:args) ? self.payload_object.args : []
     end
 
     def prevent_duplicate
@@ -66,6 +99,8 @@ class DelayedDuplicatePreventionPlugin < Delayed::Plugin
 
     def args_match?(job1, job2)
       job1.payload_object.args == job2.payload_object.args
+    rescue
+      false
     end
   end
 end

data/lib/delayed_job_prevent_duplicate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DelayedJobPreventDuplicate
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_prevent_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - pabois
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2023-09-08 00:00:00.000000000 Z
@@ -59,7 +59,7 @@ metadata:
   homepage_uri: https://github.com/noesya/delayed_job_prevent_duplicate
   source_code_uri: https://github.com/noesya/delayed_job_prevent_duplicate
   changelog_uri: https://github.com/noesya/delayed_job_prevent_duplicate/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Prevent delayed_job to enqueue a task already enqueued
 test_files: []