services 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2549878c0cdbb49f9e5ed0b5b8b795ec5c4a1bf6
-  data.tar.gz: c32abadba2f5a9d27e6940d4a4f1a2aebdbc7b99
+  metadata.gz: fa15ea76009e9ba974b7e3faf90a467368917660
+  data.tar.gz: 5c0dcc6db009e65fb210e9883feb604329d1bf5b
 SHA512:
-  metadata.gz: c8c21c50735329243d5f52fcfd450eef1c001d051e419a93bd961f11c3f81b1323f0a0024bf3ca93f37c030cee34c6c0e55961eb39074d8b626ef9714334f04b
-  data.tar.gz: e7d70bf7fcf64d3824bf682a8d0a4dfa89d3d6f8f5e6200fc539d1572f48fd47f43f6a8145122d9c568fcc268d7fee2472ee649a9331b7b9ea326046e9ae4efc
+  metadata.gz: d3684cdccaf566dae3c4f018127efe9d947692488ec30bb714c8ebaca9d134dd876750483b6794b4bc9b26a589966e0e533a455b98e4ac1bdcbb85fcb810c682
+  data.tar.gz: 5c98b4049291181ccd59abf71c6ade54a8aac194521ed5c2ad2c9e70380ee88930ebb94734138fea1496229491ee88d231c21401ecd46c4e0719f50f7f6356f5

data/lib/services/base.rb

@@ -25,7 +25,7 @@ module Services
 
     private
 
-    def find_objects(ids_or_objects, klass = determine_service_class)
+    def find_objects(ids_or_objects, klass = service_class)
       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
@@ -52,7 +52,7 @@ module Services
       end.first
     end
 
-    def determine_service_class
+    def service_class
       self.class.to_s[/Services::([^:]+)/, 1].singularize.constantize
     rescue
       raise "Could not determine service class from #{self.class}"

data/lib/services/modules/uniqueness_checker.rb

@@ -27,21 +27,19 @@ module Services
         raise "A uniqueness key with args #{@uniqueness_args.inspect} already exists." if @uniqueness_keys && @uniqueness_keys.include?(new_uniqueness_key)
         if @similar_service_id = Services.configuration.redis.get(new_uniqueness_key)
           case on_error.to_sym
-          when :ignore
-            false
           when :fail
             raise_non_unique_error
           when :reschedule
-            error_count = (Services.configuration.redis.get(error_count_key) || 0).to_i
-            if error_count >= MAX_RETRIES
+            @error_count = (Services.configuration.redis.get(error_count_key) || 0).to_i
+            if @error_count >= MAX_RETRIES
               raise_non_unique_error
             else
-              error_count += 1
-              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
+              @error_count += 1
+              reschedule
+              Services.configuration.redis.setex error_count_key, retry_delay + ONE_HOUR, @error_count
             end
           end
+          false
         else
           @uniqueness_keys ||= []
           @uniqueness_keys << new_uniqueness_key
@@ -66,6 +64,21 @@ module Services
         raise self.class::NotUniqueError, message
       end
 
+      def reschedule
+        # Convert service args to fixnums first
+        reschedule_args = @service_args.map do |arg|
+          case arg
+          when Fixnum, String, TrueClass, FalseClass, NilClass
+            arg
+          when service_class && arg.respond_to?(:id)
+            arg.id
+          else
+            raise "Don't know how to convert arg #{arg.inspect} for rescheduling."
+          end
+        end
+        self.class.perform_in retry_delay, *reschedule_args
+      end
+
       def uniqueness_key(args)
         [
           KEY_PREFIX,
@@ -85,8 +98,8 @@ module Services
         end.join(':')
       end
 
-      def retry_delay(error_count)
-        (error_count ** 3) + 5
+      def retry_delay
+        (@error_count ** 3) + 5
       end
     end
   end

data/lib/services/version.rb

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

data/spec/services/modules/uniqueness_checker_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 shared_examples 'checking the uniqueness properly' do
   it 'notices when the same job is executed multiple times' do
-    # Check that error is raised when on_error is "fail"
     wait_for_job_to_run_and_finish service, *args, 'fail', true do
+      # Check that error is raised when on_error is "fail"
       if defined?(fail_args)
         3.times do
           fail_args.each do |fail_arg_group|
@@ -40,57 +40,58 @@ shared_examples 'checking the uniqueness properly' do
         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)
-            service.call(*fail_arg_group, 'reschedule', false)
+            expect { service.call(*fail_arg_group, 'reschedule', false) }.to_not raise_error
           end
         end
       end
       if defined?(pass_args)
         3.times do
           pass_args.each do |pass_arg_group|
