sidekiq-merger 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60636bc150095c22b100fdbbeeb75dd9e9ed77de
-  data.tar.gz: 8a889756673e47f928c96204210a57ee39ec8e5f
+  metadata.gz: 7acc8bcc7c43fe634d4be54f9a4ce5c09135da27
+  data.tar.gz: ae19824415ac8fe3a38cd876977334f7e41ffaa2
 SHA512:
-  metadata.gz: 7a166d4979d485fcf98b962859f1f550b1e9966f2243de3d1ba51f82e955c4fd95b54210f8b0506c90f9d05c74f68a828eff64324a43c3a0e6a8eeb80096bef5
-  data.tar.gz: 6289d83637fcc81e87b35e4d01d671fb0d26114253d65b804cabe8cf2b029c3b91a4436d921240d8abad6a84a50074cb3bdd8ef7cbe1e5279f0ab3ea16719ff0
+  metadata.gz: 8fe75f849916a6c70177f68bc9f4326b873d7715e43efdc42db5f26206f7561dd2db4a986c229e32fbe43e40b915ac769db94c6d03b10aaab0a78d27a777e9e5
+  data.tar.gz: 6a0ef14b3ebac1b36ff959da8d35a28454757b5cbe4ea89efb0799fec10d2c34f4d7e324e67b482c432f24812758f79d640401ad1bec877419abcb2e0dc1cf78

data/lib/sidekiq/merger/merge.rb

@@ -26,10 +26,11 @@ class Sidekiq::Merger::Merge
       options = get_options(worker_class)
       merge_key = options["key"]
       if merge_key.respond_to?(:call)
-        merge_key.call(args)
-      else
-        merge_key
+        merge_key = merge_key.call(args)
       end
+      merge_key = "" if merge_key.nil?
+      merge_key = merge_key.to_json unless merge_key.is_a?(String)
+      merge_key
     end
 
     def get_options(worker_class)

data/lib/sidekiq/merger/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Merger
-    VERSION = "0.0.8".freeze
+    VERSION = "0.0.9".freeze
   end
 end

data/spec/sidekiq/merger/merge_spec.rb

@@ -1,7 +1,8 @@
 require "spec_helper"
 
 describe Sidekiq::Merger::Merge do
-  subject { described_class.new(worker_class, queue, "foo", redis: redis) }
+  subject { described_class.new(worker_class, queue, args, redis: redis) }
+  let(:args) { "foo" }
   let(:redis) { Sidekiq::Merger::Redis.new }
   let(:queue) { "queue" }
   let(:now) { Time.now }
@@ -61,6 +62,39 @@ describe Sidekiq::Merger::Merge do
     end
   end
 
+  describe ".merge_key" do
+    let(:args) { "foo" }
+    let(:options) { {} }
+    it "returns an empty string" do
+      expect(described_class.merge_key(worker_class, args)).to eq ""
+    end
+    context "string key" do
+      let(:options) { { key: "bar" } }
+      it "returns the string" do
+        expect(described_class.merge_key(worker_class, args)).to eq "bar"
+      end
+    end
+    context "other type key" do
+      let(:options) { { key: [1, 2, 3] } }
+      it "returns nil" do
+        expect(described_class.merge_key(worker_class, args)).to eq "[1,2,3]"
+      end
+    end
+    context "proc key" do
+      let(:args) { [1, 2, 3] }
+      let(:options) { { key: -> (args) { args[0].to_s } } }
+      it "returns the result of the proc" do
+        expect(described_class.merge_key(worker_class, args)).to eq "1"
+      end
+      context "non-string result" do
+        let(:options) { { key: -> (args) { args[0] } } }
+        it "returns nil" do
+          expect(described_class.merge_key(worker_class, args)).to eq "1"
+        end
+      end
+    end
+  end
+
   describe "#add" do
     it "adds the args in lazy merge" do
       expect(redis).to receive(:push_message).with("name:queue:foo", [1, 2, 3], execution_time)
@@ -89,7 +123,36 @@ describe Sidekiq::Merger::Merge do
     end
   end
 
+  describe "#delete_all" do
+    before do
+      subject.add([1, 2, 3], execution_time)
+      subject.add([2, 3, 4], execution_time)
+    end
+    it "deletes all" do
+      expect {
+        subject.delete_all
+      }.to change { subject.size }.from(2).to(0)
+    end
+  end
+
   describe "#size" do
+    before do
+      subject.add([1, 2, 3], execution_time)
+      subject.add([2, 3, 4], execution_time)
+    end
+    it "returns the size" do
+      expect(subject.size).to eq 2
+    end
+  end
+
+  describe "#all_args" do
+    before do
+      subject.add([1, 2, 3], execution_time)
+      subject.add([2, 3, 4], execution_time)
+    end
+    it "returns all args" do
+      expect(subject.all_args).to contain_exactly [1, 2, 3], [2, 3, 4]
+    end
   end
 
   describe "#flush" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-merger
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - dtaniwaki