expire_job 0.1.1 → 0.1.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d7a4c066e98544b2ca25d52860a5be8cc80c3eeb3f6b75e92403fbce081107
-  data.tar.gz: 1c38abfd9f690bb47a4cb5ce3432e6aef78e01e0c97a4d45c500587ebb4d7a9a
+  metadata.gz: 6cd4280df350274047708624ad5812400717319341158460546cdd4fb1c845b9
+  data.tar.gz: c7cdb5c9bbe09147807dc7481836d3134768b1457de530338abb6045c881e553
 SHA512:
-  metadata.gz: 6595f406df56ac89d17fcd768708255b789614e9c3947131fb324d65584786f90a9919e782597a1e7171721596ef02b1795f747c4c70e8734c2ff49b991e10f9
-  data.tar.gz: 84508ba69f85c5eebec2db8940303c49d3dd7133ce7956fbc56a93e22c8bcc43945cf36136186031d3aca4014533afface31ccb3ff75bbe94138b781ace29595
+  metadata.gz: f08c98b24108f33a8c627adf1077c26c24c5044512390c835d81b893a7d1f279f5445ce3358e3f1b2b91514e279b9b2165fcf4c2cca4ad8312afda9cb3238150
+  data.tar.gz: da05770d923b3f89b1e59e41ac00a50eb3ace1ee1b949dc7a5b9149ca69594070397ae8a240586dc0cd0fca555e372a99404080b56f7d13120285d78364e1ea3

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/Gemfile.lock

@@ -1,24 +1,21 @@
 PATH
   remote: .
   specs:
-    expire_job (0.1.1)
+    expire_job (0.1.5.pre)
       sidekiq (> 6.0, < 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    connection_pool (2.2.2)
-    minitest (5.11.3)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
-    rake (12.3.2)
-    redis (4.1.4)
-    sidekiq (6.0.7)
+    connection_pool (2.2.5)
+    minitest (5.14.2)
+    rack (2.2.3)
+    rake (12.3.3)
+    redis (4.5.1)
+    sidekiq (6.3.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
+      redis (>= 4.2.0)
 
 PLATFORMS
   ruby

data/lib/expire_job/version.rb

@@ -1,3 +1,3 @@
 module ExpireJob
-  VERSION = "0.1.1"
+  VERSION = "0.1.5.pre"
 end

data/lib/expire_job.rb

@@ -5,29 +5,30 @@ require "expire_job/version"
 
 module ExpireJob
   class Middleware
-    def call(worker, msg)
+    def call(worker, msg, queue, &block)
       if worker.respond_to?(:expire_in)
         picked_time = pick_enqueued_at(msg)
         parsed_time = parse_time(picked_time)
-        if perform_expire_check(worker, msg['args'], worker.expire_in, parsed_time)
+
+        if perform_expire_check(worker.expire_in, parsed_time)
           yield
+        else
+          logger.info { "[ExpireJob] Expired job is skipped. args=#{truncate(msg['args'].inspect)}" }
+          perform_callback(worker, :after_expire, msg['args'])
+          nil
         end
       else
         yield
       end
     end
 
-    def perform_expire_check(worker, args, expire_in, enqueued_at)
+    def perform_expire_check(expire_in, enqueued_at)
       if enqueued_at.nil?
-        logger.warn { "Can not expire this job because enqueued_at is not found. args=#{truncate(args.inspect)}" }
+        logger.warn { "[ExpireJob] Can not expire this job because enqueued_at is nil." }
         return true
       end
 
       if enqueued_at < Time.now - expire_in
-        logger.info { "Skip expired job. args=#{truncate(args.inspect)}" }
-
-        perform_callback(worker, :after_expire, args)
-
         false
       else
         true
@@ -40,7 +41,7 @@ module ExpireJob
 
       if args.is_a?(Array) && args.size >= 1 && args.last.is_a?(Hash)
         enqueued_at = args.last['enqueued_at']
-        logger.info { "enqueued_at was found in args. enqueued_at=#{enqueued_at}" } if enqueued_at
+        logger.info { "[ExpireJob] enqueued_at was found in args. enqueued_at=#{enqueued_at}" } if enqueued_at
       end
 
       if enqueued_at.nil?
@@ -48,7 +49,7 @@ module ExpireJob
         #   created_at: is a time when #perform_async or #perform_in is called
         #   enqueued_at: is a time when the job is inserted into a queue
         enqueued_at = msg['created_at'] # TODO Use enqueued_at?
-        logger.debug { "enqueued_at was found in msg. enqueued_at=#{enqueued_at}" } if enqueued_at
+        logger.debug { "[ExpireJob] enqueued_at was found in msg. enqueued_at=#{enqueued_at}" } if enqueued_at
       end
 
       enqueued_at
@@ -61,7 +62,7 @@ module ExpireJob
         Time.parse(value)
       end
     rescue => e
-      logger.warn { "Can not parse this value. value=#{value.inspect}" }
+      logger.warn { "[ExpireJob] Can not parse this value. value=#{value.inspect}" }
       nil
     end
 
@@ -76,8 +77,7 @@ module ExpireJob
             worker.send(callback_name, *args)
           end
         rescue ArgumentError => e
-          message = "The number of parameters of the callback method (#{parameters.size}) is not the same as the number of arguments (#{args.size})"
-          raise ArgumentError.new("#{self.class}:#{worker.class} #{message} callback_name=#{callback_name} args=#{args.inspect} parameters=#{parameters.inspect}")
+          raise ArgumentError.new("[ExpireJob] Invalid parameters callback_name=#{callback_name}")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expire_job
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5.pre
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -39,6 +39,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rakeTasks"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -69,12 +70,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Set an expiry to Sidekiq jobs