sidekiq-merger 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3468cfb6c6b95fa60dd5db64e5ce1a4ae04e5aac
-  data.tar.gz: 0b44b824a0b6ce4caf290fceae0f103c69493b9a
+SHA256:
+  metadata.gz: 53e070ac5acbed069e9ac6b49e9f43651bdf0e061a8a29d461e5b40111c8c5f7
+  data.tar.gz: 9d08abf9726549e6dacb30a6382591bcb7d86b3bf219c30b4c151b471346872e
 SHA512:
-  metadata.gz: aa20b7462ba95c846352e51310eb467657a5808e5cb1d49f15801a516a34bc50e3efab585e4f940259819d1d756dedc6460811273014e8f0438ecebd6e081e64
-  data.tar.gz: d6d0e0b80540dbe54a1e2adc85fd4d21e4674f6370fae9db3c97b51c41da8fc02152aba089f0452599779834590f9d4087e20617d3ad5687d4e4bd84381a55e8
+  metadata.gz: 8baeb68048097d0e32c31ebb099f658fdb7201bccd8fed439956a60d82fd309d67dec63d4bfd95c4276c72d115c669d8fc49bf0405de789d28f3852725f5950c
+  data.tar.gz: 874696413e3d3d8b37cfa196b7adb72bb01526080017a9a34142cbd051f153568b03372d23ab36ca8944e05883452d440e88d65d20339ca3c5a35031b0402085

data/.rubocop.yml

@@ -11,39 +11,42 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: true
   EnforcedStyle: 'space'
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideArrayLiteralBrackets:
   Enabled: true
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideReferenceBrackets:
   Enabled: true
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceInsideBlockBraces:
   Enabled: true
 
-Style/SpaceBeforeComma:
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceBeforeComma:
   Enabled: false
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: true
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: true
 
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   Enabled: true
   AllowForAlignment: true
 
 Lint/DuplicateMethods:
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: true
   Max: 200
   AllowHeredoc: true
@@ -67,16 +70,13 @@ Style/ClassAndModuleChildren:
   Exclude:
     - lib/sidekiq/merger/version.rb
 
-Rails/PluralizationGrammar:
-  Enabled: true
-
-Style/AlignArray:
+Layout/ArrayAlignment:
   Enabled: true
 
-Style/AlignHash:
+Layout/HashAlignment:
   Enabled: true
 
-Style/BlockEndNewline:
+Layout/BlockEndNewline:
   Enabled: false
 
 Style/DoubleNegation:

data/.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
 gemfile:
   - gemfiles/sidekiq_4_0.gemfile
   - gemfiles/sidekiq_4_1.gemfile

data/README.md

@@ -105,6 +105,14 @@ Format: `Boolean`
 
 e.g. `true`
 
+### `batch_size` (optional, default: `nil`)
+
+Allow to specify how many jobs max to provide as arguments per aggregation
+
+Format: `Int`
+
+e.g. `50`
+
 ## Web UI
 
 ![Web UI](misc/web_ui.png)

data/lib/sidekiq/merger/merge.rb

@@ -73,12 +73,16 @@ class Sidekiq::Merger::Merge
     end
 
     unless msgs.empty?
-      Sidekiq::Client.push(
-        "class" => worker_class,
-        "queue" => queue,
-        "args" => msgs,
-        "merged" => true
-      )
+      batches = options[:batch_size].nil? ? [msgs] : msgs.each_slice(options[:batch_size].to_i).to_a
+      batches.each do |batch_msgs|
+        # preserve FIFO when enqueuing batches
+        Sidekiq::Client.push(
+          "class" => worker_class,
+          "queue" => queue,
+          "args" => batch_msgs,
+          "merged" => true
+        )
+      end
     end
   end
 

data/lib/sidekiq/merger/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Merger
-    VERSION = "0.0.12".freeze
+    VERSION = "0.1.0".freeze
   end
 end

data/sidekiq-merger.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = [">= 2.2.2", "< 2.6"]
+  spec.required_ruby_version = [">= 2.5.0"]
 
   spec.add_development_dependency "rake", ">= 10.0", "< 13"
   spec.add_development_dependency "rspec", ">= 3.0", "< 4"
   spec.add_development_dependency "simplecov", "~> 0.12"
   spec.add_development_dependency "timecop", "~> 0.8"
-  spec.add_development_dependency "rubocop", "~> 0.47"
+  spec.add_development_dependency "rubocop", "~> 0.93.1"
   spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "appraisal"
 

data/spec/sidekiq/merger/merge_spec.rb

@@ -141,19 +141,48 @@ describe Sidekiq::Merger::Merge, worker_class: true do
   end
 
   describe "#flush" do
-    before do
-      subject.add([1, 2, 3], execution_time)
-      subject.add([2, 3, 4], execution_time)
+    context "when no batch_size is configured" do
+      before do
+        subject.add([1, 2, 3], execution_time)
+        subject.add([2, 3, 4], execution_time)
+      end
+      it "flushes all the args" do
+        expect(Sidekiq::Client).to receive(:push).with(
+          "class" => worker_class,
+          "queue" => queue,
+          "args" => a_collection_containing_exactly([1, 2, 3], [2, 3, 4]),
+          "merged" => true
+        )
+  
+        subject.flush
+      end
     end
-    it "flushes all the args" do
-      expect(Sidekiq::Client).to receive(:push).with(
-        "class" => worker_class,
-        "queue" => queue,
-        "args" => a_collection_containing_exactly([1, 2, 3], [2, 3, 4]),
-        "merged" => true
-      )
 
-      subject.flush
+    context "when batch_size is configured to 2" do
+      let(:worker_options) { { key: -> (args) { args.to_json }, batch_size: 2 } }
+      before do
+        subject.add([1, 2, 3], execution_time)
+        subject.add([2, 3, 4], execution_time)
+        subject.add([3, 4, 5], execution_time)
+        subject.add([4, 5, 6], execution_time)
+      end
+      it "flushes all the args" do
+        expect(Sidekiq::Client).to receive(:push).with(
+          "class" => worker_class,
+          "queue" => queue,
+          "args" => a_collection_containing_exactly([1, 2, 3], [2, 3, 4]),
+          "merged" => true
+        )
+
+        expect(Sidekiq::Client).to receive(:push).with(
+          "class" => worker_class,
+          "queue" => queue,
+          "args" => a_collection_containing_exactly([3, 4, 5], [4, 5, 6]),
+          "merged" => true
+        )
+
+        subject.flush
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -41,6 +41,9 @@ RSpec.configure do |config|
     Sidekiq::Testing.fake!
     Sidekiq::Merger.logger = nil
     Sidekiq.logger = nil
+    if Redis.respond_to?(:exists_returns_integer)
+      Redis.exists_returns_integer = false
+    end
   end
 
   config.around :example do |example|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-merger
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - dtaniwaki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.93.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ homepage: https://github.com/dtaniwaki/sidekiq-merger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,19 +245,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '2.6'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Sidekiq merger plugin
 test_files: