sidekiq-merger 0.0.1 → 0.0.4

data/spec/sidekiq/merger/middleware_spec.rb

@@ -17,7 +17,7 @@ describe Sidekiq::Merger::Middleware do
         "name"
       end
 
-      def perform(args)
+      def perform(*args)
       end
     end
   end
@@ -26,7 +26,7 @@ describe Sidekiq::Merger::Middleware do
   end
 
   describe "#call" do
-    it "adds the args to the batch" 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) {}
       flusher.flush
@@ -36,15 +36,21 @@ describe Sidekiq::Merger::Middleware do
       expect(worker_class.jobs.size).to eq 1
       job = worker_class.jobs[0]
       expect(job["queue"]).to eq queue
-      expect(job["args"]).to eq [[1, 2, 3], [2, 3, 4]]
+      expect(job["args"]).to contain_exactly [1, 2, 3], [2, 3, 4]
     end
     context "without at msg" do
-      it "does not add the args to the batch" do
-        subject.call(worker_class, { "args" => [1, 2, 3] }, queue) {}
-        subject.call(worker_class, { "args" => [2, 3, 4] }, queue) {}
+      it "peforms now with brackets" do
+        expect { |b| subject.call(worker_class, { "args" => [1, 2, 3] }, queue, &b) }.to yield_with_args(worker_class, { "args" => [[1, 2, 3]] }, queue, anything)
         flusher.flush
         expect(worker_class.jobs.size).to eq 0
       end
+      context "merged msgs" do
+        it "performs now" do
+          expect { |b| subject.call(worker_class, { "args" => [[1, 2, 3]], "merged" => true }, queue, &b) }.to yield_with_args(worker_class, { "args" => [[1, 2, 3]] }, queue, anything)
+          flusher.flush
+          expect(worker_class.jobs.size).to eq 0
+        end
+      end
     end
   end
 end

data/spec/sidekiq/merger/redis_spec.rb

@@ -9,7 +9,8 @@ describe Sidekiq::Merger::Redis do
   describe ".purge" do
     it "cleans up all the keys" do
       described_class.redis do |conn|
-        conn.sadd("sidekiq-merger:batches", "test")
+        conn.sadd("sidekiq-merger:merges", "test")
+        conn.set("sidekiq-merger:unique_msg:foo", "test")
         conn.set("sidekiq-merger:msg:foo", "test")
         conn.set("sidekiq-merger:lock:foo", "test")
       end
@@ -17,7 +18,8 @@ describe Sidekiq::Merger::Redis do
       described_class.purge!
 
       described_class.redis do |conn|
-        expect(conn.smembers("sidekiq-merger:batches")).to be_empty
+        expect(conn.smembers("sidekiq-merger:merges")).to be_empty
+        expect(conn.keys("sidekiq-merger:unique_msg:*")).to be_empty
         expect(conn.keys("sidekiq-merger:msg:*")).to be_empty
         expect(conn.keys("sidekiq-merger:lock:*")).to be_empty
       end
@@ -25,84 +27,101 @@ describe Sidekiq::Merger::Redis do
   end
 
   describe "#push" do
-    it "pushes the args" do
-      subject.push("foo", [1, 2, 3], execution_time)
-      described_class.redis do |conn|
-        expect(conn.smembers("sidekiq-merger:batches")).to contain_exactly "foo"
-        expect(conn.keys("sidekiq-merger:time:*")).to contain_exactly "sidekiq-merger:time:foo"
-        expect(conn.keys("sidekiq-merger:msg:*")).to contain_exactly "sidekiq-merger:msg:foo"
-        expect(conn.smembers("sidekiq-merger:msg:foo")).to contain_exactly "[1,2,3]"
-      end
-    end
-    it "sets the execution time" do
-      subject.push("foo", [1, 2, 3], execution_time)
-      described_class.redis do |conn|
-        expect(conn.get("sidekiq-merger:time:foo")).to eq execution_time.to_json
-      end
-    end
-
-    context "the batch key already exists" do
-      before do
-        subject.push("foo", [1, 2, 3], execution_time)
-      end
+    shared_examples_for "push spec" do
       it "pushes the args" do
-        subject.push("foo", [2, 3, 4], execution_time + 1.hour)
+        subject.push(pushing_key, pushing_msg, pushing_execution_time)
         described_class.redis do |conn|
-          expect(conn.smembers("sidekiq-merger:batches")).to contain_exactly "foo"
-          expect(conn.keys("sidekiq-merger:time:*")).to contain_exactly "sidekiq-merger:time:foo"
-          expect(conn.keys("sidekiq-merger:msg:*")).to contain_exactly "sidekiq-merger:msg:foo"
-          expect(conn.smembers("sidekiq-merger:msg:foo")).to contain_exactly "[1,2,3]", "[2,3,4]"
+          expect(conn.smembers("sidekiq-merger:merges")).to contain_exactly(*merge_keys)
+          expect(conn.keys("sidekiq-merger:time:*")).to contain_exactly(*times.keys)
+          expect(conn.keys("sidekiq-merger:unique_msg:*")).to contain_exactly(*unique_msgs_h.keys)
+          unique_msgs_h.each do |key, msgs|
+            expect(conn.smembers(key)).to contain_exactly(*msgs)
+          end
+          expect(conn.keys("sidekiq-merger:msg:*")).to contain_exactly(*msgs_h.keys)
+          msgs_h.each do |key, msgs|
+            expect(conn.lrange(key, 0, -1)).to contain_exactly(*msgs)
+          end
         end
       end
