sidekiq_bulk_job 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acd50d98090657e0c060fd63d2d1733214b964447a233b7a2a4a83b65e54db2
-  data.tar.gz: be8c7002b9200fcf374067ff49aa0208866ba50f218beedc91b021c42ecfa2b4
+  metadata.gz: e3f6ce66f186f36e576e2611b892ecbb013f888b54f27bbc36f1a463aedc7b1f
+  data.tar.gz: 8deff846fe66b2fa565af200678aa20a67ba0ef1550ef920fb5930da0d76bd22
 SHA512:
-  metadata.gz: e9b0fee851c8445ef0bc811a16f95716b5c772d3542b83be95c24c60246c0ea91cae491f1b428f8681cfba9bf3464c032779af4cc14664a550ace37fec1d3bff
-  data.tar.gz: bcf7ceea6a57f54c414c4a1194b5feb5880aaa3fabbe48f72d95016b3bdce059652cb21ed1e511363d56d17519e78bc0075be9d06b0e143d4709fab4f050f811
+  metadata.gz: 1199ea0291f826b28e7eb7e3fac6c5c00e98c69d37adc46e110e567ec82977ad3519c15fada8df89b07d5237161f457ab1c71271797897eff37f7677c0e26359
+  data.tar.gz: 1cb8a1f0c85caa3c05c994e1412b679251293d333b9d0b30831c13130e68a480035e484d73249e7be28645e01c7f237ea9dfd5348bdb1f97e16f73375faaa144

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq_bulk_job (0.1.0)
+    sidekiq_bulk_job (0.1.2)
       sidekiq (~> 5.2.7)
 
 GEM

data/lib/sidekiq_bulk_job.rb

@@ -23,7 +23,7 @@ module SidekiqBulkJob
     end
 
     def perform_async(job_class, *args)
