sidekiq-delay_extensions 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716a9aa8fc7cb10a70fa3677b0f23c782cf07bb31fe9ad5423da4c1b065a8477
-  data.tar.gz: a2652e237b7de3ca5a8a4cbb72655f805fb535b4e52b8aacf8d3c0b9a479515c
+  metadata.gz: beb5bfc9e96d466f3243e2a46d1826f67463b973fc9d6ce72687abe085cb61ab
+  data.tar.gz: 17d9241ad6cde74793d0e5c860b962044a8c9b592a8059566c4391a55f068b49
 SHA512:
-  metadata.gz: e9a1f926727cb57afc4221a2b23ea5c025f0ab566e9c2b000b46a51258376cede7bddb3795128456e2792a92a1352cc6a3e7c9b6793a4e8ff91dd1cf9993e7ae
-  data.tar.gz: 800db7a111af06c8854f348ce117d535bb4b88f9e54f2435f80bbcbf3db5a48b10f67ec1ba7655030d4b8dbc7fbbc2c13aa53e7bbc53eda0e84c597380401adc
+  metadata.gz: f8ac369b7701a8c979c729a512287d0956b1f952c87f48660d2f1262c14ab992cea51970626fc01eb737263e7c67b9dc1ad220542695964a74ad591ec2970fd8
+  data.tar.gz: a1cd9feaaae12197787b9b707689c61b6631e559f61cec18b0d35eac56165046100dba4822f5d0dd0c8ceae56e648113e3ee4bdd97a602a2b0df1af2072fcc01

data/Changes.md

@@ -6,8 +6,3 @@
 ---------
 
 - Extracted from https://github.com/mperham/sidekiq/tree/v6.4.1
-
-6.4.0
----------
-
-- Extracted from https://github.com/mperham/sidekiq/tree/v6.4.0

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "sidekiq", ">= 6.4.0"
+gem "sidekiq", ">= 6.4.1"
 gem "rake"
 gem "redis-namespace"
 gem "rails", ">= 6.0.2"

data/README.md

@@ -14,7 +14,7 @@ When Sidekiq reaches 7.0, this gem will begin being maintained on its own. Maint
 Requirements
 -----------------
 
-- See https://github.com/mperham/sidekiq/tree/v6.4.0
+- See https://github.com/mperham/sidekiq/tree/v6.4.1
   - Redis: 4.0+
   - Ruby: MRI 2.5+ or JRuby 9.2+.
   - Sidekiq 6.0 supports Rails 5.0+ but does not require it.

data/lib/sidekiq/delay_extensions/action_mailer.rb

@@ -16,8 +16,8 @@ module Sidekiq
       include Sidekiq::Worker
 
       def perform(yml)
-        (target, method_name, args, kwargs) = YAML.load(yml)
-        msg = kwargs.empty? ? target.public_send(method_name, *args) : target.public_send(method_name, *args, **kwargs)
+        (target, method_name, args) = YAML.load(yml)
+        msg = target.public_send(method_name, *args)
         # The email method can return nil, which causes ActionMailer to return
         # an undeliverable empty message.
         if msg

data/lib/sidekiq/delay_extensions/active_record.rb

@@ -18,8 +18,8 @@ module Sidekiq
       include Sidekiq::Worker
 
       def perform(yml)
-        (target, method_name, args, kwargs) = YAML.load(yml)
-        kwargs.empty? ? target.__send__(method_name, *args) : target.__send__(method_name, *args, **kwargs)
+        (target, method_name, args) = YAML.load(yml)
+        target.__send__(method_name, *args)
       end
     end
 

data/lib/sidekiq/delay_extensions/api.rb

@@ -23,10 +23,13 @@ module Sidekiq
         # Unwrap known wrappers so they show up in a human-friendly manner in the Web UI
         @display_args ||= case klass
                   when /\ASidekiq::DelayExtensions::Delayed/
-                    safe_load(args[0], args) do |_, _, arg|
-                      arg
+                    safe_load(args[0], args) do |_, _, arg, kwarg|
+                      if !kwarg || kwarg.empty?
+                        arg
+                      else
+                        [arg, kwarg]
+                      end
                     end
-
                   else
                     super
         end

data/lib/sidekiq/delay_extensions/class_methods.rb

@@ -16,8 +16,8 @@ module Sidekiq
       include Sidekiq::Worker
 
       def perform(yml)
-        (target, method_name, args, kwargs) = YAML.load(yml)
-        kwargs.empty? ? target.__send__(method_name, *args) : target.__send__(method_name, *args, **kwargs)
+        (target, method_name, args) = YAML.load(yml)
+        target.__send__(method_name, *args)
       end
     end
 

data/lib/sidekiq/delay_extensions/generic_proxy.rb

@@ -13,13 +13,13 @@ module Sidekiq
         @opts = options
       end
 
-      def method_missing(name, *args, **kwargs)
+      def method_missing(name, *args)
         # Sidekiq has a limitation in that its message must be JSON.
         # JSON can't round trip real Ruby objects so we use YAML to
         # serialize the objects to a String.  The YAML will be converted
         # to JSON and then deserialized on the other side back into a
         # Ruby object.
-        obj = [@target, name, args, kwargs]
+        obj = [@target, name, args]
         marshalled = ::YAML.dump(obj)
         if marshalled.size > SIZE_LIMIT
           ::Sidekiq.logger.warn { "#{@target}.#{name} job argument is #{marshalled.bytesize} bytes, you should refactor it to reduce the size" }

data/lib/sidekiq/delay_extensions/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module DelayExtensions
-    VERSION = "6.4.0"
+    VERSION = "6.4.1"
   end
 end

data/sidekiq-delay_extensions.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
     "source_code_uri" => "https://github.com/gemhome/sidekiq-delay_extensions"
   }
 
-  spec.add_dependency "sidekiq", ">= 6.4.0"
+  spec.add_dependency "sidekiq", ">= 6.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-delay_extensions
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - Mike Perham
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
 description: Extracted from Sidekiq 6.0
 email:
 - mperham@gmail.com