resque_solo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90a8227c24d8deeb0fba498f2cadeacefe4b61ef
-  data.tar.gz: fc44bea97f1765639572218b2249ec63cc9c6812
+SHA256:
+  metadata.gz: ca39b386ec04e2a0405fc05051deec8b5e5ae715b366ee5d05f2c84bb3e39176
+  data.tar.gz: 8bff1c8634116b623a65f12cbf783d0814356d0c349f44233cc841272bbd70c3
 SHA512:
-  metadata.gz: 7b687be320d795f79cfc8d7f23f6973fca2b7e4b9a45126098adc4d37826ae5ac3670b886ddbdece53aa06328473de170e55dbae6aa094dcd7620acd5b24f33d
-  data.tar.gz: 00465321bf6afaf929d15d8d6209c6cf98eee79af2f6d78b6814f5967bf8807b7ca30e0dadbc331b01ad2ae9a5c1fa389207a6ff36fa2c00b8cc1abb9d244a3c
+  metadata.gz: 4cfd41a2ed021f4e4a4bcd94f80b683086d29a28d20c00d914990ede0afcdb05c5cb8dfa0d93785de3a1aac506e14607386731a8aa34b4f54d940dd6adc3de9c
+  data.tar.gz: d5eb65fbed46481fc820f212f75774bd43f8b8cd4070146eb332e3b33b695a254c4c11a3cd4165d9fde3c6642d7f17ebab4ffc66fdc7743516991c0fd55a7d33

data/README.md

@@ -39,11 +39,11 @@ If you attempt to queue a unique job multiple times, it is ignored:
 
 ```
 Resque.enqueue UpdateCat, 1
-=> "OK"
+=> true
 Resque.enqueue UpdateCat, 1
-=> "EXISTED"
+=> nil
 Resque.enqueue UpdateCat, 1
-=> "EXISTED"
+=> nil
 Resque.size :cats
 => 1
 Resque.enqueued? UpdateCat, 1
@@ -64,3 +64,15 @@ The `lock_after_execution_period` setting can be used to delay when the unique j
 takes around 10 seconds, and you don't want to requeue another job until you are sure it is done,
 you could set `lock_after_execution_period = 20`. Or if you never want to run a long running
 job more than once per minute, set `lock_after_execution_period = 60`.
+
+```ruby
+class UpdateCat
+  include Resque::Plugins::UniqueJob
+  @queue = :cats
+  @lock_after_execution_period = 20
+
+  def self.perform(cat_id)
+    # do something
+  end
+end
+```

data/lib/resque_ext/resque.rb

@@ -1,5 +1,24 @@
 module Resque
   class << self
+    # Override
+    # https://github.com/resque/resque/blob/master/lib/resque.rb
+    def enqueue_to(queue, klass, *args)
+      # Perform before_enqueue hooks. Don't perform enqueue if any hook returns false
+      before_hooks = Plugin.before_enqueue_hooks(klass).collect do |hook|
+        klass.send(hook, *args)
+      end
+      return nil if before_hooks.any? { |result| result == false }
+
+      result = Job.create(queue, klass, *args)
+      return nil if result == "EXISTED"
+
+      Plugin.after_enqueue_hooks(klass).each do |hook|
+        klass.send(hook, *args)
+      end
+
+      true
+    end
+
     def enqueued?(klass, *args)
       enqueued_in?(queue_from_class(klass), klass, *args)
     end

data/lib/resque_solo/queue.rb

@@ -60,8 +60,12 @@ module ResqueSolo
       end
 
       def cleanup(queue)
-        keys = redis.keys("solo:queue:#{queue}:job:*")
-        redis.del(*keys) if keys.any?
+        cursor = "0"
+        loop do
+          cursor, keys = redis.scan(cursor, match: "solo:queue:#{queue}:job:*")
+          redis.del(*keys) if keys.any?
+          break if cursor.to_i.zero?
+        end
       end
 
       private

data/lib/resque_solo/version.rb

@@ -1,3 +1,3 @@
 module ResqueSolo
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
 description: Resque plugin to add unique jobs
 email:
 - tee@neighborland.com
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Resque plugin to add unique jobs