softwear-lib 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 512471669d37d29641cc7ed75639301447b024fc
-  data.tar.gz: 95db09045fa89abd0f900f2f3b4b258d9df79353
+  metadata.gz: 44ddb5561ba7854b42a449e5dcc602f7a12fe15d
+  data.tar.gz: 802c5fd8137b31d26cc1afb3632962c2a02de4c4
 SHA512:
-  metadata.gz: 61de9873e98b8518498566d7fcf3172022d6f91363330ae0720fa8a8df9ba8d508e5a5572ab8bfbf71f4ac5ed2bda9b31301f937be704d03cdb702f0f3852362
-  data.tar.gz: 3484f1f2e735891ebbcdff7e95c96a3aae29bb4215c605e6a2b3577d7fe94444f4b30f0cc1ff4708d52a50ad84501667a0893bd844e63d7b99305e5c176b5efc
+  metadata.gz: 3c687adbd0fd0f6112ae01f1de28da66f2ea814bb7fe33471017ae900e0086476b728fb9cd1d843cf3bbbee49dcc52583f622498b530f2cb8958df39afbefde3
+  data.tar.gz: 7f46608f690f829b779cef2e861c9d32421b75a66f006c27b49b74dd789204e072f266ebabe078f6b5aa873b9c350ed9eebf4dfc4cae60c66230e5e5d5e3dc6f

data/lib/softwear/lib/enqueue.rb

@@ -22,33 +22,44 @@ module Softwear
           end
           raise "enqueue what?" if method_names.empty?
 
+          # We will extend the class mod and include the instance mod.
+          # This allows us to override the generated enqueue methods and
+          # call `super`.
+          #
+          enqueue_class_mod = Module.new
+          enqueue_instance_mod = Module.new
+
           method_names.each do |method_name|
-            class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def self.#{method_name}(id, *args)
+            enqueue_class_mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{method_name}(id, *args)
                 find(id).#{method_name}(*args)
               end
             RUBY
 
             if Rails.env.production?
-              class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def self.enqueue_#{method_name}(id, *args)
+              enqueue_class_mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                def enqueue_#{method_name}(id, *args)
                   ::Sidekiq::Client.push(
                     'class' => ::Softwear::Lib::Enqueue::Worker,
                     'args'  => [name, id, #{method_name.inspect}] + args,
                     'queue' => #{options[:queue].inspect}
                   )
                 end
+              RUBY
 
+              enqueue_instance_mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def enqueue_#{method_name}(*args)
-                  self.class.enqueue_#{method_name}(*args)
+                  self.class.enqueue_#{method_name}(id, *args)
                 end
               RUBY
             else
-              class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def self.enqueue_#{method_name}(id, *args)
+              enqueue_class_mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                def enqueue_#{method_name}(id, *args)
                   self.#{method_name}(id, *args)
                 end
+              RUBY
 
+              enqueue_instance_mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def enqueue_#{method_name}(*args)
                   self.#{method_name}(*args)
                 end
@@ -56,6 +67,9 @@ module Softwear
             end
           end
 
+          send :extend, enqueue_class_mod
+          send :include, enqueue_instance_mod
+
           r = method_names.map { |m| "enqueue_#{m}".to_sym }
           r.size == 1 ? r.first : r
         end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.8.3"
+    VERSION = "1.8.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Nigel Baillie