resque-unique_by_arity 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9ce19b6bc1fb732d1e65041619ab23e3ec260e
-  data.tar.gz: 8378dafafc81c1fbc4f8cb8accc4ae21b9833604
+  metadata.gz: ac085f3b0b4e1bffe91a7d102a682d1b24c3a1aa
+  data.tar.gz: eacd68195490aee206b3d6c45af092bd00624ac1
 SHA512:
-  metadata.gz: 354198da378d793f142af7ce1d4938af08544f8208cff62bca8af90460005a773f5205b212afdb7454aac20ebedf840588005ea3679f1ba8ebed05dc106de2b3
-  data.tar.gz: b61e3cb714f9b19d8a52d8bd3285d0d47de32439858cf44e256758ef633378a2dfb06d153fe9b21469da0858a07b389f8d49501dcb9aa2fbd36e576442b56e97
+  metadata.gz: c9ff0d231d3cc0c06f9bc597783d3948035d8e66f5163c36437809a39dade1326412502b39d2443c437cc66ae33c1f223a751be7a326379ce4d4d88e36a6752d
+  data.tar.gz: fe7a66deceb8ed1fe40dc8b36e94d6e567cd46c896688e44ccb9e3ae4db070430643a35618867f2505d198b4f782090054505e77562211bda1de32f0fdfba6ae

data/README.md

@@ -1,5 +1,9 @@
 # Resque::UniqueByArity
 
+NOTE:
+
+Requires the pboling fork of resque-lonely_job at https://github.com/pboling/resque-lonely_job as the standard one is just very incompatible with resque-solo (or vice versa, either direction is true; they step on each other).
+
 Usage:
 
 ```ruby

data/lib/resque/unique_by_arity/cop_modulizer.rb

@@ -3,6 +3,22 @@ module Resque
     module CopModulizer
       def self.to_mod(configuration)
         Module.new do
+          if configuration.unique_in_queue || configuration.unique_at_runtime
+            # @return [Array<String, arguments>] the key base hash used to enforce uniqueness, and the arguments from the payload used to calculate it
+            define_method(:redis_unique_hash) do |payload|
+              payload = Resque.decode(Resque.encode(payload))
+              job  = payload["class"]
+              args = payload["args"]
+              args.map! do |arg|
+                arg.is_a?(Hash) ? arg.sort : arg
+              end
+              # what is the configured arity for uniqueness?
+              # minus one because zero indexed
+              uniqueness_args = args[0..(configuration.arity_for_uniqueness - 1)]
+              args = { class: job, args: uniqueness_args }
+              return [Digest::MD5.hexdigest(Resque.encode(args)), uniqueness_args]
+            end
+          end
           if configuration.unique_in_queue
             # Returns a string, used by LonelyJob, that will be used as the redis key
             # The example in the readme is bad.  The args passed to this method are like:
@@ -10,27 +26,18 @@ module Resque
             # This is identical to the version from Resque::Plugins::UniqueJob
             # and we do not want the version from Resque::Plugins::LonelyJob to be used.
             # Payload is what Resque stored for this job along with the job's class name:
-            # a hash containing :class and :args
+            #   a hash containing :class and :args
+            # @return [String] the key used to enforce uniqueness (at queue-time)
             define_method(:redis_key) do |payload|
-              puts "overriding redis_key in #{self}"
-              begin
-                payload = Resque.decode(Resque.encode(payload))
-                job  = payload["class"]
-                args = payload["args"]
-                args.map! do |arg|
-                  arg.is_a?(Hash) ? arg.sort : arg
-                end
-                # what is the configured arity for uniqueness?
-                # minus one because zero indexed
-                uniqueness_args = args[0..(configuration.arity_for_uniqueness - 1)]
-                args = { class: job, args: uniqueness_args }
-                key = Digest::MD5.hexdigest Resque.encode(args)
-                puts "redis key for uniqueness for #{args} is: #{key.green}"
-                key
-              rescue => e
-                Raven.captureMessage("redis_key error", extra: { signature: payload, error: e.class.to_s, message: e.message })
-                raise e
-              end
+              unique_hash, args_for_uniqueness = redis_unique_hash(payload)
+              key = "unique_job:#{self}:#{unique_hash}"
+              puts "#{self}.redis_key for #{args_for_uniqueness} is: #{key.green}"
+              key
+            end
+            # @return [Fixnum] number of keys that were deleted
+            define_method(:purge_unique_job_redis_keys) do
+              keys = Resque.redis.keys("unique_job:#{self}:*")
+              Resque.redis.del keys if keys.length > 0
             end
           end
           if configuration.unique_at_runtime
@@ -40,9 +47,17 @@ module Resque
             #   from resque_solo
             # Does not need any customization for arity, because it funnels down to redis_key,
             #   and we handle the arity option there
+            # @return [String] the key used to enforce loneliness (uniqueness at runtime)
             define_method(:lonely_job_redis_key) do |*args|
-              puts "overriding lonely_job_redis_key in #{self}"
-              "lonely_job:#{redis_key({"class" => self.to_s, "args" => args})}"
+              unique_hash, args_for_uniqueness = redis_unique_hash({"class" => self.to_s, "args" => args})
+              key = "lonely_job:#{self}:#{unique_hash}"
+              puts "#{self}.lonely_job_redis_key for #{args_for_uniqueness} is: #{key.yellow}"
+              key
+            end
+            # @return [Fixnum] number of keys that were deleted
+            define_method(:purge_lonely_job_redis_keys) do
+              keys = Resque.redis.keys("lonely_job:#{self}:*")
+              Resque.redis.del keys if keys.length > 0
             end
           end
         end

data/lib/resque/unique_by_arity/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module UniqueByArity
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-unique_by_arity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Boling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-lonely_job