-      options = Utils.symbolize_keys(@opts)
+      options = SidekiqBulkJob::Utils.symbolize_keys(@opts)
       if options[:at].nil? && options[:in].nil?
         payload = {
             job_class_name: job_class.to_s,
@@ -45,7 +45,7 @@ module SidekiqBulkJob
 
       # Optimization to enqueue something now that is scheduled to go out now or in the past
       if ts > now.to_f
-        options = Utils.symbolize_keys(@opts)
+        options = SidekiqBulkJob::Utils.symbolize_keys(@opts)
         payload = {
           job_class_name: job_class.to_s,
           at: ts,

data/lib/sidekiq_bulk_job/bulk_job.rb

@@ -9,11 +9,16 @@ module SidekiqBulkJob
     sidekiq_options queue: :default, retry: false
 
     def perform(job_class_name, args_array)
-      job = Utils.constantize(job_class_name)
+      target_name, method_name = SidekiqBulkJob::Utils.split_class_name_with_method job_class_name
+      job = SidekiqBulkJob::Utils.constantize(target_name)
       args_array.each do |_args|
         begin
           args = JSON.parse _args
-          job.new.send(:perform, *args)
+          if SidekiqBulkJob::Utils.class_with_method?(job_class_name)
+            job.send(method_name, *args)
+          else
+            job.new.send(method_name, *args)
+          end
         rescue Exception => e
           SidekiqBulkJob.logger.error("#{job_class_name} Args: #{args}, Error: #{e.full_message}")
           SidekiqBulkJob.fail_callback(job_class_name: job_class_name, args: args, exception: e)

data/lib/sidekiq_bulk_job/job_retry.rb

@@ -37,8 +37,8 @@ module SidekiqBulkJob
     end
 
     def queue(woker)
-      if !woker.sidekiq_options.nil? && !woker.sidekiq_options.empty?
-        sidekiq_options = Utils.symbolize_keys(woker.sidekiq_options)
+      if woker.included_modules.include?(Sidekiq::Worker) && !woker.sidekiq_options.nil? && !woker.sidekiq_options.empty?
+        sidekiq_options = SidekiqBulkJob::Utils.symbolize_keys(woker.sidekiq_options)
         if !sidekiq_options[:queue].nil?
           sidekiq_options[:queue]
         end

data/lib/sidekiq_bulk_job/scheduled_job.rb

@@ -9,12 +9,17 @@ module SidekiqBulkJob
     sidekiq_options queue: :default, retry: false
 
     def perform(job_class_name, args_redis_key)
-      job = Utils.constantize(job_class_name)
+      target_name, method_name = SidekiqBulkJob::Utils.split_class_name_with_method job_class_name
+      job = SidekiqBulkJob::Utils.constantize(target_name)
       args_array = SidekiqBulkJob.flush args_redis_key
       args_array.each do |_args|
         begin
           args = JSON.parse _args
-          job.new.send(:perform, *args)
+          if SidekiqBulkJob::Utils.class_with_method?(job_class_name)
+            job.send(method_name, *args)
+          else
+            job.new.send(method_name, *args)
+          end
         rescue Exception => e
           SidekiqBulkJob.logger.error("#{job_class_name} Args: #{args}, Error: #{e.full_message}")
           SidekiqBulkJob.fail_callback(job_class_name: job_class_name, args: args, exception: e)

data/lib/sidekiq_bulk_job/utils.rb

@@ -1,72 +1,86 @@
-module Utils
+module SidekiqBulkJob
+  module Utils
 
-  class << self
+    class << self
 
-    def symbolize_keys(obj)
-      case obj
-      when Array
-        obj.inject([]){|res, val|
-          res << case val
-          when Hash, Array
-            symbolize_keys(val)
-          else
-            val
-          end
-          res
-        }
-      when Hash
-        obj.inject({}){|res, (key, val)|
-          nkey = case key
-          when String
-            key.to_sym
-          else
-            key
-          end
-          nval = case val
-          when Hash, Array
-            symbolize_keys(val)
-          else
-            val
-          end
-          res[nkey] = nval
-          res
-        }
-      else
-        obj
+      def symbolize_keys(obj)
+        case obj
+        when Array
+          obj.inject([]){|res, val|
+            res << case val
+            when Hash, Array
+              symbolize_keys(val)
+            else
+              val
+            end
+            res
+          }
+        when Hash
+          obj.inject({}){|res, (key, val)|
+            nkey = case key
+            when String
+              key.to_sym
+            else
+              key
+            end
+            nval = case val
+            when Hash, Array
+              symbolize_keys(val)
+            else
+              val
+            end
+            res[nkey] = nval
+            res
+          }
+        else
+          obj
+        end
       end
-    end
 
-    def constantize(camel_cased_word)
-      names = camel_cased_word.split("::")
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split("::")
 
-      # Trigger a built-in NameError exception including the ill-formed constant in the message.
-      Object.const_get(camel_cased_word) if names.empty?
+        # Trigger a built-in NameError exception including the ill-formed constant in the message.
+        Object.const_get(camel_cased_word) if names.empty?
 
-      # Remove the first blank element in case of '::ClassName' notation.
-      names.shift if names.size > 1 && names.first.empty?
+        # Remove the first blank element in case of '::ClassName' notation.
+        names.shift if names.size > 1 && names.first.empty?
 
-      names.inject(Object) do |constant, name|
-        if constant == Object
-          constant.const_get(name)
-        else
-          candidate = constant.const_get(name)
-          next candidate if constant.const_defined?(name, false)
-          next candidate unless Object.const_defined?(name)
+        names.inject(Object) do |constant, name|
+          if constant == Object
+            constant.const_get(name)
+          else
+            candidate = constant.const_get(name)
+            next candidate if constant.const_defined?(name, false)
+            next candidate unless Object.const_defined?(name)
+
+            # Go down the ancestors to check if it is owned directly. The check
+            # stops when we reach Object or the end of ancestors tree.
+            constant = constant.ancestors.inject(constant) do |const, ancestor|
+              break const    if ancestor == Object
+              break ancestor if ancestor.const_defined?(name, false)
+              const
+            end
 
-          # Go down the ancestors to check if it is owned directly. The check
-          # stops when we reach Object or the end of ancestors tree.
-          constant = constant.ancestors.inject(constant) do |const, ancestor|
-            break const    if ancestor == Object
-            break ancestor if ancestor.const_defined?(name, false)
-            const
+            # owner is in Object, so raise
+            constant.const_get(name, false)
           end
+        end
+      end
 
-          # owner is in Object, so raise
-          constant.const_get(name, false)
+      def class_with_method?(klass_name)
+        klass_name.include?('.')
+      end
+
+      def split_class_name_with_method(klass_name)
+        if class_with_method?(klass_name)
+          klass_name.split('.')
+        else
+          [klass_name, :perform]
         end
       end
+
     end
 
   end
-
 end

data/lib/sidekiq_bulk_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqBulkJob
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_bulk_job
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - scalaview
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq