services 7.2.1 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e5b3e8dcab03964af30636e451cef509b9155fa721e1323dafdf0ece173364
-  data.tar.gz: 76ad367be766868a392826d2b8600fbe96a97da1a42f4cda2f0a75ef64440f6a
+  metadata.gz: 07315b0de78bb20b6131a711ea5159cb98eb5d0750a2e8887acc17f8656d95ff
+  data.tar.gz: 93f14893f791086f48ba29c4dcf7b10f7ddb3d741a940769a11a35b3c200aef5
 SHA512:
-  metadata.gz: 2302bdb005ff03507cb952a2feb4b9e7171f3e9823d151aacdc39528005c768780d10ad4e35d4fb283ca56d6666b8862ec08df0838a6b39db7a3beda64829a83
-  data.tar.gz: 6d55fd8fc4e2e1780343ff14ee56cd9ef89052620e187952a563a5aed0a3b82bad7871b170023d2c9f4cfb4929ea6df776e8e9dc2906fc5b1667d1c512b8ca11
+  metadata.gz: 776986d66d7941661b8f9d412c745214a05e5a48db97f5a228b8ca8756c6383bb9f5938a504f9d6f5ad3c1396802e64ec63be86788cebdf298b344090d07c521
+  data.tar.gz: 795c3049f0867afb22fd8937a6ccf86ed27b91dafe66aafd385b58c1918360b6a8ee14cbd1f2553ecb300392acfbca8c37a2a47d6cd4c5ddbe55dda3c0c1ce96

data/lib/services.rb

@@ -5,8 +5,8 @@ require_relative 'services/logger/null'
 module Services
   include GemConfig::Base
 
-  BackgroundProcessorNotFound = Class.new(StandardError)
-  RedisNotFound               = Class.new(StandardError)
+  NoBackgroundProcessorFound = Class.new(StandardError)
+  RedisNotFound              = Class.new(StandardError)
 
   with_configuration do
     has :logger, default: Services::Logger::Null.new
@@ -26,10 +26,7 @@ end
 require_relative 'services/version'
 require_relative 'services/logger/file'
 require_relative 'services/logger/redis'
-begin
-  require_relative 'services/asyncable'
-rescue Services::BackgroundProcessorNotFound
-end
+require_relative 'services/asyncable'
 require_relative 'services/modules/call_logger'
 require_relative 'services/modules/exception_wrapper'
 require_relative 'services/modules/object_class'

data/lib/services/asyncable.rb

@@ -1,13 +1,6 @@
 require 'active_support/concern'
 require 'global_id'
 
-begin
-  require 'sidekiq'
-  require 'sidekiq/api'
-rescue LoadError
-  raise Services::BackgroundProcessorNotFound
-end
-
 module Services
   module Asyncable
     extend ActiveSupport::Concern
@@ -15,7 +8,22 @@ module Services
     ASYNC_METHOD_SUFFIXES = %i(async in at).freeze
 
     included do
-      include Sidekiq::Worker
+      begin
+        require 'sidekiq'
+        require 'sidekiq/api'
+      rescue LoadError
+      else
+        include Sidekiq::Worker
+        return
+      end
+
+      begin
+        require 'sucker_punch'
+      rescue LoadError
+        raise Services::NoBackgroundProcessorFound
+      else
+        include SuckerPunch::Job
+      end
     end
 
     module ClassMethods
@@ -33,18 +41,22 @@ module Services
       args = args.map do |arg|
         GlobalID::Locator.locate(arg) || arg
       end
+
       # If the `call` method takes any kwargs and the last argument is a hash, symbolize the hash keys,
       # otherwise they won't be recognized as kwards when splatted.
       # Since the arguments to `perform` are serialized to the database before Sidekiq picks them up,
       # symbol keys are converted to strings.
       call_method = method(:call)
+
       # Find the first class that inherits from `Services::Base`.
       while !(call_method.owner < Services::Base)
         call_method = call_method.super_method
       end
+
       if call_method.parameters.map(&:first).grep(/\Akey/).any? && args.last.is_a?(Hash)
         args.last.symbolize_keys!
       end
+
       call *args
     end
   end

data/lib/services/base.rb

@@ -11,7 +11,10 @@ module Services
       def inherited(subclass)
         subclass.const_set :Error, Class.new(StandardError)
         subclass.public_send :include, Rails.application.routes.url_helpers if defined?(Rails)
-        subclass.public_send :include, Asyncable if defined?(Asyncable)
+        begin
+          subclass.public_send :include, Asyncable
+        rescue Services::NoBackgroundProcessorFound
+        end
         subclass.public_send :prepend, CallLogger, ExceptionWrapper, UniquenessChecker
       end
 

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '7.2.1'.freeze
+  VERSION = '7.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.3.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app