sidekiq_adhoc_job 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d343fd5493049cf0f38225bfde6a3d5329e1bf9aa97d9c57a78b2896cd615ad1
-  data.tar.gz: 3e5b08a0e5a81ab52070158ec10e64c6f92a34726244d356a096259981a0d62d
+  metadata.gz: df66102de04a00d471d9fb6227e4c60b0223062dda40be414cfc2f3b4e8278e6
+  data.tar.gz: 132225f4c811811c85ecc971a7a9f34cff0cf2d9b0d6b2f83218c76e2653c367
 SHA512:
-  metadata.gz: f0b0a21ab330712ab59a2c0a356f5ca6c1c31ff9a704b9c08ab3b5ced2f22d11deee0a831c4e1bac51592e9420f74cbfea18aa4bab5f184e44e51f9e36c17d2a
-  data.tar.gz: c37d32257e371b2cf4851733ee3f9f32a31d495e372801411c6c491aae2ce482f654e409561e8300dfa602d63d01506b6962a4e6201fcd817d8bb18fbd360964
+  metadata.gz: 459e2d8b32611520ea08e696ddb2daa6716059eaa966e6f3f2208b6c81679c46be0cfd88e0da94b1ab9f2a31de794b6be583dd170c293625782e02af21b43406
+  data.tar.gz: 5aa2a6a2e5d7c9f8c4fa6163114a8d0573ed7cfa4c3dadbeebdd4c2d6523924590e9a73d98e148730f7d80429aa79aa300e2daff1046a8dc141e50210fc1ed41

data/lib/sidekiq_adhoc_job.rb

@@ -2,6 +2,7 @@ require 'sidekiq'
 require 'sidekiq/web'
 
 require 'sidekiq_adhoc_job/utils/string'
+require 'sidekiq_adhoc_job/utils/class_inspector'
 require 'sidekiq_adhoc_job/worker_classes_loader'
 require 'sidekiq_adhoc_job/web/job_presenter'
 require 'sidekiq_adhoc_job/services/schedule_adhoc_job'

data/lib/sidekiq_adhoc_job/services/schedule_adhoc_job.rb

@@ -9,6 +9,9 @@ module SidekiqAdhocJob
         acc
       end
       @worker_klass = WorkerClassesLoader.find_worker_klass(job_name)
+      @worker_klass_inspector = Utils::ClassInspector.new(worker_klass)
+      @allowed_params = worker_klass_inspector.required_parameters(:perform) + worker_klass_inspector.optional_parameters(:perform)
+
       parse_params
     end
 
@@ -18,10 +21,10 @@ module SidekiqAdhocJob
 
     private
 
-    attr_reader :request_params, :worker_klass, :allowed_params, :worker_params
+    attr_reader :request_params, :worker_klass, :worker_klass_inspector,
+                :allowed_params, :worker_params
 
     def parse_params
-      @allowed_params = worker_klass.new.method(:perform).parameters.reject { |type, _| type == :rest }.flat_map(&:last)
       @worker_params = allowed_params.map { |key| StringUtil.parse(request_params[key]) }
       if !!request_params[:rest_args] && !request_params[:rest_args].empty?
         @worker_params += request_params[:rest_args].split(',').map { |arg| StringUtil.parse(arg.strip) }

data/lib/sidekiq_adhoc_job/utils/class_inspector.rb

@@ -0,0 +1,50 @@
+module SidekiqAdhocJob
+  module Utils
+    class ClassInspector
+
+      attr_reader :klass_name, :klass_obj, :method_parameters
+
+      def initialize(klass_name)
+        @klass_name = klass_name
+        @klass_obj = klass_name.new
+        @method_parameters = {}
+      end
+
+      def parameters(method_name)
+        return method_parameters[method_name] if method_parameters[method_name]
+
+        klass_method = klass_method(klass_obj.method(method_name))
+        params = klass_method
+                 .parameters
+                 .group_by { |type, _| type }
+                 .inject({}) do |acc, (type, params)|
+                   acc[type] = params.map(&:last)
+                   acc
+                 end
+
+        method_parameters[method_name] = params
+
+        params
+      end
+
+      def required_parameters(method_name)
+        parameters(method_name)[:req] || []
+      end
+
+      def optional_parameters(method_name)
+        parameters(method_name)[:opt] || []
+      end
+
+      def has_rest_parameter?(method_name)
+        !!parameters(method_name)[:rest]
+      end
+
+      def klass_method(method)
+        return method unless method.super_method
+
+        klass_method(method.super_method)
+      end
+
+    end
+  end
+end

data/lib/sidekiq_adhoc_job/utils/string.rb

@@ -82,10 +82,14 @@ module SidekiqAdhocJob
           true
         elsif input == 'false'
           false
+        elsif input == 'nil'
+          nil
         elsif (i = parse_integer(input))
           i
         elsif (f = parse_float(input))
           f
+        elsif (j = parse_json(input))
+          j
         else
           input
         end
@@ -103,6 +107,12 @@ module SidekiqAdhocJob
         nil
       end
 
+      def self.parse_json(input)
+        JSON.parse(input)
+      rescue JSON::ParserError => _e
+        nil
+      end
+
     end
   end
 end

data/lib/sidekiq_adhoc_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAdhocJob
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/sidekiq_adhoc_job/web/job_presenter.rb

@@ -38,16 +38,9 @@ module SidekiqAdhocJob
       end
 
       def self.convert_klass_name_to_presenter(path_name, klass_name)
-        klass_obj = klass_name.new
         queue = klass_name.sidekiq_options['queue']
-        args = klass_obj
-               .method(:perform)
-               .parameters
-               .group_by { |type, _| type }
-               .inject({}) do |acc, (type, params)|
-                 acc[type] = params.map(&:last)
-                 acc
-               end
+        class_inspector = SidekiqAdhocJob::Utils::ClassInspector.new(klass_name)
+        args = class_inspector.parameters(:perform)
         new(klass_name, path_name, queue, args)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_adhoc_job
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Goh Khoon Hiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - lib/sidekiq_adhoc_job.rb
 - lib/sidekiq_adhoc_job/services/schedule_adhoc_job.rb
+- lib/sidekiq_adhoc_job/utils/class_inspector.rb
 - lib/sidekiq_adhoc_job/utils/string.rb
 - lib/sidekiq_adhoc_job/version.rb
 - lib/sidekiq_adhoc_job/web.rb