services 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c148465c5f9136b280c87824fb53878b9e17e05d
-  data.tar.gz: 3fd963a4ec9b77e26a2cd2c0bacfe9e1f7924ecd
+  metadata.gz: 81eb2b7ac07028e41e889899270a9c0144f91443
+  data.tar.gz: 1464d7a79faba0c979904f3620770c791fbbcca3
 SHA512:
-  metadata.gz: d963a730efde270e4137e45f08465a127f27a15581a4c8cc26401ae1b0101bc19737097200502b57004b73fc4b4e8fce3a5b4b15e0347d88e1bab339155ee3f0
-  data.tar.gz: 23fc5b5174f0ecf0ec261b35fcb886f67907a506f755fc7fb13c10a93f74aede3eec0005eca608ef0e7fada73342a02ae08f9bc44825aa630d789ee7a90ad0ac
+  metadata.gz: 79a292567b259d7bbc5781752da14923376dd005f01cf31eb81a6a7c6fe37d8f978c1a369c4588e622c65a2d329bac1e0f1f52a28e13560864c9061e44289374
+  data.tar.gz: 6b5f428b5b1acc15a6f35437cbb52bf6c36009ba1866fb8956b308fb130e5466fc77af9ac016e13ba99eb6fb2f68a9b01efeee6e92570a033eb311947b2cee1d

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
 services:
   - redis-server

data/lib/services/asyncable.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 
 begin
   require 'sidekiq'
+  require 'sidekiq/api'
 rescue LoadError
   raise Services::BackgroundProcessorNotFound
 end
@@ -58,17 +59,17 @@ module Services
       @own_worker = if self.jid.nil?
         nil
       else
-        own_worker = Sidekiq::Workers.new.detect do |_, work, _|
+        own_worker = Sidekiq::Workers.new.detect do |_, _, work|
           work['payload']['jid'] == self.jid
         end
-        raise self.class::Error, "Could not find own worker with jid #{self.jid}: #{Sidekiq::Workers.new.map{ |*args| args }}" if own_worker.nil?
+        raise self.class::Error, "Could not find own worker with jid #{self.jid}: #{Sidekiq::Workers.new.map { |*args| args }}" if own_worker.nil?
         own_worker
       end
     end
 
     def sibling_workers
-      @sibling_workers ||= Sidekiq::Workers.new.select do |_, work, _|
-        work['payload']['class'] == self.class.to_s && (own_worker.nil? || work['payload']['jid'] != own_worker[1]['payload']['jid'])
+      @sibling_workers ||= Sidekiq::Workers.new.select do |_, _, work|
+        work['payload']['class'] == self.class.to_s && (own_worker.nil? || work['payload']['jid'] != own_worker[2]['payload']['jid'])
       end
     end
   end

data/lib/services/base.rb

@@ -1,4 +1,3 @@
-require 'nesty'
 require 'securerandom'
 require 'action_dispatch'
 require 'digest'
@@ -7,10 +6,10 @@ module Services
   class Base
     class << self
       def inherited(subclass)
-        subclass.const_set :Error, Class.new(Nesty::NestedStandardError)
+        subclass.const_set :Error, Class.new(StandardError)
         subclass.send :include, Rails.application.routes.url_helpers if defined?(Rails)
         subclass.send :include, Asyncable if defined?(Asyncable)
-        subclass.send :prepend, CallLogger, ExceptionWrapper, UniquenessChecker
+        subclass.send :prepend, CallLogger, UniquenessChecker
       end
 
       delegate :call, to: :new

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.1.2'
+  VERSION = '0.1.7'
 end

data/services.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.email         = 'manuel@krautcomputing.com'
   gem.summary       = ''
   gem.description   = ''
-  gem.homepage      = ''
+  gem.homepage      = 'http://krautcomputing.github.io/services'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
@@ -23,10 +23,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'guard-rspec', '~> 4.2'
-  gem.add_development_dependency 'rspec', '>= 3.0.0.rc1', '< 4'
+  gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'sidekiq', '~> 3.0'
   gem.add_development_dependency 'redis', '~> 3.0'
+  gem.add_development_dependency 'tries', '~> 0.3'
   gem.add_runtime_dependency 'rails', '>= 3.0.0'
-  gem.add_runtime_dependency 'gem_config', '~> 0.3.1'
-  gem.add_runtime_dependency 'nesty', '~> 1.0.2'
+  gem.add_runtime_dependency 'gem_config', '~> 0.3'
 end

data/spec/services/base_spec.rb

@@ -1,64 +1,66 @@
 require 'spec_helper'
 
 describe Services::Base do
