sidekiq-paquet 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d30b4621c71e1966308bbe0a68f10aeb776a332
-  data.tar.gz: 13476e7dbafc931566f3e9cd6d2861fa1175583f
+  metadata.gz: 2a8cb3d7307887cc9c34999050e7460e6515f381
+  data.tar.gz: 6097a9b12ffc1546b784c2b519d5687da3017418
 SHA512:
-  metadata.gz: d17cefb200e17b149424f2c1403b053e11c23da4c016e670b445f9108da393cc081c9281a91cb4a72faa320c5fd51fc4641d2579e0210daacae43367a7e9a525
-  data.tar.gz: 46be4131522f343c047226c2ae9b3b06082590a2054ac98cfd11bec473f2e4de72d1172fc3a532998165e3ff0001ad61e2a7fa52b674c9d00535e77b25d31ee8
+  metadata.gz: dc9e033a09c25ef09aae43065f9b92329acf33225c640d2737b4ef0dcc112681c5c436938206c0b67c4864d43ad8479a6533b78295ec05b8c1978cf60f216cc9
+  data.tar.gz: c970fde44941632e1d115dd88a5bbdfaf65e44f005ca13bcf356305d042283a705ca9ee1df46a5bd585de6a18b3fef92762a00c1b8ef5ab1b07e03fc0c9920c4

data/README.md

@@ -1,6 +1,6 @@
 # Sidekiq::Paquet
 
-Instead of enqueueing and processing jobs one at a time, enqueue them one by one process them in bulk.
+Instead of enqueueing and processing jobs one at a time, enqueue them one by one and process them in bulk.
 Useful for grouping background API calls or intensive database inserts coming from multiple sources.
 
 ## Installation
@@ -9,7 +9,7 @@ Useful for grouping background API calls or intensive database inserts coming fr
 gem install 'sidekiq-paquet'
 ```
 
-sidekiq-bulk requires Sidekiq 4+. If you're using Sidekiq < 4, take a look at [sidekiq-grouping](https://github.com/gzigzigzeo/sidekiq-grouping/) for similar features.
+sidekiq-bulk requires Sidekiq 4+.
 
 ## Usage
 
@@ -21,7 +21,7 @@ class ElasticIndexerWorker
 
   sidekiq_options bulk: true, bulk_size: 100
 
-  def perform(values)
+  def perform(*values)
     # Perform work with the array of values
   end
 end
@@ -46,6 +46,8 @@ the worker instance will receive these values as a single argument
 ]
 ```
 
+Every time polling happens, `sidekiq-paquet` will try to process all your workers marked for bulk. If you want to limit the time between two polling per worker, you can pass the `bulk_minimum_interval` option to sidekiq options.
+
 ## Configuration
 
 You can change global configuration by modifying the `Sidekiq::Paquet.options` hash.

data/lib/sidekiq/paquet/batch.rb

@@ -8,19 +8,22 @@ module Sidekiq
 
         Sidekiq.redis do |conn|
           conn.multi do
-            conn.sadd('bulks'.freeze, worker_name)
+            conn.zadd('bulks'.freeze, 0, worker_name, nx: true)
             conn.rpush("bulk:#{worker_name}", Sidekiq.dump_json(args))
           end
         end
       end
 
       def self.enqueue_jobs
+        now = Time.now.to_f
         Sidekiq.redis do |conn|
-          workers = conn.smembers('bulks'.freeze)
+          workers = conn.zrangebyscore('bulks'.freeze, '-inf', now)
 
           workers.each do |worker|
             klass = worker.constantize
             opts  = klass.get_sidekiq_options
+            min_interval = opts['bulk_minimum_interval'.freeze]
+
             items = conn.lrange("bulk:#{worker}", 0, -1)
             items.map! { |i| Sidekiq.load_json(i) }
 
@@ -33,6 +36,7 @@ module Sidekiq
             end
 
             conn.ltrim("bulk:#{worker}", items.size, -1)
+            conn.zadd('bulks'.freeze, now + min_interval, worker) if min_interval
           end
         end
       end

data/lib/sidekiq/paquet/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Paquet
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-paquet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ccocchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -107,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bulk processing for sidekiq 4+
 test_files: []
-has_rdoc: