jobtick 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff65ac46c3a2ce39e670a9b940726f11e7f72ab5695812031417097fbf6e2d6
-  data.tar.gz: bb6044dd0c4c43c9e956de1eec4a5f2032ba6787aebfb9f1ddae8267ff79c35a
+  metadata.gz: 9fbf13c9887fe65ec082ad5a3515ec3d2767330318e9fbeafca2731f6ea7e1f3
+  data.tar.gz: 7c1624eaa666bdec4318d087f7d4bd264f6abbe03091ad9746d88a001f2e1bf2
 SHA512:
-  metadata.gz: 80ac95fe4fa508de3656ed0cc187657e9e3c2be0f68a76451dc4e1b0633a51b81e4f86ec0665163278daeb12d64e374f0496f6a1c1c7596aac673519cdc6fc87
-  data.tar.gz: c0ce19f6cc1b5cf3f7bad98a38448bf012dafb09dd74fade6934b797ab94f05f82971d5e49cad5a3067f862b29d3cb65f373d8b139468d5912cbc7f7cdb15271
+  metadata.gz: 7b1b71c36e97bd70144c69118d7af1af461424529fc92bfa7926bc2289fcecd65e92ad7ac49652dcd413244e4258dbdf9087424dd44ee5b392909fb4be771f8d
+  data.tar.gz: 7f32abaf56da135c05d76dd5f1b77043d29bf6f99c919059b138367a1e21abd06460eaa5496f42655026e23f17f740b044e6c46f249849cf27fde2f9c46deea5

data/lib/jobtick/hooks/active_job.rb

@@ -6,11 +6,9 @@ module JobTick
       def self.included(base)
         base.around_perform do |job, block|
           key = JobTick.monitor_key_for(job.class.name)
-          if key
-            JobTick::Monitor.run(key) { block.call }
-          else
-            block.call
-          end
+          next block.call unless key
+
+          JobTick::Monitor.run(key) { block.call }
         end
       end
     end

data/lib/jobtick/middleware/sidekiq.rb

@@ -3,14 +3,14 @@
 module JobTick
   module Middleware
     class Sidekiq
-      def call(_worker, job, _queue)
+      def call(_worker, job, _queue, &)
         # Active Job wrappers are handled by the around_perform hook
         return yield if job["wrapped"]
 
         key = JobTick.monitor_key_for(job["class"])
         return yield unless key
 
-        JobTick::Monitor.run(key) { yield }
+        JobTick::Monitor.run(key, &)
       end
 
       def self.install

data/lib/jobtick/parsers/sidekiq.rb

@@ -2,6 +2,10 @@
 
 module JobTick
   module Parsers
+    def self.slugify(str)
+      str.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/\A_+|_+\z/, "")
+    end
+
     class Sidekiq
       def self.parse
         return [] unless defined?(::Sidekiq)
@@ -16,7 +20,7 @@ module JobTick
 
       def self.parse_cron_jobs
         ::Sidekiq::Cron::Job.all.map do |job|
-          { key: "sidekiq.#{slugify(job.name)}", schedule: job.cron, source: "sidekiq", task: job.klass }
+          { key: "sidekiq.#{Parsers.slugify(job.name)}", schedule: job.cron, source: "sidekiq", task: job.klass }
         end
       end
       private_class_method :parse_cron_jobs
@@ -24,17 +28,12 @@ module JobTick
       def self.parse_periodic_jobs
         periodic = sidekiq_periodic_config
         (periodic || []).map do |klass, opts|
-          { key: "sidekiq.#{slugify(klass.to_s)}", schedule: opts[:cron] || opts[:every].to_s,
+          { key: "sidekiq.#{Parsers.slugify(klass.to_s)}", schedule: opts[:cron] || opts[:every].to_s,
             source: "sidekiq", task: klass.to_s }
         end
       end
       private_class_method :parse_periodic_jobs
 
-      def self.slugify(str)
-        str.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/\A_+|_+\z/, "")
-      end
-      private_class_method :slugify
-
       def self.sidekiq_periodic_config
         if ::Sidekiq.respond_to?(:default_configuration)
           ::Sidekiq.default_configuration[:periodic]

data/lib/jobtick/parsers/whenever.rb

@@ -26,9 +26,7 @@ module JobTick
       end
 
       def self.job_key(job)
-        task = job[:task].to_s.strip
-        slug = task.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/\A_+|_+\z/, "")
-        "whenever.#{slug}"
+        "whenever.#{Parsers.slugify(job[:task].to_s.strip)}"
       end
       private_class_method :job_key
     end

data/lib/jobtick/version.rb

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

data/lib/jobtick.rb

@@ -37,12 +37,10 @@ module JobTick
       @monitor_map ||= {}
     end
 
-    def monitor_map=(map)
-      @monitor_map = map
-    end
+    attr_writer :monitor_map
 
     def monitor_key_for(class_name)
-      monitor_map[class_name.to_s]
+      monitor_map[class_name]
     end
 
     def reset!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobtick
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Clearstack Labs