services 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbec960a41d81815da15861aa4e5abf3941cd46
-  data.tar.gz: 4e390c06247de93c8eb6e45050392566767a2903
+  metadata.gz: 7b3bc560efbbf48e28224e43a9b0c38a94c0e3e3
+  data.tar.gz: 139c86d2e85f88781eb1999fb80123a18c66e009
 SHA512:
-  metadata.gz: 998625c59ca525eb537f52d5317cff7d0ac8cb68f787bb1b46dbf16f33a00917eae854ee24e27763a13422e22b6b62a4e65bda26213e8a527f0d356a46e7adea
-  data.tar.gz: 73db3259b704dc5b18a3468561c634cfc84d71ffea2288df47523dd9eda51379ae498a96aa470751f2daffc85d5ee2dc5948d312888d10278aa9dfb9138832ec
+  metadata.gz: 48140e2d271a70fba7de535c1ce8249937e25013c02640265f877e3f6d9f2e8c81ed4288abfd30ba3eeecdce0a76b5a0a1e2e2191825f54038fc62591281650c
+  data.tar.gz: 94d5b1d545f3d3b72e1e343579f84452219f03ba6528380fbf8b9d635eaf944774ea127cd8f23dd67a116fef55a5d3972728e4afe35c847992ae59ac446e7fd6

data/lib/services/modules/uniqueness_checker.rb

@@ -15,13 +15,13 @@ module Services
           raise 'Could not find uniqueness args' unless defined?(@uniqueness_args)
           args = @uniqueness_args
         end
-        @uniqueness_keys ||= []
         new_uniqueness_key = uniqueness_key(args)
-        raise "A uniqueness key with args #{args.inspect} already exists." if @uniqueness_keys.include?(new_uniqueness_key)
-        @uniqueness_keys << new_uniqueness_key
         if similar_service_id = Services.configuration.redis.get(new_uniqueness_key)
           raise self.class::NotUniqueError, "Service #{self.class} with uniqueness args #{args} is not unique, a similar service is already running: #{similar_service_id}"
         else
+          @uniqueness_keys ||= []
+          raise "A uniqueness key with args #{args.inspect} already exists." if @uniqueness_keys.include?(new_uniqueness_key)
+          @uniqueness_keys << new_uniqueness_key
           Services.configuration.redis.setex new_uniqueness_key, 60 * 60, @id
         end
       end
@@ -30,7 +30,7 @@ module Services
         @uniqueness_args = args
         super
       ensure
-        Services.configuration.redis.del @uniqueness_keys if defined?(@uniqueness_keys)
+        Services.configuration.redis.del @uniqueness_keys unless @uniqueness_keys.nil? || @uniqueness_keys.empty?
       end
 
       private

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/spec/services/base_spec.rb

@@ -119,17 +119,21 @@ describe Services::Base do
 
   context 'checking for uniqueness' do
     context 'when the service checks for uniqueness with the default args' do
-      it 'raises an error when the same job is executed twice' do
+      it 'raises an error when the same job is executed multiple times' do
         wait_for_job_to_run UniqueService do
-          expect { UniqueService.call }.to raise_error(UniqueService::NotUniqueError)
+          3.times do
+            expect { UniqueService.call }.to raise_error(UniqueService::NotUniqueError)
+          end
         end
       end
     end
 
     context 'when the service checks for uniqueness with custom args' do
-      it 'raises an error when a job with the same custom args is executed twice' do
+      it 'raises an error when a job with the same custom args is executed multiple times' do
         wait_for_job_to_run UniqueWithCustomArgsService, 'foo', 'bar', 'baz' do
-          expect { UniqueWithCustomArgsService.call('foo', 'bar', 'pelle') }.to raise_error(UniqueWithCustomArgsService::NotUniqueError)
+          3.times do
+            expect { UniqueWithCustomArgsService.call('foo', 'bar', 'pelle') }.to raise_error(UniqueWithCustomArgsService::NotUniqueError)
+          end
           expect { UniqueWithCustomArgsService.call('foo', 'baz', 'pelle') }.to_not raise_error
         end
       end
@@ -141,7 +145,9 @@ describe Services::Base do
       it 'raises an error when one of the checks fails' do
         wait_for_job_to_run UniqueMultipleService, *args do
           args.each do |arg|
-            expect { UniqueMultipleService.call(arg) }.to raise_error(UniqueMultipleService::NotUniqueError)
+            3.times do
+              expect { UniqueMultipleService.call(arg) }.to raise_error(UniqueMultipleService::NotUniqueError)
+            end
           end
           expect { UniqueMultipleService.call('pelle') }.to_not raise_error
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Manuel Meurer