+            expect(service).to_not receive(:perform_in)
             expect { service.call(*pass_arg_group, 'reschedule', false) }.to_not raise_error
           end
         end
       end
     end
+
+    # Check that all Redis keys are deleted
+    key_pattern = "#{described_class::KEY_PREFIX}*"
+    expect(Services.configuration.redis.keys(key_pattern)).to be_empty
   end
 end
 
 describe Services::Base::UniquenessChecker do
   context 'when the service checks for uniqueness with the default args' do
     it_behaves_like 'checking the uniqueness properly' do
-      let(:service)          { UniqueService }
-      let(:args)             { [] }
-      let(:fail_args)        { [] }
-      let(:keys_after_start) { 1 }
+      let(:service)   { UniqueService }
+      let(:args)      { [] }
+      let(:fail_args) { [] }
     end
   end
 
   context 'when the service checks for uniqueness with custom args' do
     it_behaves_like 'checking the uniqueness properly' do
-      let(:service)          { UniqueWithCustomArgsService }
-      let(:args)             { ['foo', 1, 'bar'] }
-      let(:fail_args)        { [['foo', 1, 'pelle']] }
-      let(:pass_args)        { [['foo', 2, 'bar']] }
-      let(:keys_after_start) { 1 }
+      let(:service)   { UniqueWithCustomArgsService }
+      let(:args)      { ['foo', 1, 'bar'] }
+      let(:fail_args) { [['foo', 1, 'pelle']] }
+      let(:pass_args) { [['foo', 2, 'bar']] }
     end
   end
 
   context 'when the service checks for uniqueness multiple times' do
     it_behaves_like 'checking the uniqueness properly' do
-      let(:service)          { UniqueMultipleService }
-      let(:args)             { ['foo', 1, true] }
-      let(:fail_args)        { args.map { |arg| [arg] } }
-      let(:pass_args)        { [%w(pelle)] }
-      let(:keys_after_start) { 3 }
+      let(:service)   { UniqueMultipleService }
+      let(:args)      { ['foo', 1, true] }
+      let(:fail_args) { args.map { |arg| [arg] } }
+      let(:pass_args) { [%w(pelle)] }
     end
   end
 
   context 'when the service does not check for uniqueness' do
     it_behaves_like 'checking the uniqueness properly' do
-      let(:service)          { NonUniqueService }
-      let(:args)             { [] }
-      let(:pass_args)        { [] }
-      let(:keys_after_start) { 0 }
+      let(:service)   { NonUniqueService }
+      let(:args)      { [] }
+      let(:pass_args) { [] }
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ log_dir            = support_dir.join('log')
 
 CALL_PROXY_SOURCE      = support_dir.join('call_proxy.rb')
 CALL_PROXY_DESTINATION = PROJECT_ROOT.join('lib', 'services', 'call_proxy.rb')
+WAIT                   = 0.5
+START_TIMEOUT          = 5
+STOP_TIMEOUT           = 20
 
 Dir[support_dir.join('**', '*.rb')].each { |f| require f }
 
@@ -71,9 +74,18 @@ RSpec.configure do |config|
     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
+    @processes = {
+      'Sidekiq' => sidekiq_pidfile
+    }
+    @processes['Redis'] = redis_pidfile unless ENV['TRAVIS']
+    @processes.each do |process, pidfile|
+      i = 0
+      while !File.exist?(pidfile)
+        puts "Waiting for #{process} to start..."
+        sleep WAIT
+        i += WAIT
+        raise "#{process} didn't start in #{i} seconds." if i >= START_TIMEOUT
+      end
     end
   end
 
@@ -83,18 +95,20 @@ RSpec.configure do |config|
 
     # Stop Sidekiq
     system "bundle exec sidekiqctl stop #{sidekiq_pidfile} #{sidekiq_timeout}"
-    while File.exist?(sidekiq_pidfile)
-      puts 'Waiting for Sidekiq to shut down...'
-      sleep 0.5
-    end
 
     unless ENV['TRAVIS']
       # Stop Redis
       redis_cli = support_dir.join('redis-cli')
       system "#{redis_cli} -p #{redis_port} shutdown"
-      while File.exist?(redis_pidfile)
-        puts 'Waiting for Redis to shut down...'
-        sleep 0.5
+    end
+
+    @processes.each do |process, pidfile|
+      i = 0
+      while File.exist?(pidfile)
+        puts "Waiting for #{process} to stop..."
+        sleep WAIT
+        i += WAIT
+        raise "#{process} didn't stop in #{i} seconds." if i >= STOP_TIMEOUT
       end
     end
 

metadata

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