tantot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2d99f4f8b4289301ef52256f0190d78b7fb2c3
-  data.tar.gz: b827a5b307879a1682f9b9771b72bf11685d6850
+  metadata.gz: 8034dc47aeea3eeca0970dae7bec53a8e99de285
+  data.tar.gz: 26a50c7cd327edfdebc0706edf1cb6a861b76411
 SHA512:
-  metadata.gz: a475eb7b2913b50b3ad68997b3d12352608301c20748f4c2cb6d8359111c87bb51448697257ddab34a770b3e618349e5a1ced6feceb9143f153779dc6f8541e5
-  data.tar.gz: 61568c338ed951d8b367a803d307d321a33484c2c5d13d790ca70038c14a7f610d88e3adcefb42919006465a5e361cd0a3ecfc9f6086b4a92eea84f8da8e5498
+  metadata.gz: d439b688a52f03174b5f18020e226522518069da36e9b96b41953aec8266f8f81c533ae6299f5b4c496ffc9830512c7c62bb86b26075fe110627b135bfcd7119
+  data.tar.gz: a1a4189f19fdc39e248c40e3b4d60dc734dd4340082caeeb72289281df287aca115e84460714fce002ce49dea3195ff7c312caa5439693e5efb2663614a74bda

data/lib/tantot/config.rb

@@ -2,13 +2,14 @@ module Tantot
   class Config
     include Singleton
 
-    attr_accessor :performer, :format, :use_after_commit_callbacks, :sweep_on_push
+    attr_accessor :performer, :format, :use_after_commit_callbacks, :sweep_on_push, :sidekiq_queue
 
     def initialize
       @performer = :inline
       @format = :compact
       @use_after_commit_callbacks = true
       @sweep_on_push = false
+      @sidekiq_queue = :default
     end
   end
 end

data/lib/tantot/performer/sidekiq.rb

@@ -11,8 +11,10 @@ module Tantot
       end
 
       def run(context, changes)
-        context, changes = Tantot.collector.marshal(context, changes)
-        Tantot::Performer::Sidekiq::Worker.perform_async(context, changes)
+        queue = context[:options][:queue] || Tantot.config.sidekiq_queue
+        ::Sidekiq::Client.push('class' => Tantot::Performer::Sidekiq::Worker,
+          'args' => Tantot.collector.marshal(context, changes),
+          'queue' => queue)
       end
     end
   end

data/lib/tantot/version.rb

@@ -1,3 +1,3 @@
 module Tantot
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/extensions/chewy_spec.rb

@@ -135,20 +135,6 @@ if defined?(::Chewy)
         City.create!
       end
     end
-
-    if defined?(::Sidekiq)
-      context "using Sidekiq" do
-        require 'sidekiq/testing'
-
-        around do |example|
-          Sidekiq::Worker.clear_all
-          Tantot.config.performer = :sidekiq
-          example.run
-          Tantot.config.performer = :inline
-        end
-      end
-    end
-
   end
 
 end

data/spec/sidekiq_spec.rb

@@ -31,6 +31,7 @@ if defined?(::Sidekiq)
           City.create name: 'foo'
         end
         expect(Tantot::Performer::Sidekiq::Worker.jobs.size).to eq(1)
+        expect(Tantot::Performer::Sidekiq::Worker.jobs.first["queue"]).to eq('default')
         expect(Tantot::Performer::Sidekiq::Worker.jobs.first["args"]).to eq([{
           "model" => "City",
           "attributes" => ["name"],
@@ -63,6 +64,7 @@ if defined?(::Sidekiq)
             city.save
           end
           expect(Tantot::Performer::Sidekiq::Worker.jobs.size).to eq(1)
+          expect(Tantot::Performer::Sidekiq::Worker.jobs.first["queue"]).to eq('default')
           expect(Tantot::Performer::Sidekiq::Worker.jobs.first["args"]).to eq([{
             "model" => "City",
             "attributes" => ["name"],
@@ -74,6 +76,55 @@ if defined?(::Sidekiq)
       end
     end
 
+    describe Tantot::Performer::Sidekiq do
+      context "with a specific queue on a watcher" do
+        before do
+          class SidekiqWatcher
+            include Tantot::Watcher
+
+            watcher_options queue: :foo
+
+            def perform(changes)
+            end
+          end
+
+          Sidekiq::Worker.clear_all
+          stub_model(:city) do
+            watch SidekiqWatcher, :name
+          end
+        end
+
+        it "should set the sidekiq queue accordingly" do
+          Tantot.collector.run do
+            City.create name: 'foo'
+          end
+          expect(Tantot::Performer::Sidekiq::Worker.jobs.size).to eq(1)
+          expect(Tantot::Performer::Sidekiq::Worker.jobs.first["queue"]).to eq('foo')
+        end
+      end
+
+      context "with a specific queue on a block" do
+        before do
+          Sidekiq::Worker.clear_all
+          stub_model(:city) do
+            watch(:name, queue: :foo) {|changes| }
+          end
+        end
+
+        it "should set the sidekiq queue accordingly" do
+          class SidekiqWatcher
+            watcher_options queue: :foo
+          end
+
+          Tantot.collector.run do
+            City.create name: 'foo'
+          end
+          expect(Tantot::Performer::Sidekiq::Worker.jobs.size).to eq(1)
+          expect(Tantot::Performer::Sidekiq::Worker.jobs.first["queue"]).to eq('foo')
+        end
+      end
+    end
+
     describe Tantot::Collector::Block do
       let(:value) { {changed: false} }
       let(:changes) { {obj: nil} }
@@ -93,6 +144,7 @@ if defined?(::Sidekiq)
         end
         expect(Tantot::Performer::Sidekiq::Worker.jobs.size).to eq(1)
         block_id = Tantot.registry.watch_config.keys.last
+        expect(Tantot::Performer::Sidekiq::Worker.jobs.first["queue"]).to eq('default')
         expect(Tantot::Performer::Sidekiq::Worker.jobs.first["args"]).to eq([{
           "model" => "City",
           "attributes" => ["name"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tantot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - François-Pierre Bouchard