-      it "does not update the execution time" do
-        subject.push("foo", [2, 3, 4], execution_time + 1.hour)
+      it "sets the execution time" do
+        subject.push(pushing_key, pushing_msg, pushing_execution_time)
         described_class.redis do |conn|
-          expect(conn.get("sidekiq-merger:time:foo")).to eq execution_time.to_json
+          merge_keys.each do |key, time|
+            expect(conn.get(key)).to eq time
+          end
         end
       end
     end
 
-    context "the args has already been pushed" do
-      before do
-        subject.push("foo", [1, 2, 3], execution_time)
-      end
-      it "does not push the args" do
-        subject.push("foo", [1, 2, 3], execution_time + 1.hour)
-        described_class.redis do |conn|
-          expect(conn.smembers("sidekiq-merger:batches")).to contain_exactly "foo"
-          expect(conn.keys("sidekiq-merger:time:*")).to contain_exactly "sidekiq-merger:time:foo"
-          expect(conn.keys("sidekiq-merger:msg:*")).to contain_exactly "sidekiq-merger:msg:foo"
-          expect(conn.smembers("sidekiq-merger:msg:foo")).to contain_exactly "[1,2,3]"
-        end
-      end
-      it "does not update the execution time" do
-        subject.push("foo", [1, 2, 3], execution_time + 1.hour)
-        described_class.redis do |conn|
-          expect(conn.get("sidekiq-merger:time:foo")).to eq execution_time.to_json
-        end
-      end
+    let(:pushing_key) { "foo" }
+    let(:pushing_msg) { [1, 2, 3] }
+    let(:pushing_execution_time) { execution_time }
+
+    include_examples "push spec" do
+      let(:merge_keys) { ["foo"] }
+      let(:times) { {
+        "sidekiq-merger:time:foo" => execution_time.to_i.to_s,
+      } }
+      let(:unique_msgs_h) { {
+        "sidekiq-merger:unique_msg:foo" => ["[1,2,3]"]
+      } }
+      let(:msgs_h) { {
+        "sidekiq-merger:msg:foo" => ["[1,2,3]"]
+      } }
     end
 
-    context "other batch key already exists" do
-      before do
-        subject.push("foo", [1, 2, 3], execution_time)
+    context "the merge key already exists" do
+      let(:pushing_msg) { [2, 3, 4] }
+      before { subject.push("foo", [1, 2, 3], execution_time) }
+      include_examples "push spec" do
+        let(:merge_keys) { ["foo"] }
+        let(:times) { {
+          "sidekiq-merger:time:foo" => execution_time.to_i.to_s,
+        } }
+        let(:unique_msgs_h) { {
+          "sidekiq-merger:unique_msg:foo" => ["[1,2,3]", "[2,3,4]"]
+        } }
+        let(:msgs_h) { {
+          "sidekiq-merger:msg:foo" => ["[1,2,3]", "[2,3,4]"]
+        } }
       end
-      it "does not interfere the other batch" do
-        subject.push("bar", [2, 3, 4], execution_time + 1.hour)
-        described_class.redis do |conn|
-          expect(conn.smembers("sidekiq-merger:batches")).to contain_exactly "foo", "bar"
-          expect(conn.keys("sidekiq-merger:time:*")).to contain_exactly "sidekiq-merger:time:foo", "sidekiq-merger:time:bar"
-          expect(conn.keys("sidekiq-merger:msg:*")).to contain_exactly "sidekiq-merger:msg:foo", "sidekiq-merger:msg:bar"
-          expect(conn.smembers("sidekiq-merger:msg:foo")).to contain_exactly "[1,2,3]"
-          expect(conn.smembers("sidekiq-merger:msg:bar")).to contain_exactly "[2,3,4]"
-        end
+    end
+
+    context "the args has already ben pushed" do
+      before { subject.push("foo", [1, 2, 3], execution_time) }
+      include_examples "push spec" do
+        let(:merge_keys) { ["foo"] }
+        let(:times) { {
+          "sidekiq-merger:time:foo" => execution_time.to_i.to_s,
+        } }
+        let(:unique_msgs_h) { {
+          "sidekiq-merger:unique_msg:foo" => ["[1,2,3]"]
+        } }
+        let(:msgs_h) { {
+          "sidekiq-merger:msg:foo" => ["[1,2,3]", "[1,2,3]"]
+        } }
       end
