sidekiq-grouping 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df70f6272c6c489626dd612e2c736e5d1fbe2cad
-  data.tar.gz: 5a30ac65ae3e7a0b42d2b9633281990b8be84a86
+  metadata.gz: abbfc33064b0d62493579060635fbdd8449ab118
+  data.tar.gz: 62f8fb16d37730fb087c78e2ea9ecc9a45d9a42a
 SHA512:
-  metadata.gz: a60255525e80b8911bfb72aec1067d67af644449554fdd04e1d448464bdbdb3fc6186b31ea665d4fa17fb8a836b0d3962d45384edf90d7f2c6ca462f6c4fe84a
-  data.tar.gz: 9ca2e704dcffffcacd45178343e7e824e45073a422f1bdcd70cb2f651d7e3bbb870aa3729cd386bfc6ffb2e31b7f95b6e843831833c7a59eb8468e472a386a48
+  metadata.gz: f82b31c45dedc4dd5f9c4b73ff4269c78f1ac7e3c564b4064a09575db15eff8dbf938003061f27836a0528945a62b820b6859f230e4b38882a824f63a005ea39
+  data.tar.gz: c30f8345b87e05185f23e26febc766a3b0c857e0a905131dc9586935f8678108ebd3a569e5c5f8168ef225288a2c4834c2d86ca6a21ebd6b387f3eb8ed93ec86

data/README.md

@@ -11,6 +11,7 @@ Useful for:
 * Periodical batch updating of recently changing database counters.
 
 *NOTE:* As of 1.0 `batch_size` renamed to `batch_flush_size`.
+*NOTE:* As of 1.0.6 works with Sidekiq 4.
 
 ## Usage
 

data/lib/sidekiq/grouping/batch.rb

@@ -31,7 +31,7 @@ module Sidekiq
 
       def pluck_size
         worker_class_options['batch_flush_size'] ||
-          Sidekiq::Grouping::Config.max_batch_size
+          chunk_size
       end
 
       def pluck
@@ -87,9 +87,7 @@ module Sidekiq
       private
 
       def could_flush_on_overflow?
-        return true if size >= Sidekiq::Grouping::Config.max_batch_size
-        worker_class_options['batch_flush_size'] &&
-          size >= worker_class_options['batch_flush_size']
+        size >= pluck_size
       end
 
       def could_flush_on_time?
@@ -125,7 +123,7 @@ module Sidekiq
 
         def extract_worker_klass_and_queue(name)
           klass, queue = name.split(':')
-          [klass.classify, queue]
+          [klass.camelize, queue]
         end
       end
     end

data/lib/sidekiq/grouping/middleware.rb

@@ -2,12 +2,13 @@ module Sidekiq
   module Grouping
     class Middleware
       def call(worker_class, msg, queue, redis_pool = nil)
-        worker_class = worker_class.classify.constantize if worker_class.is_a?(String)
+        worker_class = worker_class.camelize.constantize if worker_class.is_a?(String)
         options = worker_class.get_sidekiq_options
 
         batch =
-          options.keys.include?('batch_flush_size') ||
-          options.keys.include?('batch_flush_interval')
+          options.key?('batch_flush_size') ||
+          options.key?('batch_flush_interval') ||
+          options.key?('batch_size')
 
         passthrough =
           msg['args'] &&

data/lib/sidekiq/grouping/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Grouping
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/lib/sidekiq/grouping/views/index.erb

@@ -26,6 +26,7 @@
           <td><%= batch.next_execution_time || "&ndash;"%></td>
           <td>
             <form action="<%= "#{root_path}grouping/#{batch.name}/delete" %>" method="post">
+              <%= csrf_tag %>
               <input class="btn btn-danger btn-xs" type="submit" name="delete" value="Delete" data-confirm="Are you sure you want to delete this batch?" />
             </form>
           </td>

data/lib/sidekiq/grouping/web.rb

@@ -1,6 +1,6 @@
 require 'sidekiq/web'
 
-module Sidetiq
+module Sidekiq
   module Grouping
     module Web
       VIEWS = File.expand_path('views', File.dirname(__FILE__))
@@ -11,8 +11,8 @@ module Sidetiq
           erb File.read(File.join(VIEWS, 'index.erb')), locals: {view_path: VIEWS}
         end
 
-        app.post "/grouping/:name/delete" do
-          worker_class, queue = Sidekiq::Grouping::Batch.extract_worker_klass_and_queue(params['name'])
+        app.post "/grouping/*/delete" do |name|
+          worker_class, queue = Sidekiq::Grouping::Batch.extract_worker_klass_and_queue(name)
           batch = Sidekiq::Grouping::Batch.new(worker_class, queue)
           batch.delete
           redirect "#{root_path}/grouping"
@@ -23,6 +23,6 @@ module Sidetiq
   end
 end
 
-Sidekiq::Web.register(Sidetiq::Grouping::Web)
+Sidekiq::Web.register(Sidekiq::Grouping::Web)
 Sidekiq::Web.tabs["Grouping"] = "grouping"
 

data/sidekiq-grouping.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "rspec-sidekiq"
-  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "timecop"
 
-  spec.add_dependency "sidekiq"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "sidekiq", ">= 3.4.2"
   spec.add_dependency "concurrent-ruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-grouping
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Victor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement