services 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffdcdb285cbcbd081d2a061bab59150e91478fc0
-  data.tar.gz: b7ece5a7a3cf09b02d0020e0e188127c48e92415
+  metadata.gz: f848f7e6c1284b6671f565cb1d27d4119cb4a355
+  data.tar.gz: 3dbce97879f9e9768715839d9151fb2e3e0bd3ee
 SHA512:
-  metadata.gz: 299c7c815229e345be412a0f7ab4bca0d1da1848ac9e29935f0e74b378c9f7dea7e22efed1fe48856060815c68d9bfe0048279da27b313e711ef5dc65c24ef53
-  data.tar.gz: a5dd66ac67005ba9530e38a2e483bcde53583a044ffbff553dab3ad82123567408c3e281cef66d8c8055ec6638a4c8620b71c53136b91f743f8b3f6dca78d3df
+  metadata.gz: 3c370c5325be285ad139465aeb88b471570de89dd0b791afcb4d18f83cf9505071edb0234c61f13946ed1bee9e2dda0013e5644607747ed04d23f049fd06149d
+  data.tar.gz: 5cfe01abb853bf5b6ac99127fecde95f225b23df823a1d46d6b09bee498a2a7d41f72062ed5d8bc3a07937c0ffda9e0d087e7b61a512fdd3df87076500e4c419

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 4.0.2
+
+* Add null logger
+
+## 4.0.1
+
+* Account for that `redis.multi` can return nil
+
+## 4.0.0
+
+* Remove host configuration and controller method
+
+## 3.1.1
+
+* Query does not have its own error, raise ArgumentError instead
+
+## 3.1.0
+
+* Verify that query ids parameter is not nil
+
 ## 3.0.1
 
 * Fix for Ruby 2.0

data/Guardfile

@@ -15,17 +15,23 @@ module ::Guard
     REDIS_CLI        = SPEC_SUPPORT_DIR.join('redis-cli')
     REDIS_PIDFILE    = SPEC_SUPPORT_DIR.join('redis.pid')
     REDIS_LOGFILE    = SPEC_SUPPORT_DIR.join('log', 'redis.log')
+    REDIS_PORT       = 6479
+
+    def self.options_to_string(options)
+      options.map { |k, v| "-#{'-' if k.length > 1}#{k} #{v}" }.join(' ')
+    end
 
     class OnStart
       def call(guard_class, event, *args)
-        redis_options = {
+        options = {
           daemonize:  'yes',
           dir:        SPEC_SUPPORT_DIR,
           dbfilename: 'redis.rdb',
           logfile:    REDIS_LOGFILE,
           pidfile:    REDIS_PIDFILE,
+          port:       REDIS_PORT
         }
-        system "#{REDIS_BIN} #{redis_options.map { |k, v| "--#{k} #{v}" }.join(' ')}"
+        system "#{REDIS_BIN} #{ServicesGemHelpers.options_to_string options}"
 
         i = 0
         while !File.exist?(REDIS_PIDFILE)
@@ -39,7 +45,10 @@ module ::Guard
 
     class OnStop
       def call(guard_class, event, *args)
-        system "#{REDIS_CLI} shutdown"
+        options = {
+          p: REDIS_PORT
+        }
+        system "#{REDIS_CLI} #{ServicesGemHelpers.options_to_string options} shutdown"
 
         i = 0
         while File.exist?(REDIS_PIDFILE)

data/lib/services.rb

@@ -1,12 +1,14 @@
 require 'gem_config'
 
+require_relative 'services/logger/null'
+
 module Services
   include GemConfig::Base
 
   BackgroundProcessorNotFound = Class.new(StandardError)
 
   with_configuration do
-    has :logger
+    has :logger, default: Services::Logger::Null.new
     has :redis
   end
 end

data/lib/services/base.rb

@@ -27,6 +27,10 @@ module Services
 
     private
 
+    def log(message, meta = {}, severity = 'info')
+      Services.configuration.logger.log message, meta.merge(service: self.class.to_s, id: @id), severity
+    end
+
     def _split_ids_and_objects(ids_or_objects, klass)
       ids_or_objects = Array(ids_or_objects)
       ids, objects = ids_or_objects.grep(Fixnum), ids_or_objects.grep(klass)

data/lib/services/logger/null.rb

@@ -0,0 +1,8 @@
+module Services
+  module Logger
+    class Null
+      def log(*args)
+      end
+    end
+  end
+end

data/lib/services/modules/call_logger.rb

@@ -28,7 +28,6 @@ module Services
       end
 
       def call(*args)
-        return super if Services.configuration.logger.nil?
         unless self.class.call_logging_disabled
           log "START with args: #{args}", caller: caller
           start = Time.now
@@ -46,10 +45,6 @@ module Services
 
       private
 
-      def log(message, meta = {}, severity = 'info')
-        Services.configuration.logger.log message, meta.merge(service: self.class.to_s, id: @id), severity
-      end
-
       def exception_message(e)
         message = "#{e.class}: #{e.message}"
         e.backtrace.each do |line|

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/spec/services/configuration_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Services do
+  context 'configuration' do
+    describe 'logger' do
+      it 'uses the null logger by default' do
+        expect(Services.configuration.logger).to be_a(Services::Logger::Null)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,20 +17,20 @@ SIDEKIQ_PIDFILE        = SUPPORT_DIR.join('sidekiq.pid')
 WAIT                   = 0.5
 START_TIMEOUT          = 5
 SIDEKIQ_TIMEOUT        = 20
+REDIS_PORT             = 6479
 
 Dir[SUPPORT_DIR.join('**', '*.rb')].each { |f| require f }
 
-
 Services.configure do |config|
   config.redis = Redis.new
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = { redis: 'redis://localhost:6379/0', namespace: 'sidekiq', size: 1 }
+  config.redis = { redis: "redis://localhost:#{REDIS_PORT}/0", namespace: 'sidekiq', size: 1 }
 end
 
 Sidekiq.configure_server do |config|
-  config.redis = { redis: 'redis://localhost:6379/0', namespace: 'sidekiq' }
+  config.redis = { redis: "redis://localhost:#{REDIS_PORT}/0", namespace: 'sidekiq' }
 end
 
 RSpec.configure do |config|

data/spec/support/shared.rb

@@ -14,6 +14,6 @@ RSpec.shared_context 'capture logs' do
   end
 
   after do
-    Services.configuration.logger = nil
+    Services.configuration.logger = Services::Logger::Null.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,6 +154,7 @@ files:
 - lib/services/asyncable.rb
 - lib/services/base.rb
 - lib/services/logger/file.rb
+- lib/services/logger/null.rb
 - lib/services/logger/redis.rb
 - lib/services/modules/call_logger.rb
 - lib/services/modules/exception_wrapper.rb
@@ -164,6 +165,7 @@ files:
 - lib/services/version.rb
 - services.gemspec
 - spec/services/base_spec.rb
+- spec/services/configuration_spec.rb
 - spec/services/logger/redis_spec.rb
 - spec/services/modules/call_logger_spec.rb
 - spec/services/modules/exception_wrapper_spec.rb
@@ -197,12 +199,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app
 test_files:
 - spec/services/base_spec.rb
+- spec/services/configuration_spec.rb
 - spec/services/logger/redis_spec.rb
 - spec/services/modules/call_logger_spec.rb
 - spec/services/modules/exception_wrapper_spec.rb