resque_solo 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90a8227c24d8deeb0fba498f2cadeacefe4b61ef
-  data.tar.gz: fc44bea97f1765639572218b2249ec63cc9c6812
+SHA256:
+  metadata.gz: 42df791660a5f4108b5832348ac269e28fbb6d112133083dd9cb4d69ca42e14a
+  data.tar.gz: 7e6736901c21f62746df7546feaa03fb859171ff059bf86f2471300a5473fadf
 SHA512:
-  metadata.gz: 7b687be320d795f79cfc8d7f23f6973fca2b7e4b9a45126098adc4d37826ae5ac3670b886ddbdece53aa06328473de170e55dbae6aa094dcd7620acd5b24f33d
-  data.tar.gz: 00465321bf6afaf929d15d8d6209c6cf98eee79af2f6d78b6814f5967bf8807b7ca30e0dadbc331b01ad2ae9a5c1fa389207a6ff36fa2c00b8cc1abb9d244a3c
+  metadata.gz: be28624643d67f66db4b6a24a162f141fc15435f9091f94e80a3e6b8849f05362e2ccd3a7f42c0226aade67818ce61031caabc3ad84fab7cf8b2e23db81af0cb
+  data.tar.gz: a295e26d4324f067d9798451fd466c07c0e0f9f29b5449af799b0b163f56d755823fea3432035c743a412b5718898dde490610045e96707b64f57505aadc0695

data/README.md

@@ -10,7 +10,7 @@ ResqueSolo is a resque plugin to add unique jobs to resque.
 
 It is a re-write of [resque-loner](https://github.com/jayniz/resque-loner).
 
-It requires resque 1.25 and works with ruby 2.0 and later.
+It requires resque 1.25 or greater and works with ruby 2.3 and later.
 
 It removes the dependency on `Resque::Helpers`, which is deprecated for resque 2.0.
 
@@ -19,7 +19,14 @@ It removes the dependency on `Resque::Helpers`, which is deprecated for resque 2
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'resque_solo'
+gem "resque_solo"
+```
+
+To use with resque 2.0.0, which is unreleased as of 2018/7/24:
+
+```ruby
+gem "resque", git: "https://github.com/resque/resque"
+gem "resque_solo"
 ```
 
 ## Usage
@@ -39,11 +46,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 +71,33 @@ 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
+```
+
+## Development
+
+Clone this repository, then:
+
+Run tests with resque 1.x locally:
+
+```sh
+bundle
+bundle exec rake test
+```
+
+Test supported versions of resque locally:
+
+```sh
+appraisal install
+appraisal rake test
+```

data/lib/resque_ext/job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resque
   class Job
     class << self

data/lib/resque_ext/resque.rb

@@ -1,5 +1,26 @@
+# frozen_string_literal: true
+
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ResqueSolo
   class Queue
     class << self
@@ -60,8 +62,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/unique_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "digest/md5"
 
 module Resque

data/lib/resque_solo/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ResqueSolo
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/resque_solo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "resque"
 require "resque_ext/job"
 require "resque_ext/resque"

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 1.25.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,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 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -115,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Resque plugin to add unique jobs