sidekiq-uniq 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd844979290e9e9026c43792d00b64efeb01a57
-  data.tar.gz: a63b235c7f9e447b14520c329681a2fee401f7e0
+  metadata.gz: e977a80b75335fa9eca79ea280b004aca7ddac32
+  data.tar.gz: 806236848f432f74c3a56cdf19f75fa18ea75d52
 SHA512:
-  metadata.gz: 57d56ee2f997d7a03e75c01d817b50c0d154fe1c1e7b125cc3ea74d4eff38ee6c5b806b6cc4e569de9cf7219a492ed3299402249b4da303dd34f75f4562701e0
-  data.tar.gz: 8b31a37e790764ad25b480ea76810a8cf01f8e712b2ff47e83288f0250d2ff7797de7feeaae13f15f66de7d388c3dc06afecebf869c843a686e6c75d73858cfe
+  metadata.gz: 017099270082b6055b7be2f12af8f487b0d897e9e1a1e4281d001479a9ff5c3c7cc36b8089a9e7d09f02790669ff422746be1462ea971bd4074fe422fdeadf68
+  data.tar.gz: 68407f0eba98242888c7a6497d29aeb00aaface0857dc9e2953248c0755eb203a0bdff5ab0df7fd55f92db3b87d51a6f4267e270adc5dee74f0d2f473e787a11

data/lib/sidekiq/uniq/middleware.rb

@@ -1,15 +1,33 @@
+require 'sidekiq/uniq/status'
+
 module Sidekiq
   module Uniq
-    class Middleware
+
+    class ClientMiddleware
+
+      # Runs before job is added to queue
+
       def call(worker_class, msg, queue_name, redis_pool)
-        unless msg['unique'] === false
-          queue = Sidekiq::Queue.new(msg['queue'])
-          queue.each do |job|
-            return false if job.klass == msg['class'] && job.args === msg['args']
-          end
+        if msg['unique'] === false
+          yield
+        else
+          return false if Status.running_or_enqueued(msg, redis_pool)
+          Status.save_status(msg, :enqueued, redis_pool)
+          yield
         end
+      end
+    end
+
+    class ServerMiddleware
+    
+      # Runs before job is executed
+
+      def call(worker_class, msg, queue_name)
+        Status.save_status(msg, :running)
         yield
+        Status.save_status(msg, :completed)
       end
     end
+
   end
 end

data/lib/sidekiq/uniq/railtie.rb

@@ -7,13 +7,13 @@ module Sidekiq
 
         Sidekiq.configure_server do |config|
           config.client_middleware do |chain|
-            chain.add Sidekiq::Uniq::Middleware
+            chain.add Sidekiq::Uniq::ServerMiddleware
           end
         end
 
         Sidekiq.configure_client do |config|
           config.client_middleware do |chain|
-            chain.add Sidekiq::Uniq::Middleware
+            chain.add Sidekiq::Uniq::ClientMiddleware
           end
         end
 

data/lib/sidekiq/uniq/status.rb

@@ -0,0 +1,57 @@
+module Sidekiq
+  module Uniq
+    class Status
+      KEY = 'sidekiq_uniq_job'
+      
+      def self.expiration
+        @expiration ||= 60 * 30
+      end
+
+      def self.expiration=(seconds)
+        @expiration = seconds
+      end
+
+      def self.key(msg)
+        KEY + ':' + Digest::MD5.hexdigest(msg[:class].to_s + ':' + msg[:args].inspect)
+      end
+
+      def self.save_status(msg, status, redis = nil)
+        Status.redis(redis) do |conn|
+          key = Status.key(msg)
+          conn.multi do
+            conn.set key, status.to_s
+            conn.expire key, Status.expiration
+          end
+        end
+      end
+
+      def self.running_or_enqueued(msg, redis = nil)
+        status = ''
+        Status.redis(redis) do |conn|
+          status = conn.get(Status.key(msg)).to_s
+        end
+        status === 'running' || status === 'enqueued'
+      end
+
+      def self.clear(redis = nil)
+        Status.redis(redis) do |conn|
+          keys = conn.keys "#{KEY}*"
+          keys.each{ |key| conn.del(key) }
+        end
+      end
+
+      def self.redis(redis = nil)
+        if redis
+          redis.with do |conn|
+            yield conn
+          end
+        else
+          Sidekiq.redis do |conn|
+            yield conn
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/sidekiq/uniq/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Uniq
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/sidekiq-uniq.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "sidekiq", "~> 3.5.1"
+  spec.add_dependency "sidekiq-status", "~> 0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-uniq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Caio SBA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.5.1
+- !ruby/object:Gem::Dependency
+  name: sidekiq-status
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: This is a Sidekiq extension that doesn't allow a job to be enqueued if
   it's already in the queue
 email:
@@ -71,8 +85,10 @@ files:
 - lib/sidekiq/uniq.rb
 - lib/sidekiq/uniq/middleware.rb
 - lib/sidekiq/uniq/railtie.rb
+- lib/sidekiq/uniq/status.rb
 - lib/sidekiq/uniq/version.rb
 - sidekiq-uniq-0.1.0.gem
+- sidekiq-uniq-0.2.0.gem
 - sidekiq-uniq.gemspec
 homepage: https://github.com/caiosba/sidekiq-uniq
 licenses: