sidekiq_adhoc_job 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f35c0912b36fde038556110a6a116b789aaaf62cab80bd43521e1c50eec4ec
-  data.tar.gz: 18913f33c03e1a976bafeac7fa03f575f87c43f6a325c00d92f9b22370014667
+  metadata.gz: 1b485f48179615a49f00e4a39c0ff9b7d4ffe77ef9336e331d875633c1ccdf82
+  data.tar.gz: c0f7d9316a7cff046ebe6ef03fea42206ff0c195c5e6081fe80750e5de5f98c9
 SHA512:
-  metadata.gz: 1790167e58fe6b6cfe2ec654e00801b31249e04041463505130f4d0857162dd4b55f2234e3ea2fb1cba1ad0d54e2601ca8d640eff7bb4e2aac94bd33f9cf0845
-  data.tar.gz: a7e0161b04b1cfbe0a7b0b7e9038f8c0802952925b33ed05ec3f356160d0ba2c9dd967f16e04bc4d9cfad70c178c31cd8311a61c434e60fc689a7cc1fc1fc76b
+  metadata.gz: 427a776633fa687204e6a7d73f7ef95c0e3fc3a77995fccbb4ab84a78bd3a51c731f98ee7ffa3886df6f9e98bd735dd5a73136c2bf5f45e028d3de1a0c60edbe
+  data.tar.gz: c4897277ab341b525cd4dcf1b4943cac66ba27a46d581d91334f32eb8867c0bf300d96eb342093c10530a43d4cb0f1e85cb08b1dad852e0f746e20d1ffd6b8bd

data/lib/sidekiq_adhoc_job.rb

@@ -10,8 +10,6 @@ require 'sidekiq_adhoc_job/web'
 
 module SidekiqAdhocJob
 
-  InvalidConfigurationError ||= Class.new(RuntimeError)
-
   def self.configure
     @_config = Configuration.new
     yield @_config
@@ -22,8 +20,6 @@ module SidekiqAdhocJob
   end
 
   def self.init
-    raise InvalidConfigurationError, 'Must configure before init' unless @_config&.configured?
-
     SidekiqAdhocJob::WorkerClassesLoader.load(@_config.module_names)
 
     Sidekiq::Web.register(SidekiqAdhocJob::Web)
@@ -38,8 +34,8 @@ module SidekiqAdhocJob
       @module_names = []
     end
 
-    def configured?
-      !@module_names.empty?
+    def module_names
+      Array(@module_names).map(&:to_s)
     end
   end
 

data/lib/sidekiq_adhoc_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAdhocJob
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/lib/sidekiq_adhoc_job/worker_classes_loader.rb

@@ -1,15 +1,11 @@
 module SidekiqAdhocJob
   class WorkerClassesLoader
-
-    StringUtil ||= Utils::String
-
     @_worker_klasses = {}
 
     def self.load(module_names)
-      module_consts = module_names.map { |name| StringUtil.constantize(name.to_s) }
-      module_consts.each do |module_const|
-        module_const.constants.each do |sub_module_const_sym|
-          load_workers(module_const, sub_module_const_sym, @_worker_klasses)
+      ObjectSpace.each_object(Class).each do |klass|
+        if worker_class?(klass) && allowed_namespace?(klass.name, allowlist: module_names)
+          @_worker_klasses[worker_path_name(klass.name)] = klass
         end
       end
     end
@@ -22,27 +18,21 @@ module SidekiqAdhocJob
       @_worker_klasses[path_name]
     end
 
-    def self.load_workers(parent_module_const, module_sym, workers)
-      qualified_name = module_sym.to_s
+    def self.worker_class?(klass)
+      klass.included_modules.include?(Sidekiq::Worker)
+    end
+    private_class_method :worker_class?
 
-      module_const = begin
-                       StringUtil.constantize(qualified_name)
-                     rescue NameError => _e
-                       qualified_name = [parent_module_const, module_sym].compact.join('::')
-                       begin
-                         StringUtil.constantize(qualified_name)
-                       rescue NameError => _e
-                         nil
-                       end
-                     end
-      return unless module_const && module_const.is_a?(Class)
+    def self.allowed_namespace?(class_name, allowlist:)
+      return true if allowlist.empty? || allowlist.include?('Module') # allow any namespace
 
-      if module_const.include?(Sidekiq::Worker)
-        path_name = StringUtil.underscore(qualified_name).gsub('/', '_')
-        workers[path_name] = module_const
-        return
-      end
+      allowlist.any? { |prefix| class_name.start_with?(prefix) }
     end
+    private_class_method :allowed_namespace?
 
+    def self.worker_path_name(worker_name)
+      Utils::String.underscore(worker_name).gsub('/', '_')
+    end
+    private_class_method :worker_path_name
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_adhoc_job
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Goh Khoon Hiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Trigger jobs adhoc from Sidekiq web admin