-      it "sets the execution time" do
-        subject.push("bar", [2, 3, 4], execution_time + 1.hour)
-        described_class.redis do |conn|
-          expect(conn.get("sidekiq-merger:time:foo")).to eq execution_time.to_json
-          expect(conn.get("sidekiq-merger:time:bar")).to eq (execution_time + 1.hour).to_json
-        end
+    end
+
+    context "other merge key already exists" do
+      let(:pushing_key) { "bar" }
+      let(:pushing_msg) { [2, 3, 4] }
+      let(:pushing_execution_time) { execution_time + 1.hour }
+      before { subject.push("foo", [1, 2, 3], execution_time) }
+      include_examples "push spec" do
+        let(:merge_keys) { ["foo", "bar"] }
+        let(:times) { {
+          "sidekiq-merger:time:foo" => execution_time.to_i.to_s,
+          "sidekiq-merger:time:bar" => (execution_time + 1.hour).to_i.to_s,
+        } }
+        let(:unique_msgs_h) { {
+          "sidekiq-merger:unique_msg:foo" => ["[1,2,3]"],
+          "sidekiq-merger:unique_msg:bar" => ["[2,3,4]"],
+        } }
+        let(:msgs_h) { {
+          "sidekiq-merger:msg:foo" => ["[1,2,3]"],
+          "sidekiq-merger:msg:bar" => ["[2,3,4]"],
+        } }
       end
     end
   end
@@ -110,10 +129,21 @@ describe Sidekiq::Merger::Redis do
   describe "#delete" do
   end
 
-  describe "#batch_size" do
+  describe "#merge_size" do
   end
 
   describe "#exists?" do
+    context "unique key exists" do
+      it "returns true" do
+        described_class.redis { |conn| conn.sadd("sidekiq-merger:unique_msg:foo", "\"test\"") }
+        expect(subject.exists?("foo", "test")).to eq true
+      end
+    end
+    context "unique key does not exists" do
+      it "returns false" do
+        expect(subject.exists?("foo", "test")).to eq false
+      end
+    end
   end
 
   describe "#all" do
@@ -131,7 +161,7 @@ describe Sidekiq::Merger::Redis do
       subject.push("bar", [2, 3, 4], execution_time)
     end
     it "plucks all the args" do
-      expect(subject.pluck("bar")).to eq [[1, 2, 3], [2, 3, 4]]
+      expect(subject.pluck("bar")).to contain_exactly [1, 2, 3], [2, 3, 4]
     end
   end
 

data/spec/spec_helper.rb

@@ -54,13 +54,18 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 
   config.before :suite do
-    Sidekiq.logger.level = Logger::ERROR
+    Sidekiq::Testing.fake!
+    Sidekiq::Merger.logger = nil
+    Sidekiq.logger = nil
   end
 
   config.before :example do
-    Timecop.return
     Sidekiq::Merger::Redis.redis do |conn|
       conn.flushall
     end
   end
+
+  config.after :example do
+    Timecop.return
+  end
 end

metadata

@@ -1,200 +1,207 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-merger
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - dtaniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.47'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Merge sidekiq jobs.
 email:
 - daisuketaniwaki@gmail.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
+- ".gemrelease"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- app/Gemfile
+- app/app.rb
+- app/config.ru
+- app/sidekiq.rb
+- app/some_worker.rb
+- app/unique_worker.rb
+- app/views/index.erb
+- docker-compose-common.yml
+- docker-compose.yml
 - lib/sidekiq-merger.rb
 - lib/sidekiq/merger.rb
-- lib/sidekiq/merger/batch.rb
 - lib/sidekiq/merger/config.rb
 - lib/sidekiq/merger/flusher.rb
 - lib/sidekiq/merger/logging_observer.rb
+- lib/sidekiq/merger/merge.rb
 - lib/sidekiq/merger/middleware.rb
 - lib/sidekiq/merger/redis.rb
 - lib/sidekiq/merger/version.rb
+- lib/sidekiq/merger/views/index.erb
+- lib/sidekiq/merger/web.rb
+- misc/web_ui.png
 - sidekiq-merger.gemspec
-- spec/sidekiq/merger/batch_spec.rb
 - spec/sidekiq/merger/flusher_spec.rb
+- spec/sidekiq/merger/merge_spec.rb
 - spec/sidekiq/merger/middleware_spec.rb
 - spec/sidekiq/merger/redis_spec.rb
 - spec/sidekiq/merger_spec.rb
@@ -228,8 +235,8 @@ signing_key:
 specification_version: 4
 summary: Sidekiq merger plugin
 test_files:
-- spec/sidekiq/merger/batch_spec.rb
 - spec/sidekiq/merger/flusher_spec.rb
+- spec/sidekiq/merger/merge_spec.rb
 - spec/sidekiq/merger/middleware_spec.rb
 - spec/sidekiq/merger/redis_spec.rb
 - spec/sidekiq/merger_spec.rb