sidekiq-merger 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6c788a720ff09719c0c646767a82102ee0c858
-  data.tar.gz: f7e3afc43bd8a75e0dfebbbf31425b97949328aa
+  metadata.gz: 764a83e3da41cbfaa54d2d8a0abbdcddcb42c289
+  data.tar.gz: 40793d538fcd693873fb53aa657cbbbb82ad20a8
 SHA512:
-  metadata.gz: b45ec5e708f89daf1dbebbfd1c9b32648e2478d89cc38c68f4ffa53fd8d46c050b3aa9c84451488af955615dd213aefb5542a677de752f535e32d2c2482627e7
-  data.tar.gz: a13ed626974a75bfbb12d1763b3cf944f0fd353f3de17b63e0a2e2416ec76b1912fd687259a9d8da77bc688143b45738f44221238d18fb7a9edc860f4971aa61
+  metadata.gz: e43782390e487179771cce40af1edefb40f493236629147fcdc44a595ae35d739a35d5c2aa2eca007975a19e69df9f0e56344f21f8a426cedccd617fbb029ad0
+  data.tar.gz: 9e34d46fea2b98e272f29d68f0e554d9f9c93299156fc7d986a9e29f54a7464949a270e8ae8613319e0c9a5ef6cd7708f9e7a15154913c460baa8b53bf6641a1

data/.dockerignore

@@ -1,6 +1,5 @@
 .bundle/
 .yardoc
-Gemfile.lock
 _yardoc/
 coverage/
 doc/
@@ -9,6 +8,8 @@ spec/reports/
 tmp/
 rdoc/
 
+/Gemfile.lock
+
 *.gem
 *.rbc
 

data/.gitignore

@@ -1,6 +1,5 @@
 .bundle/
 .yardoc
-Gemfile.lock
 _yardoc/
 coverage/
 doc/
@@ -9,6 +8,8 @@ spec/reports/
 tmp/
 rdoc/
 
+/Gemfile.lock
+
 *.gem
 *.rbc
 

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: :spec
+task default: [:rubocop, :spec]

data/app/Gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ../
+  specs:
+    sidekiq-merger (0.0.6)
+      activesupport (>= 3.2, < 6)
+      concurrent-ruby (~> 1.0)
+      sidekiq (>= 3.4, < 5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.0.4)
+    connection_pool (2.2.1)
+    i18n (0.7.0)
+    minitest (5.10.1)
+    rack (1.6.5)
+    rack-flash3 (1.0.5)
+      rack
+    rack-protection (1.5.3)
+      rack
+    redis (3.3.3)
+    sidekiq (4.2.9)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    sidekiq-status (0.6.0)
+      sidekiq (>= 2.7)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    thread_safe (0.3.5)
+    tilt (2.0.6)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rack-flash3
+  sidekiq
+  sidekiq-merger!
+  sidekiq-status
+  sinatra
+
+BUNDLED WITH
+   1.13.6

data/app/sidekiq.rb

@@ -2,8 +2,8 @@ require "active_support/core_ext/numeric/time"
 require "sidekiq"
 require "sidekiq-status"
 require "sidekiq-merger"
-require_relative "./some_worker"
-require_relative "./unique_worker"
+require_relative "workers/some_worker"
+require_relative "workers/unique_worker"
 
 expiration = 30.minutes
 

data/lib/sidekiq/merger/middleware.rb

@@ -7,7 +7,9 @@ class Sidekiq::Merger::Middleware
     worker_class = worker_class.camelize.constantize if worker_class.is_a?(String)
     options = worker_class.get_sidekiq_options
 
-    if !msg["at"].nil? && options.key?("merger")
+    merger_enabled = options.key?("merger")
+
+    if merger_enabled && !msg["at"].nil? && msg["at"].to_f > Time.now.to_f
       Sidekiq::Merger::Merge
         .initialize_with_args(worker_class, queue, msg["args"])
         .add(msg["args"], msg["at"])

data/lib/sidekiq/merger/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Merger
-    VERSION = "0.0.6".freeze
+    VERSION = "0.0.7".freeze
   end
 end

data/spec/sidekiq/merger/middleware_spec.rb

@@ -23,12 +23,13 @@ describe Sidekiq::Merger::Middleware do
   end
   before :example do
     allow(Object).to receive(:const_get).with("Name").and_return worker_class
+    Timecop.freeze(now)
   end
 
   describe "#call" do
     it "adds the args to the merge" do
-      subject.call(worker_class, { "args" => [1, 2, 3], "at" => now + 10.seconds }, queue) {}
-      subject.call(worker_class, { "args" => [2, 3, 4], "at" => now + 15.seconds }, queue) {}
+      subject.call(worker_class, { "args" => [1, 2, 3], "at" => (now + 10.seconds).to_f }, queue) {}
+      subject.call(worker_class, { "args" => [2, 3, 4], "at" => (now + 15.seconds).to_f }, queue) {}
       flusher.flush
       expect(worker_class.jobs.size).to eq 0
       Timecop.travel(10.seconds)
@@ -52,5 +53,12 @@ describe Sidekiq::Merger::Middleware do
         end
       end
     end
+    context "at is before current time" do
+      it "peforms now" do
+        expect { |b| subject.call(worker_class, { "args" => [1, 2, 3], "at" => now.to_f }, queue, &b) }.to yield_with_args(worker_class, { "args" => [[1, 2, 3]], "at" => now.to_f }, queue, anything)
+        flusher.flush
+        expect(worker_class.jobs.size).to eq 0
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-merger
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - dtaniwaki
@@ -179,12 +179,13 @@ files:
 - README.md
 - Rakefile
 - app/Gemfile
+- app/Gemfile.lock
 - app/app.rb
 - app/config.ru
 - app/sidekiq.rb
-- app/some_worker.rb
-- app/unique_worker.rb
 - app/views/index.erb
+- app/workers/some_worker.rb
+- app/workers/unique_worker.rb
 - docker-compose-common.yml
 - docker-compose.yml
 - lib/sidekiq-merger.rb