resque-disable-job 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e5443eca7a655fcfe205105c1db550c43bb9f32
-  data.tar.gz: f27ded11981d8260271c23788319f184bae52932
+SHA256:
+  metadata.gz: 3cf5675cd4709d19ab8540335abdf81e3245f658e3ae434a559b82fe097740e7
+  data.tar.gz: d7129819867dc331bda8eec1b61b6409bf2d9c4dac5b85cf6e1eec47dd7c437b
 SHA512:
-  metadata.gz: e5e0ba4713b9a816863e93c7f2f98a74eb5c1a27243e7ddf6eba1ceae60012b67a4e47594406a3db21f07717514e7088d5d540345131194ab26c4e21a04d29df
-  data.tar.gz: 3183fc7f2f292dce6eacfe2cf13649bce1ed74a41a2b3e26eb1a59dd6c5045d3afe25d79e25ea4afe82811024514a8134524fa1a524f07fe156422626c36e414
+  metadata.gz: fc235c8350945eed9336d2e42c9b58f036259060d3d77782d55838f0386b4c38394c91219fd03e4bc493ba365c75b31c3c04b6c492fb789d0b5368179693c7fb
+  data.tar.gz: 77bbab0994a0c14993fd058c5b32e29cde05c19fea7f83274f13e1278963ede43a58754c0350b84c3d5881a5e11767fde87789f44a98c0c6b7315c23b44e5998

data/lib/resque/disable_job/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module DisableJob
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/resque/plugins/disable_job/job.rb

@@ -29,9 +29,8 @@ module Resque
             begin
               # if the rule is not expired
               if !expired?(specific_rule)
-                # if the arguments received and the ones from the rule ar of the same type, we can check for a match
-                # if they match, that means that we need to disable the current job
-                can_check_rule?(job_name, job_args, specific_rule) ? args_match(job_args, specific_rule.arguments) : false
+                # if the arguments received and the ones from the rule match, that means that we need to disable the current job
+                specific_rule.match?(job_args)
               else
                 # we remove the rule if it's expired
                 remove_specific_rule(specific_rule)
@@ -90,32 +89,8 @@ module Resque
           end
         end
 
-        # To set the arguments to block we need to keep in mind the parameter order and that
-        # if we don't specify anything, that means we are blocking everything.
-        # The rule is from generic to specific.
-        def self.args_match(args, set_args)
-          return true if args == set_args
-          should_block = args.to_a.map.with_index do |a, i|
-            # We check each parameter (65) or parameters set (["account_id", 65]) in the job_args with the job_args to be blocked
-            # if it's nil, then we match, if it's specified, we check for equality (65 == 65 or ["account_id", 65] == ["account_id", 65])
-            set_args[i].nil? || a == set_args[i]
-          end
-          # if all params are matched [reduce(:&)]
-          should_block.reduce(:&)
-        end
-
         # Support functions for disabled?
 
-        def self.can_check_rule?(job_name, job_args, rule)
-          if (rule.arguments.is_a?(Array) && job_args.is_a?(Array)) || (rule.arguments.is_a?(Hash) && job_args.is_a?(Hash))
-            true
-          else
-            Resque.logger.error "TYPE MISMATCH while checking disable rule #{rule.digest} (#{rule.serialized_arguments}) for #{job_name}: \
-                            job_args is a #{job_args.class} & set_args is a #{rule.arguments.class}"
-            false
-          end
-        end
-
         def self.get_specific_rule(job_name, set_args, digest)
           rule = Rule.new(job_name, set_args)
           Resque.logger.error 'The DIGEST does not match' if rule.digest != digest
@@ -133,7 +108,7 @@ module Resque
           Resque.logger.info "Matched running job #{job_name}(#{job_args}) because it was disabled by #{rule}"
         end
 
-        private_class_method :can_check_rule?, :record_matched_rule, :get_all_rules, :get_specific_rule
+        private_class_method :record_matched_rule, :get_all_rules, :get_specific_rule
       end
     end
   end

data/lib/resque/plugins/disable_job/rule.rb

@@ -57,6 +57,36 @@ module Resque
         def digest
           @rule_digest ||= Digest::SHA1.hexdigest(serialized_arguments)
         end
+
+        def match?(args)
+          job_args = normalize_job_args(args)
+          return true if job_args == arguments
+          # We check each parameter in the job_args with the rule arguments to be blocked
+          # if it's nil, then we match as we handle the 'any' case,
+          # if it's specified, we check for equality (65 == 65)
+          should_block = if arguments.is_a?(Hash)
+            job_args.map { |k, v| match_or_nil(k, v) }
+          else
+            job_args.map.with_index { |a, i| match_or_nil(i, a) }
+          end
+          # `!should_block.empty?` handles the edge case of a job with no parameters and the rule args have parameters
+          !should_block.empty? && !should_block.include?(false)
+        end
+
+        protected
+
+        def normalize_job_args(job_args)
+          # If the rule arguments is a hash we try to extract the job arguments as a hash to compare apples with apples
+          if arguments.is_a?(Hash)
+            job_args.size == 1 && job_args.first.is_a?(Hash) ? job_args.first : job_args
+          else
+            job_args
+          end
+        end
+
+        def match_or_nil(key, value)
+          arguments[key].nil? || value == arguments[key]
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-disable-job
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrei Balcanasu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Resque plugin that can disable jobs from being processed.