-  context 'wrapping exceptions' do
-    it 'does not wrap service errors or subclasses' do
-      class ServiceWithError < Services::Base
-        def call
-          raise Error.new('I am a service error.', nil)
+  class ServiceWithError < Services::Base
+    def call
+      raise Error.new('I am a service error.')
+    end
+  end
+  if ServiceWithError::Error.new.respond_to?(:cause)
+    context 'wrapping exceptions' do
+      it 'does not wrap service errors or subclasses' do
+        expect do
+          ServiceWithError.call
+        end.to raise_error do |error|
+          expect(error).to be_a(ServiceWithError::Error)
+          expect(error.message).to eq('I am a service error.')
+          expect(error.cause).to be_nil
         end
-      end
-      expect do
-        ServiceWithError.call
-      end.to raise_error do |error|
-        expect(error).to be_a(ServiceWithError::Error)
-        expect(error.message).to eq('I am a service error.')
-        expect(error.nested).to be_nil
-      end
 
-      class ServiceWithCustomError < Services::Base
-        CustomError = Class.new(self::Error)
-        def call
-          raise CustomError.new('I am a custom error.', nil)
+        class ServiceWithCustomError < Services::Base
+          CustomError = Class.new(self::Error)
+          def call
+            raise CustomError.new('I am a custom error.')
+          end
+        end
+        expect do
+          ServiceWithCustomError.call
+        end.to raise_error do |error|
+          expect(error).to be_a(ServiceWithCustomError::CustomError)
+          expect(error.message).to eq('I am a custom error.')
+          expect(error.cause).to be_nil
         end
       end
-      expect do
-        ServiceWithCustomError.call
-      end.to raise_error do |error|
-        expect(error).to be_a(ServiceWithCustomError::CustomError)
-        expect(error.message).to eq('I am a custom error.')
-        expect(error.nested).to be_nil
-      end
-    end
 
-    it 'wraps all other exceptions' do
-      class ServiceWithStandardError < Services::Base
-        def call
-          raise 'I am a StandardError.'
+      it 'wraps all other exceptions' do
+        class ServiceWithStandardError < Services::Base
+          def call
+            raise 'I am a StandardError.'
+          end
+        end
+        expect do
+          ServiceWithStandardError.call
+        end.to raise_error do |error|
+          expect(error).to be_a(ServiceWithStandardError::Error)
+          expect(error.message).to eq('I am a StandardError.')
+          expect(error.cause).to be_a(StandardError)
+          expect(error.cause.message).to eq('I am a StandardError.')
         end
-      end
-      expect do
-        ServiceWithStandardError.call
-      end.to raise_error do |error|
-        expect(error).to be_a(ServiceWithStandardError::Error)
-        expect(error.message).to eq('I am a StandardError.')
-        expect(error.nested).to be_a(StandardError)
-        expect(error.nested.message).to eq('I am a StandardError.')
-      end
 
-      class ServiceWithCustomStandardError < Services::Base
-        CustomStandardError = Class.new(StandardError)
-        def call
-          raise CustomStandardError, 'I am a custom StandardError.'
+        class ServiceWithCustomStandardError < Services::Base
+          CustomStandardError = Class.new(StandardError)
+          def call
+            raise CustomStandardError, 'I am a custom StandardError.'
+          end
+        end
+        expect do
+          ServiceWithCustomStandardError.call
+        end.to raise_error do |error|
+          expect(error).to be_a(ServiceWithCustomStandardError::Error)
+          expect(error.message).to eq('I am a custom StandardError.')
+          expect(error.cause).to be_a(ServiceWithCustomStandardError::CustomStandardError)
+          expect(error.cause.message).to eq('I am a custom StandardError.')
         end
-      end
-      expect do
-        ServiceWithCustomStandardError.call
-      end.to raise_error do |error|
-        expect(error).to be_a(ServiceWithCustomStandardError::Error)
-        expect(error.message).to eq('I am a custom StandardError.')
-        expect(error.nested).to be_a(ServiceWithCustomStandardError::CustomStandardError)
-        expect(error.nested.message).to eq('I am a custom StandardError.')
       end
     end
   end
@@ -66,8 +68,7 @@ describe Services::Base do
   context 'checking for uniqueness' do
     context 'when the service was set to check for uniqueness' do
       it 'raises an error when the same job is executed twice' do
-        UniqueService.perform_async
-        sleep 0.5 # Wait for Sidekiq to start processing the job
+        wait_for_job_to_run UniqueService.perform_async
         expect do
           UniqueService.call
         end.to raise_error(UniqueService::NotUniqueError)
@@ -76,12 +77,37 @@ describe Services::Base do
 
     context 'when the service was not set to check for uniqueness' do
       it 'does not raise an error when the same job is executed twice' do
-        NonUniqueService.perform_async
-        sleep 0.5 # Wait for Sidekiq to start processing the job
+        wait_for_job_to_run NonUniqueService.perform_async
         expect do
           NonUniqueService.call
         end.to_not raise_error
       end
     end
   end
