inst-jobs 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f024416c8aac90611b46a38491ebc35373bc2136
-  data.tar.gz: f729a0faea215acb32cc8e9d7fbd07b05f96ba9d
+  metadata.gz: 6fc1b53dbd69b8847b9a87b9605899225659e6bd
+  data.tar.gz: 05ff57cb08b532ddadb1cf82f0490820847ad466
 SHA512:
-  metadata.gz: 00e97f21ed4245ee6452ce553b82e8c50e62d92e70a47515d5dfed0c2d7ec4d0a76a910b8c757eaa62d00e5cd6d79e55dfa570b748156ba9fdb50e5428055847
-  data.tar.gz: c09a528aeb3c0a055e0e54b6692e76e418636b170af3484467f5d451d84fcd8fa867c7a1da187b9dcab9b662984fe656444fb28d8a4ec21b3a329d75fadb927e
+  metadata.gz: a96b91c87fc000b003523e61cabe07ef7d433a7054423c9c50ecb96338a0e96c53d3de4589d6cb5baab91af2b81a6a2b8e9fca421f83bcd1b41cebde2a7cae6b
+  data.tar.gz: 0ed8814fa280e81da6e7d0632f91be46aaa4f09a34d9bfe715af0fd7f4b191433e59bf87400c2956f51d23dcceda3a59b83c13532bfd63f02e0d8e01c53be220

data/lib/delayed/message_sending.rb

@@ -95,35 +95,54 @@ module Delayed
     end
 
     module ClassMethods
-      def add_send_later_methods(method, enqueue_args={}, default_async=false)
-        aliased_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
+      KWARG_ARG_TYPES = %i{key keyreq keyrest}.freeze
+      private_constant :KWARG_ARG_TYPES
+
+      def add_send_later_methods(method_name, enqueue_args={}, default_async=false)
+        aliased_method, punctuation = method_name.to_s.sub(/([?!=])$/, ''), $1
 
         # we still need this for backwards compatibility
         without_method = "#{aliased_method}_without_send_later#{punctuation}"
 
-        if public_method_defined?(method)
+        if public_method_defined?(method_name)
           visibility = :public
-        elsif private_method_defined?(method)
+        elsif private_method_defined?(method_name)
           visibility = :private
         else
           visibility = :protected
         end
 
-        generated_delayed_methods.class_eval do
-          define_method without_method do |*args|
-            send(method, *args, synchronous: true)
-          end
-          send(visibility, without_method)
+        if has_kwargs? method_name
+          generated_delayed_methods.class_eval do
+            define_method without_method do |*args, **kwargs|
+              send(method_name, *args, synchronous: true, **kwargs)
+            end
 
-          define_method(method, -> (*args, synchronous: !default_async) do
-            if synchronous
-              super(*args)
-            else
-              send_later_enqueue_args(method, enqueue_args, *args, synchronous: true)
+            define_method(method_name, -> (*args, synchronous: !default_async, **kwargs) do
+              if synchronous
+                super(*args, **kwargs)
+              else
+                send_later_enqueue_args(method_name, enqueue_args, *args, synchronous: true, **kwargs)
+              end
+            end)
+          end
+        else
+          generated_delayed_methods.class_eval do
+            define_method without_method do |*args|
+              send(method_name, *args, synchronous: true)
             end
-          end)
-          send(visibility, method)
+
+            define_method(method_name, -> (*args, synchronous: !default_async) do
+              if synchronous
+                super(*args)
+              else
+                send_later_enqueue_args(method_name, enqueue_args, *args, synchronous: true)
+              end
+            end)
+          end
         end
+        generated_delayed_methods.send(visibility, without_method)
+        generated_delayed_methods.send(visibility, method_name)
       end
 
       def handle_asynchronously(method, enqueue_args={})
@@ -138,12 +157,19 @@ module Delayed
         add_send_later_methods(method, enqueue_args, Rails.env.production?)
       end
 
-      private def generated_delayed_methods
+      private
+
+      def generated_delayed_methods
         @generated_delayed_methods ||= Module.new.tap do |mod|
           const_set(:DelayedMethods, mod)
           prepend mod
         end
       end
+
+      def has_kwargs?(method_name)
+        original_arg_types = instance_method(method_name).parameters.map(&:first)
+        original_arg_types.any? { |arg_type| KWARG_ARG_TYPES.include?(arg_type) }
+      end
     end
   end
 end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.11.8"
+  VERSION = "0.11.9"
 end

data/spec/shared/delayed_method.rb

@@ -56,6 +56,21 @@ shared_examples_for 'random ruby objects' do
         lambda { obj.test_method }.should change { Delayed::Job.jobs_count(:current) }.by(1)
       end
 
+      it 'must work with kwargs in the original method' do
+        klass = Class.new do
+          attr_reader :run
+          def test_method(my_kwarg: nil); @run = my_kwarg; end
+          add_send_later_methods :test_method
+
+          def other_test(arg); @foo = arg; end
+          add_send_later_methods :other_test
+        end
+
+        obj = klass.new
+        obj.test_method(my_kwarg: 'foo', synchronous: true)
+        expect(obj.run).to eq 'foo'
+      end
+
       it "should work without default_async" do
         klass = Class.new do
           attr_accessor :ran

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit