delayed_job_prevent_duplicate 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0239b2cca535272939571db36a7694c86008c0fc57dd1fd946c10c35b30f9160'
-  data.tar.gz: f69616afd47037e85e3f248f9f4a398a00c99b91e3f484c547de82f1782de933
+  metadata.gz: f8668bbcfafe20c2670059fcb0ff0a53d6d75ce1987fd0ce5246bed70660b8ef
+  data.tar.gz: 39369122bb75be1eaa05f6a21ac4ecc557be61c39cdf03d86c7b1b10dc1f925c
 SHA512:
-  metadata.gz: d0a0587190b5e6c93f51c8bbb4e31424173ebe8b31e33dfcbc070bda3bcc9daf557b0c39b7d9434e7d24fd4c8a0e68dda036f0113174b83b4f0e3ffc0b214188
-  data.tar.gz: abb1515c6a31575ddea9b6e1b1f87ef386d0f5768f743a2c5d5218e563cef630522d9390ed7705c8bea5d9afa603f04128934fdc84ece66ec1c0b42f8d8f198c
+  metadata.gz: 0a3865e266d9d65a17194d486aa550ab378aa2a659e2419008fb3168e7928e125b1ea6d07e8edae311da6b252c10d1a35b794caf612abcb777aa5398b2d5876b
+  data.tar.gz: d1359a9ac3416fb4aa628d2cb2b923508911951ccd2eda52cd5821127c060b49ad6f8b168d2f204c15eebc0995fd3ae510945050dcac31a528343d1a8f599895

data/CHANGELOG.md

@@ -1,5 +1,3 @@
-## [Unreleased]
-
 ## [0.1.0] - 2023-09-07
 
 - Initial release

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,27 +15,60 @@ 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
 
-      sig += "##{pobj.method_name}"
-      return 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
+
+    def get_args
+      self.payload_object.respond_to?(:args) ? self.payload_object.args : []
+    end
 
     def prevent_duplicate
       if DuplicateChecker.duplicate?(self)
         Rails.logger.warn "Found duplicate job(#{self.signature}), ignoring..."
-        errors.add(:base, "This is a duplicate") 
+        errors.add(:base, "This is a duplicate")
       end
     end
   end
@@ -61,16 +94,14 @@ class DelayedDuplicatePreventionPlugin < Delayed::Plugin
       possible_dupes = Delayed::Job.where(attempts: 0, locked_at: nil)  # Only jobs not started, otherwise it would never compute a real change if the job is currently running
                                    .where(signature: job.signature)     # Same signature
       possible_dupes = possible_dupes.where.not(id: job.id) if job.id.present?
+      byebug
       possible_dupes
     end
 
     def args_match?(job1, job2)
-      # TODO: make this logic robust
-      normalize_args(job1.args) == normalize_args(job2.args)
-    end
-
-    def normalize_args(args)
-      args.kind_of?(String) ? YAML.load(args) : args
+      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.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_prevent_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - pabois
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -38,7 +38,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -60,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
@@ -75,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: []