+
+  context 'when executed asynchronously' do
+    it 'finds its own worker' do
+      3.times do
+        OwnWorkerService.perform_async
+      end
+      jid = OwnWorkerService.perform_async
+      own_worker_data = wait_for { Services.configuration.redis.get(jid) }
+      own_worker_json = JSON.parse(own_worker_data)
+      expect(own_worker_json[2]['payload']['jid']).to eq(jid)
+    end
+
+    it 'finds its sibling workers' do
+      sibling_worker_jids = (1..3).map do
+        SiblingWorkersService.perform_async
+      end
+      jid = SiblingWorkersService.perform_async
+      sibling_worker_data = wait_for { Services.configuration.redis.get(jid) }
+      sibling_worker_json = JSON.parse(sibling_worker_data)
+      expect(sibling_worker_json.size).to eq(3)
+      expected_sibling_worker_jids = sibling_worker_json.map do |_, _, work|
+        work['payload']['jid']
+      end
+      expect(expected_sibling_worker_jids).to match_array(sibling_worker_jids)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require 'rspec'
+require 'tries'
 require 'redis'
 require 'sidekiq'
 require_relative '../lib/services'
 require_relative 'support/test_services'
+require_relative 'support/helpers'
 
 support_dir = Pathname.new(File.expand_path('../support', __FILE__))
 log_dir     = support_dir.join('logs')
@@ -12,7 +14,7 @@ redis_pidfile = support_dir.join('redis.pid')
 redis_url     = "redis://localhost:#{redis_port}/0"
 
 sidekiq_pidfile = support_dir.join('sidekiq.pid')
-sidekiq_timeout = 60
+sidekiq_timeout = 20
 
 Services.configure do |config|
   config.redis   = Redis.new
@@ -44,11 +46,11 @@ RSpec.configure do |config|
     }
     redis = support_dir.join('redis-server')
     # TODO: Redis should be started here unless Rspec is executed by Travis CI
-    # system "#{redis} #{options_hash_to_string(redis_options)}"
+    system "#{redis} #{options_hash_to_string(redis_options)}"
 
     # Start Sidekiq
     sidekiq_options = {
-      concurrency: 1,
+      concurrency: 10,
       daemon:      true,
       timeout:     sidekiq_timeout,
       verbose:     true,
@@ -70,11 +72,11 @@ RSpec.configure do |config|
     # Stop Redis
     redis_cli = support_dir.join('redis-cli')
     # TODO: Redis should be stopped here unless Rspec is executed by Travis CI
-    # system "#{redis_cli} -p #{redis_port} shutdown"
-    # while File.exist?(redis_pidfile)
-    #   puts 'Waiting for Redis to shut down...'
-    #   sleep 1
-    # end
+    system "#{redis_cli} -p #{redis_port} shutdown"
+    while File.exist?(redis_pidfile)
+      puts 'Waiting for Redis to shut down...'
+      sleep 1
+    end
 
     # Truncate log files
     max_len = 1024 * 1024 # 1 MB

data/spec/support/helpers.rb

@@ -0,0 +1,17 @@
+require 'sidekiq/api'
+
+ExpectedDataNotFoundError = Class.new(StandardError)
+
+def wait_for(&block)
+  10.tries on: ExpectedDataNotFoundError, delay: 0.1 do
+    block.call or raise ExpectedDataNotFoundError
+  end
+end
+
+def wait_for_job_to_run(jid)
+  wait_for do
+    Sidekiq::Workers.new.any? do |_, _, work|
+      work['payload']['jid'] == jid
+    end
+  end
+end

data/spec/support/test_services.rb

@@ -2,12 +2,34 @@ class UniqueService < Services::Base
   check_uniqueness!
 
   def call
-    sleep 1
+    sleep 0.5
   end
 end
 
 class NonUniqueService < Services::Base
   def call
-    sleep 1
+    sleep 0.5
+  end
+end
+
+class OwnWorkerService < Services::Base
+  def call
+    if own_worker.nil?
+      logger.error 'Could not find own worker!'
+    else
+      Services.configuration.redis.set self.jid, own_worker.to_json
+    end
+    sleep 0.5
+  end
+end
+
+class SiblingWorkersService < Services::Base
+  def call
+    if sibling_workers.empty?
+      logger.info 'No sibling workers found.'
+    else
+      Services.configuration.redis.set self.jid, sibling_workers.to_json
+    end
+    sleep 0.5
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,22 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -87,47 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: tries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '0.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: gem_config
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: nesty
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0.3'
 description: ''
 email: manuel@krautcomputing.com
 executables: []
@@ -153,11 +147,12 @@ files:
 - services.gemspec
 - spec/services/base_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 - spec/support/logs/.gitkeep
 - spec/support/redis-cli
 - spec/support/redis-server
 - spec/support/test_services.rb
-homepage: ''
+homepage: http://krautcomputing.github.io/services
 licenses:
 - MIT
 metadata: {}
@@ -184,6 +179,7 @@ summary: ''
 test_files:
 - spec/services/base_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 - spec/support/logs/.gitkeep
 - spec/support/redis-cli
 - spec/support/redis-server