services 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a69a25c27cff265025953ddd3dfaa6f04a4f7e
-  data.tar.gz: fd175797287181892a619c61dd195d1062919ad4
+  metadata.gz: 4d7c52da2120ba9940e89e59ba51357dc635bd6e
+  data.tar.gz: 1648ad214dec51e86f96c171d6923f5645a8de61
 SHA512:
-  metadata.gz: 1bb62070e8e679707ab12e04590a80a90e61895f02f2aca643248040f57d60257de7e29bc34dc306f89382f2fbf46c5e918a4e0055a52948f4e8a517c0bfe68c
-  data.tar.gz: 772463884aa0a6ddd64bd5ab83fa311c9881bd4e8156a5fb61253a4ed2c3d0529d5570d842ea99327a92d7adbc42e3f23239d6b05707fe200b8fdccad6a4de87
+  metadata.gz: edd8efa7089b8d5b9b0f2d825ec613079b1dd96729fc0630deed1e6a158f1d4a60aeea39112f6a596deac973ea87d280a2173e1810b1b1d512c88c84714e79f6
+  data.tar.gz: d3e2d308aff905357e9bf597f049b569a562a57eb00636a11a2e2baaa626190babd580936ef99b53152406599ab68026f97268f5242d9edb631db6fad9253752

data/lib/services/modules/uniqueness_checker.rb

@@ -37,7 +37,7 @@ module Services
               raise_non_unique_error
             else
               error_count += 1
-              self.class.perform_in retry_delay(error_count), @service_args
+              self.class.perform_in retry_delay(error_count), *@service_args
               Services.configuration.redis.setex error_count_key, retry_delay(error_count) + ONE_HOUR, error_count
               false
             end

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/spec/services/base_spec.rb

@@ -59,8 +59,8 @@ describe Services::Base do
   end
 
   context 'when executed asynchronously' do
-    it 'finds its own worker' do
-      3.times { OwnWorkerService.perform_async }
+    fit 'finds its own worker' do
+      2.times { OwnWorkerService.perform_async }
       jid = OwnWorkerService.perform_async
       own_worker_data = wait_for { Services.configuration.redis.get(jid) }
       own_worker_json = JSON.parse(own_worker_data)

data/spec/services/modules/uniqueness_checker_spec.rb

@@ -39,7 +39,7 @@ shared_examples 'checking the uniqueness properly' do
       if defined?(fail_args)
         3.times do
           fail_args.each do |fail_arg_group|
-            expect(service).to receive(:perform_in).with(an_instance_of(Fixnum), fail_arg_group + (['reschedule', false]))
+            expect(service).to receive(:perform_in).with(an_instance_of(Fixnum), *fail_arg_group, 'reschedule', false)
             service.call(*fail_arg_group, 'reschedule', false)
           end
         end

data/spec/support/helpers.rb

@@ -3,7 +3,7 @@ require 'sidekiq/api'
 ExpectedDataNotFoundError = Class.new(StandardError)
 
 def wait_for(&block)
-  10.tries on: ExpectedDataNotFoundError, delay: 0.1 do
+  20.tries on: ExpectedDataNotFoundError, delay: 0.2 do
     block.call or raise ExpectedDataNotFoundError
   end
 end

data/spec/support/test_services.rb

@@ -1,3 +1,7 @@
+# How long should the services sleep to ensure
+# that other services can be run in the meantime?
+SERVICE_SLEEP = 1 # seconds
+
 class Model
   attr_reader :id
 
@@ -67,14 +71,14 @@ end
 class UniqueService < Services::Base
   def call(on_error, sleep)
     check_uniqueness! on_error: on_error
-    sleep 0.5 if sleep
+    sleep SERVICE_SLEEP if sleep
   end
 end
 
 class UniqueWithCustomArgsService < Services::Base
   def call(uniqueness_arg1, uniqueness_arg2, ignore_arg, on_error, sleep)
     check_uniqueness! uniqueness_arg1, uniqueness_arg2, on_error: on_error
-    sleep 0.5 if sleep
+    sleep SERVICE_SLEEP if sleep
   end
 end
 
@@ -83,13 +87,13 @@ class UniqueMultipleService < Services::Base
     args.each do |arg|
       check_uniqueness! arg, on_error: on_error
     end
-    sleep 0.5 if sleep
+    sleep SERVICE_SLEEP if sleep
   end
 end
 
 class NonUniqueService < Services::Base
   def call(on_error, sleep)
-    sleep 0.5 if sleep
+    sleep SERVICE_SLEEP if sleep
   end
 end
 
@@ -100,7 +104,7 @@ class OwnWorkerService < Services::Base
     else
       Services.configuration.redis.set self.jid, own_worker.to_json
     end
-    sleep 0.5
+    sleep SERVICE_SLEEP
   end
 end
 
@@ -111,7 +115,7 @@ class SiblingWorkersService < Services::Base
     else
       Services.configuration.redis.set self.jid, sibling_workers.to_json
     end
-    sleep 0.5
+    sleep SERVICE_SLEEP
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake