services 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4299a00ac5d36b3ca4eb252b7d389a0b11b36f
-  data.tar.gz: 1ddd50f90a9bbda3abea088edc727173ddba9c13
+  metadata.gz: dbbec960a41d81815da15861aa4e5abf3941cd46
+  data.tar.gz: 4e390c06247de93c8eb6e45050392566767a2903
 SHA512:
-  metadata.gz: 848c4ee5ee12f5e5f0830716d49a16d4f9733620faf5be6dc1623d8ead6bfffbdbcb296d540f69ce1484efa9a83ab9ab504f388b8a9e56e7c5d15a8125ecba85
-  data.tar.gz: a53a702dc0f76feffc578e28488f0d10857854f9d13beaecf2702a362be31ba77410b0c3ba52e2292e6cb9536db96cb9b76007d5d220eeaa4a2a81c403f26b51
+  metadata.gz: 998625c59ca525eb537f52d5317cff7d0ac8cb68f787bb1b46dbf16f33a00917eae854ee24e27763a13422e22b6b62a4e65bda26213e8a527f0d356a46e7adea
+  data.tar.gz: 73db3259b704dc5b18a3468561c634cfc84d71ffea2288df47523dd9eda51379ae498a96aa470751f2daffc85d5ee2dc5948d312888d10278aa9dfb9138832ec

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', cmd: 'bundle exec rspec', failed_mode: :none, all_after_pass: true, all_on_start: true do
+guard 'rspec', cmd: 'bundle exec rspec' do
   # Specs
   watch(%r(^spec/.+_spec\.rb$))
   watch('spec/spec_helper.rb')       { 'spec' }

data/lib/services/modules/call_logger.rb

@@ -2,7 +2,8 @@ module Services
   class Base
     module CallLogger
       def call(*args)
-        log "START with args: #{args}"
+        log "START with args #{args}"
+        log "CALLED BY #{caller}"
         start = Time.now
         begin
           result = super
@@ -24,7 +25,7 @@ module Services
 
       def log_exception(e, cause = false)
         log "#{'caused by: ' if cause}#{e.class}: #{e.message}"
-        if e.respond_to?(:cause) && !e.cause.nil?
+        if e.respond_to?(:cause) && e.cause
           e.backtrace.take(5).each do |line|
             log "  #{line}"
           end
@@ -35,6 +36,13 @@ module Services
           end
         end
       end
+
+      def caller
+        caller_location = caller_locations(2, 1).first
+        caller_path = caller_location.path
+        caller_path = caller_path.sub(%r(\A#{Regexp.escape Rails.root.to_s}/), '') if defined?(Rails)
+        [caller_path, caller_location.lineno].join(':')
+      end
     end
   end
 end

data/lib/services/version.rb

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

data/services.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r(^(test|spec|features)/))
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '>= 0.9.0'
   gem.add_development_dependency 'guard-rspec', '~> 4.2'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'sidekiq', '~> 3.0'

data/spec/services/base_spec.rb

@@ -170,9 +170,41 @@ describe Services::Base do
     end
   end
 
-  context 'logging exceptions' do
+  context 'logging' do
+    it 'logs start with args and end with duration' do
+      service = EmptyService.new
+      logs = []
+      allow(service).to receive(:log) do |message, *|
+        logs << message
+      end
+      service.call 'foo', 'bar'
+      expect(logs.first).to eq('START with args ["foo", "bar"]')
+      expect(logs.last).to eq('END after 0.0 seconds')
+    end
+
+    it 'logs the caller' do
+      service_calling_service, called_service = ServiceCallingService.new, EmptyService.new
+      logs = []
+      allow(called_service).to receive(:log) do |message, *|
+        logs << message
+      end
+
+      # When Rails is not defined, the complete caller path should be logged
+      service_calling_service.call called_service
+      expect(logs).to include(/\ACALLED BY #{Regexp.escape(PROJECT_ROOT.join(SERVICES_PATH).to_s)}:\d+/)
+
+      # When Rails is defined, only the caller path relative to Rails.root is logged
+      class Rails
+        def self.root; PROJECT_ROOT; end
+      end
+      logs = []
+      service_calling_service.call called_service
+      expect(logs).to include(/\ACALLED BY #{Regexp.escape(SERVICES_PATH)}:\d+/)
+      Object.send :remove_const, :Rails
+    end
+
     if RUBY_VERSION > '2.1'
-      it 'logs the exception cause(s) as well' do
+      it 'logs exceptions and exception causes' do
         service = NestedExceptionService.new
         logs = []
         allow(service).to receive(:log) do |message, *|

data/spec/spec_helper.rb

@@ -2,10 +2,15 @@ require 'rspec'
 require 'tries'
 require 'redis'
 require 'sidekiq'
+
 require_relative '../lib/services'
-require_relative 'support/test_services'
 require_relative 'support/helpers'
 
+SERVICES_PATH = File.join('support', 'test_services.rb')
+require_relative SERVICES_PATH
+
+PROJECT_ROOT = Pathname.new(File.expand_path('..', __FILE__))
+
 support_dir = Pathname.new(File.expand_path('../support', __FILE__))
 log_dir     = support_dir.join('log')
 
@@ -35,18 +40,19 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.before :suite do
-    # Start Redis
-    redis_options = {
-      daemonize:  'yes',
-      port:       redis_port,
-      dir:        support_dir,
-      dbfilename: 'redis.rdb',
-      logfile:    log_dir.join('redis.log'),
-      pidfile:    redis_pidfile
-    }
-    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)}"
+    unless ENV['TRAVIS']
+      # Start Redis
+      redis_options = {
+        daemonize:  'yes',
+        port:       redis_port,
+        dir:        support_dir,
+        dbfilename: 'redis.rdb',
+        logfile:    log_dir.join('redis.log'),
+        pidfile:    redis_pidfile
+      }
+      redis = support_dir.join('redis-server')
+      system "#{redis} #{options_hash_to_string(redis_options)}"
+    end
 
     # Start Sidekiq
     sidekiq_options = {
@@ -69,13 +75,14 @@ RSpec.configure do |config|
       sleep 1
     end
 
-    # 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
+    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 1
+      end
     end
 
     # Truncate log files

data/spec/support/test_services.rb

@@ -47,12 +47,23 @@ module Services
   end
 end
 
+class EmptyService < Services::Base
+  def call(*args)
+  end
+end
+
 class ErrorService < Services::Base
   def call
     raise Error.new('I am a service error.')
   end
 end
 
+class ServiceCallingService < Services::Base
+  def call(service)
+    service.call
+  end
+end
+
 class UniqueService < Services::Base
   def call
     check_uniqueness!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: ''