Calculate worker's unique args when a proc or a symbol is specified

lib/sidekiq_unique_jobs/unique_args.rb

@@ -20,7 +20,7 @@ def initialize(job)
         @item = job
         @worker_class ||= worker_class_constantize(@item[CLASS_KEY])
         @item[UNIQUE_PREFIX_KEY] ||= unique_prefix
-        @item[UNIQUE_ARGS_KEY] ||= unique_args(@item[ARGS_KEY])
+        @item[UNIQUE_ARGS_KEY] = unique_args(@item[ARGS_KEY]) # SIC! Calculate unique_args unconditionally
         @item[UNIQUE_DIGEST_KEY] ||= unique_digest
       end
     end

spec/jobs/custom_queue_job_with_filter_method.rb

@@ -1,7 +1,7 @@
 class CustomQueueJobWithFilterMethod < CustomQueueJob
   sidekiq_options unique: :until_executed, unique_args: :args_filter
 
-  def self.args_filter(*args)
+  def self.args_filter(args)
     args.first
   end
 end

spec/jobs/custom_queue_job_with_filter_proc.rb

@@ -2,9 +2,9 @@ class CustomQueueJobWithFilterProc < CustomQueueJob
   # slightly contrived example of munging args to the
   # worker and removing a random bit.
   sidekiq_options unique: :until_timeout,
-                  unique_args: (lambda do |*args|
+                  unique_args: (lambda do |args|
                     options = args.extract_options!
-                    options.delete(:random)
-                    [args, options]
+                    options.delete('random')
+                    args + [options]
                   end)
 end

spec/lib/sidekiq_unique_jobs/unique_args_spec.rb

@@ -4,6 +4,49 @@
   let(:item) { { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue', 'args' => [[1, 2]] } }
   subject { described_class.new(item) }
 
+  describe '#unique_digest' do
+    let(:item) { item_options.merge('args' => [1, 2, 'type' => 'it'] ) }
+
+    shared_examples 'unique digest' do
+      context 'given another item' do
+        let(:another_subject) { described_class.new(another_item) }
+
+        context 'with the same unique args' do
+          let(:another_item) { item_options.merge('args' => [1, 2, 'type' => 'it']) }
+          it 'equals to unique_digest for that item' do
+            expect(subject.unique_digest).to eq(another_subject.unique_digest)
+          end
+        end
+
+        context 'with different unique args' do
+          let(:another_item) { item_options.merge('args' => [1, 3, 'type' => 'that']) }
+          it 'differs from unique_digest for that item' do
+            expect(subject.unique_digest).to_not eq(another_subject.unique_digest)
+          end
+        end
+      end
+    end
+
+    context 'when unique_args is a proc' do
+      let(:item_options) do
+        { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue',
+          'unique_args' => Proc.new { |args| args[1] } }
+      end
+
+
+      it_behaves_like 'unique digest'
+    end
+
+    context 'when unique_args is a symbol' do
+      let(:item_options) do
+        { 'class' => 'UniqueJobWithFilterMethod', 'queue' => 'myqueue',
+          'unique_args' => :filtered_args }
+      end
+
+      it_behaves_like 'unique digest'
+    end
+  end
+
   describe '#unique_args_enabled?' do
     with_default_worker_options(unique: :until_executed, unique_args: ->(args) { args[1]['test'] }) do
       with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args) do