sidekiq-unique-jobs 2.2.0 → 2.2.1

data/Gemfile

@@ -5,9 +5,16 @@ gem 'celluloid'
 gem 'slim'
 gem 'sprockets'
 gem 'sass'
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.8'
 gem 'sqlite3'
 
 group :test do
   gem 'simplecov', :require => false
+end
+
+group :development do
+  gem 'pry'
+  gem 'pry-doc'
+  gem 'pry-stack_explorer'
+  gem 'pry-debugger'
 end

data/lib/sidekiq-unique-jobs/middleware/client/unique_jobs.rb

@@ -23,8 +23,11 @@ module SidekiqUniqueJobs
               if conn.get(payload_hash)
                 conn.unwatch
               else
+                expires_at = HASH_KEY_EXPIRATION
+                expires_at = ((Time.at(item['at']) - Time.now.utc) * 24 * 60 * 60).to_i if item['at']
+
                 unique = conn.multi do
-                  conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
+                  conn.setex(payload_hash, expires_at, 1)
                 end
               end
             end

data/lib/sidekiq-unique-jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/test/helper.rb

@@ -3,7 +3,7 @@ if ENV.has_key?("SIMPLECOV")
   require 'simplecov'
   SimpleCov.start
 end
-
+require 'pry'
 require 'minitest/unit'
 require 'minitest/pride'
 require 'minitest/autorun'

data/test/lib/sidekiq/test_client.rb

@@ -1,6 +1,7 @@
 require 'helper'
 require 'sidekiq/worker'
 require "sidekiq-unique-jobs"
+require 'sidekiq/scheduled'
 
 class TestClient < MiniTest::Unit::TestCase
   describe 'with real redis' do
@@ -12,6 +13,8 @@ class TestClient < MiniTest::Unit::TestCase
     class QueueWorker
       include Sidekiq::Worker
       sidekiq_options :queue => 'customqueue'
+      def perform(x)
+      end
     end
 
     it 'does not push duplicate messages when configured for unique only' do
@@ -25,5 +28,24 @@ class TestClient < MiniTest::Unit::TestCase
       10.times { Sidekiq::Client.push('class' => QueueWorker, 'args' => [1, 2]) }
       assert_equal 10, Sidekiq.redis {|c| c.llen("queue:customqueue") }
     end
+
+    # TODO: If anyone know of a better way to check that the expiration for scheduled
+    # jobs are set around the same time as the scheduled job itself feel free to improve.
+    it 'expires the payload_hash when a scheduled job is scheduled at' do
+      require 'active_support/all'
+      QueueWorker.sidekiq_options :unique => true
+
+      at = 15.minutes.from_now
+      expected_expires_at = (Time.at(at) - Time.now.utc).to_f
+
+      QueueWorker.perform_in(at, 'mike')
+      payload_hash = Digest::MD5.hexdigest(Sidekiq.dump_json(['mike']))
+
+      # deconstruct this into a time format we can use to get a decent delta for
+      actual_expires_at = Sidekiq.redis {|c| c.ttl(payload_hash).to_f  / 24 / 60 / 60 }
+
+      assert_in_delta expected_expires_at, actual_expires_at, 0.05
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 901520156680191383
+      hash: -556960269690268684
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 901520156680191383
+      hash: -556960269690268684
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -179,3 +179,4 @@ summary: The unique jobs that were removed from sidekiq
 test_files:
 - test/helper.rb
 - test/lib/sidekiq/test_client.rb
+has_rdoc: