services 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d7c52da2120ba9940e89e59ba51357dc635bd6e
-  data.tar.gz: 1648ad214dec51e86f96c171d6923f5645a8de61
+  metadata.gz: 2549878c0cdbb49f9e5ed0b5b8b795ec5c4a1bf6
+  data.tar.gz: c32abadba2f5a9d27e6940d4a4f1a2aebdbc7b99
 SHA512:
-  metadata.gz: edd8efa7089b8d5b9b0f2d825ec613079b1dd96729fc0630deed1e6a158f1d4a60aeea39112f6a596deac973ea87d280a2173e1810b1b1d512c88c84714e79f6
-  data.tar.gz: d3e2d308aff905357e9bf597f049b569a562a57eb00636a11a2e2baaa626190babd580936ef99b53152406599ab68026f97268f5242d9edb631db6fad9253752
+  metadata.gz: c8c21c50735329243d5f52fcfd450eef1c001d051e419a93bd961f11c3f81b1323f0a0024bf3ca93f37c030cee34c6c0e55961eb39074d8b626ef9714334f04b
+  data.tar.gz: e7d70bf7fcf64d3824bf682a8d0a4dfa89d3d6f8f5e6200fc539d1572f48fd47f43f6a8145122d9c568fcc268d7fee2472ee649a9331b7b9ea326046e9ae4efc

data/lib/services/base.rb

@@ -29,7 +29,7 @@ module Services
       ids_or_objects = Array(ids_or_objects)
       ids, objects = ids_or_objects.grep(Fixnum), ids_or_objects.grep(klass)
       if ids.size + objects.size < ids_or_objects.size
-        raise "All params must be either #{klass.to_s.pluralize} or Fixnums: #{ids_or_objects.map(&:class)}"
+        raise "All params must be either #{klass.to_s.pluralize} or Fixnums: #{ids_or_objects.map { |id_or_object| [id_or_object.class, id_or_object.inspect].join(' - ')}}"
       end
       if ids.any?
         find_service = "Services::#{klass.to_s.pluralize}::Find"

data/lib/services/version.rb

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

data/spec/services/base_spec.rb

@@ -59,8 +59,8 @@ describe Services::Base do
   end
 
   context 'when executed asynchronously' do
-    fit 'finds its own worker' do
-      2.times { OwnWorkerService.perform_async }
+    it 'finds its own worker' do
+      3.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

@@ -68,9 +68,9 @@ describe Services::Base::UniquenessChecker do
   context 'when the service checks for uniqueness with custom args' do
     it_behaves_like 'checking the uniqueness properly' do
       let(:service)          { UniqueWithCustomArgsService }
-      let(:args)             { %w(foo bar baz) }
-      let(:fail_args)        { [%w(foo bar pelle)] }
-      let(:pass_args)        { [%w(foo baz pelle)] }
+      let(:args)             { ['foo', 1, 'bar'] }
+      let(:fail_args)        { [['foo', 1, 'pelle']] }
+      let(:pass_args)        { [['foo', 2, 'bar']] }
       let(:keys_after_start) { 1 }
     end
   end
@@ -78,7 +78,7 @@ describe Services::Base::UniquenessChecker do
   context 'when the service checks for uniqueness multiple times' do
     it_behaves_like 'checking the uniqueness properly' do
       let(:service)          { UniqueMultipleService }
-      let(:args)             { %w(foo bar baz) }
+      let(:args)             { ['foo', 1, true] }
       let(:fail_args)        { args.map { |arg| [arg] } }
       let(:pass_args)        { [%w(pelle)] }
       let(:keys_after_start) { 3 }

data/spec/spec_helper.rb

@@ -69,6 +69,12 @@ RSpec.configure do |config|
 
     # Copy call proxy
     FileUtils.cp CALL_PROXY_SOURCE, CALL_PROXY_DESTINATION
+
+    # Wait until Redis and Sidekiq are started
+    while !File.exist?(sidekiq_pidfile) || !File.exist?(redis_pidfile)
+      puts 'Waiting for Sidekiq and Redis to start...'
+      sleep 0.5
+    end
   end
 
   config.after :suite do
@@ -79,7 +85,7 @@ RSpec.configure do |config|
     system "bundle exec sidekiqctl stop #{sidekiq_pidfile} #{sidekiq_timeout}"
     while File.exist?(sidekiq_pidfile)
       puts 'Waiting for Sidekiq to shut down...'
-      sleep 1
+      sleep 0.5
     end
 
     unless ENV['TRAVIS']
@@ -88,7 +94,7 @@ RSpec.configure do |config|
       system "#{redis_cli} -p #{redis_port} shutdown"
       while File.exist?(redis_pidfile)
         puts 'Waiting for Redis to shut down...'
-        sleep 1
+        sleep 0.5
       end
     end
 
@@ -98,6 +104,10 @@ RSpec.configure do |config|
       File.truncate file, max_len if File.size(file) > max_len
     end
   end
+
+  config.after :each do
+    wait_for_all_jobs_to_finish
+  end
 end
 
 def options_hash_to_string(options)

data/spec/support/helpers.rb

@@ -3,7 +3,7 @@ require 'sidekiq/api'
 ExpectedDataNotFoundError = Class.new(StandardError)
 
 def wait_for(&block)
-  20.tries on: ExpectedDataNotFoundError, delay: 0.2 do
+  50.tries on: ExpectedDataNotFoundError, delay: 0.1 do
     block.call or raise ExpectedDataNotFoundError
   end
 end
@@ -14,6 +14,12 @@ def worker_with_jid(jid)
   end
 end
 
+def wait_for_all_jobs_to_finish
+  wait_for do
+    Sidekiq::Workers.new.size == 0
+  end
+end
+
 def wait_for_job_to_run(job_class, *args, &block)
   job_class.perform_async(*args).tap do |jid|
     wait_for { worker_with_jid(jid) }

data/spec/support/test_services.rb

@@ -1,7 +1,3 @@
-# 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
 
@@ -71,14 +67,14 @@ end
 class UniqueService < Services::Base
   def call(on_error, sleep)
     check_uniqueness! on_error: on_error
-    sleep SERVICE_SLEEP if sleep
+    sleep 0.5 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 SERVICE_SLEEP if sleep
+    sleep 0.5 if sleep
   end
 end
 
@@ -87,13 +83,13 @@ class UniqueMultipleService < Services::Base
     args.each do |arg|
       check_uniqueness! arg, on_error: on_error
     end
-    sleep SERVICE_SLEEP if sleep
+    sleep 0.5 if sleep
   end
 end
 
 class NonUniqueService < Services::Base
   def call(on_error, sleep)
-    sleep SERVICE_SLEEP if sleep
+    sleep 0.5 if sleep
   end
 end
 
@@ -104,7 +100,7 @@ class OwnWorkerService < Services::Base
     else
       Services.configuration.redis.set self.jid, own_worker.to_json
     end
-    sleep SERVICE_SLEEP
+    sleep 0.5
   end
 end
 
@@ -115,7 +111,7 @@ class SiblingWorkersService < Services::Base
     else
       Services.configuration.redis.set self.jid, sibling_workers.to_json
     end
-    sleep SERVICE_SLEEP
+    sleep 0.5
   end
 end
 

metadata

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