sidekiq-superworker 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53beee36ab3ca54954950636adfc11d3e5d6c8e5
-  data.tar.gz: 168d1b43b60f7085b1cb5f3185208d88c94effbd
+  metadata.gz: a30dd0e4575bf141b1aa0c262df3d08fb21a7745
+  data.tar.gz: a6ca0500b339d3c5f75400c9efb58bfbacab5bfe
 SHA512:
-  metadata.gz: f9606cbc54a87383c448ab89ba308df8ca4713caa92920a8d9cb4365c7ede28447ba811e5eced133310b8e32b613ff5f3a56afc51e10cc284141ae2f08cdf218
-  data.tar.gz: f2b6beafee29aec0ed97ecf22f334697ea7c235d2886cbd3c95f668e2a8e009303b617a204082b64777fd171ee668700ac32b3cb44fc8cc16518d1466c5d6ffb
+  metadata.gz: 7bb2bc65a5e482cfec52dd8d23a1df3209bb9688d79449e573857076cc2442e5ef17a7769813b437cf4af3d42f4a6057f207b254b604ce16dbc2db41ceb19ecd
+  data.tar.gz: a2d9bff3ed22aa146080cb180acc007aaae88261af333b399cf56f8129d467cd9304e15d8449218949072ea69d542c573c749e6d783c259afa9572e97095f8cd

data/README.md

@@ -129,7 +129,7 @@ end
 
 #### Delete subjobs after their superjob completes
 
-When a superjob is queued, records for all of its subjobs are created. By default these records are deleted when the superjob finished. This can be changed by setting the following option to false:
+When a superjob is queued, records for all of its subjobs are created. By default, these records are deleted after the superjob completes. This can be changed by setting the following option to false:
 
 ```ruby
 # config/initializers/superworker.rb
@@ -179,7 +179,7 @@ end
 MyBatchSuperworker.perform_async([10, 11, 12], [20, 21, 22])
 ```
 
-The above produces the a sequence equivalent to this (the workers run serially):
+The above produces a sequence equivalent to this (the workers run serially):
 
 ```ruby
 Worker1.new.perform(10, 20)
@@ -210,16 +210,22 @@ If a subjob encounters an exception, the subjobs that depend on it won't run, bu
 
 If sidekiq_monitor is being used, the exception will be bubbled up to the superjob, which lets you easily see when your superjobs have failed.
 
-Upgrading to 1.x
-----------------
+Upgrade Notes
+-------------
+
+### Upgrading from 1.0.x to 1.1.x while using Sidekiq Monitor
+
+If you're using Sidekiq Monitor, were previously using Sidekiq Superworker 1.0.x, and are upgrading to 1.1.x, you should be aware that the strategy for storing subjob IDs has changed. Before upgrading, you should let all of your superworkers finish, then upgrade, then resume running your superworkers. For superjobs that ran before the upgrade, the relationship between superjobs and subjobs will no longer be shown in some parts of the UI. If you're not using Sidekiq Monitor, you can upgrade without any interruption.
+
+### Upgrading from 0.x to 1.x
 
 If you were previously using Sidekiq Superworker 0.x and are upgrading to 1.x, there are some changes to be aware of:
 
-### Redis replaced ActiveRecord
+#### Redis replaced ActiveRecord
 
 ActiveRecord was used as the datastore in 0.x due to application-specific requirements, but Redis is a far better choice for many reasons, especially given that Sidekiq uses Redis. When upgrading to 1.x, you'll need to let all of your superjobs complete, then upgrade to 1.x, then resume running superjobs. You can drop the 'sidekiq_superworker_subjobs' table, if you like.
 
-### Superworker.define replaced Superworker.create
+#### Superworker.define replaced Superworker.create
 
 The name of the `Superworker.create` method caused confusion, as some users would call it multiple times. Since it defines a class, it's been renamed to `Superworker.define`. You'll need to replace it accordingly.
 

data/lib/sidekiq/superworker/subjob.rb

@@ -42,7 +42,7 @@ module Sidekiq
 
         def find_by_superjob_jid(jid)
           keys = Sidekiq.redis do |conn|
-            conn.keys("#{redis_prefix}:#{jid}:*")
+            conn.smembers("#{redis_prefix}:#{jid}:subjob_keys")
           end
           keys.collect { |key| find_by_key(key) }
         end
@@ -57,15 +57,16 @@ module Sidekiq
 
         def keys
           Sidekiq.redis do |conn|
-            conn.keys("#{redis_prefix}:*")
+            keys = conn.keys("#{redis_prefix}:*:subjob_keys")
+            keys.collect { |key| conn.smembers(key) }.flatten
           end
         end
 
         def delete_subjobs_for(superjob_id)
           Sidekiq.redis do |conn|
-            key = self.jid(superjob_id, '*')
-            keys = conn.keys("#{redis_prefix}:#{key}")
+            keys = conn.smembers("#{redis_prefix}:#{superjob_id}:subjob_keys")
             conn.del(keys) if keys.any?
+            conn.del("#{redis_prefix}:#{superjob_id}:subjob_keys")
           end
         end
 
@@ -91,7 +92,10 @@ module Sidekiq
       def initialize(params={})
         if params.present?
           params.each do |attribute, value|
-            self.public_send("#{attribute}=", value)
+            public_send("#{attribute}=", value)
+          end
+          Sidekiq.redis do |conn|
+            conn.sadd("#{self.class.redis_prefix}:#{superjob_id}:subjob_keys", "#{self.class.redis_prefix}:#{superjob_id}:#{subjob_id}")
           end
         end
       end
@@ -105,12 +109,12 @@ module Sidekiq
       end
 
       def update_attributes(pairs = {})
-        pairs.each_pair { |attribute, value| send("#{attribute}=", value) }
+        pairs.each_pair { |attribute, value| public_send("#{attribute}=", value) }
         self.save
       end
 
       def update_attribute(attribute, value)
-        send("#{attribute.to_s}=", value)
+        public_send("#{attribute.to_s}=", value)
         return false unless self.valid?
         Sidekiq.redis do |conn|
           conn.hset(key, attribute.to_s, value.to_json)
@@ -155,7 +159,7 @@ module Sidekiq
       def to_param
         param = {}
         ATTRIBUTES.each do |attribute|
-          param["#{attribute.to_s}".to_sym] = send(attribute).to_json
+          param["#{attribute.to_s}".to_sym] = public_send(attribute).to_json
         end
         param
       end

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: Define dependency graphs of Sidekiq jobs
@@ -130,19 +130,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Define dependency graphs of Sidekiq jobs
 test_files: []
-has_rdoc: