services 7.3.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07315b0de78bb20b6131a711ea5159cb98eb5d0750a2e8887acc17f8656d95ff
-  data.tar.gz: 93f14893f791086f48ba29c4dcf7b10f7ddb3d741a940769a11a35b3c200aef5
+  metadata.gz: a698bd8da6f4a212b731789e0ac3db4fbee0e0a097c89994d2b1ec9d3ec900ea
+  data.tar.gz: 4689d6d5813efa452141b8cf4e41fcf542e94bbed9b2ad88e8ef7a8f47857fa1
 SHA512:
-  metadata.gz: 776986d66d7941661b8f9d412c745214a05e5a48db97f5a228b8ca8756c6383bb9f5938a504f9d6f5ad3c1396802e64ec63be86788cebdf298b344090d07c521
-  data.tar.gz: 795c3049f0867afb22fd8937a6ccf86ed27b91dafe66aafd385b58c1918360b6a8ee14cbd1f2553ecb300392acfbca8c37a2a47d6cd4c5ddbe55dda3c0c1ce96
+  metadata.gz: 3acfbd1a4c1db551629ab7e2ec8154ad6eb11ac19d576989f700c4c7e2e97ccea38016423c614b45840874d62ae6b1d4ff291c3c091676ebdd613b700ec944de
+  data.tar.gz: f3e29cdc63402370f7f211a3bea262e807468743fa9e6bb4657cdbad5ac0867738c7693ee239f09483ee758c3d74aec0f92b777d183f156363d1c798008e7df5

data/Appraisals

@@ -1,11 +1,11 @@
-appraise 'rails_4.2' do
-  gem 'rails', '~> 4.2.0'
+appraise 'rails_5.2' do
+  gem 'rails', '~> 5.2.0'
 end
 
-appraise 'rails_5.0' do
-  gem 'rails', '~> 5.0.0'
+appraise 'rails_6.0' do
+  gem 'rails', '~> 6.0.0'
 end
 
-appraise 'rails_5.1' do
-  gem 'rails', '~> 5.1.0'
+appraise 'rails_6.1' do
+  gem 'rails', '~> 6.1.0'
 end

data/README.md

@@ -1,8 +1,8 @@
 # Services
 
 [![Gem Version](https://badge.fury.io/rb/services.png)](http://badge.fury.io/rb/services)
-[![Build Status](https://secure.travis-ci.org/krautcomputing/services.png)](http://travis-ci.org/krautcomputing/services)
-[![Code Climate](https://codeclimate.com/github/krautcomputing/services.png)](https://codeclimate.com/github/krautcomputing/services)
+[![Build Status](https://secure.travis-ci.org/manuelmeurer/services.png)](http://travis-ci.org/manuelmeurer/services)
+[![Code Climate](https://codeclimate.com/github/manuelmeurer/services.png)](https://codeclimate.com/github/manuelmeurer/services)
 
 Services is a collection of modules and base classes that let you simply add a service layer to your Rails app.
 
@@ -20,7 +20,7 @@ For disambiguation: in this README, when you read "Services" with a uppercase "S
 
 #### Ruby >= 2.2.5
 
-#### Rails >= 4.2
+#### Rails >= 5.2
 
 #### Redis >= 3.0
 
@@ -28,7 +28,7 @@ Redis is used at several points, e.g. to store information about the currently r
 
 #### Postgres (optional)
 
-The SQL that `Services::Query` (discussed further down) generates is optimized for Postgres. It might work with other databases but it's not guaranteed. If you're not using Postgres, you can still use all other parts of Services, just don't use `Services::Query` or, even better, submit a [pull request](https://github.com/krautcomputing/services/issues) that fixes it to work with your database!
+The SQL that `Services::Query` (discussed further down) generates is optimized for Postgres. It might work with other databases but it's not guaranteed. If you're not using Postgres, you can still use all other parts of Services, just don't use `Services::Query` or, even better, submit a [pull request](https://github.com/manuelmeurer/services/issues) that fixes it to work with your database!
 
 #### Sidekiq (optional)
 

data/gemfiles/{rails_4.2.gemfile → rails_5.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.0.gemfile → rails_6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.1.gemfile → rails_6.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/lib/services/asyncable.rb

@@ -8,21 +8,25 @@ module Services
     ASYNC_METHOD_SUFFIXES = %i(async in at).freeze
 
     included do
+      sidekiq_loaded = false
+
       begin
         require 'sidekiq'
         require 'sidekiq/api'
       rescue LoadError
       else
         include Sidekiq::Worker
-        return
+        sidekiq_loaded = true
       end
 
-      begin
-        require 'sucker_punch'
-      rescue LoadError
-        raise Services::NoBackgroundProcessorFound
-      else
-        include SuckerPunch::Job
+      unless sidekiq_loaded
+        begin
+          require 'sucker_punch'
+        rescue LoadError
+          raise Services::NoBackgroundProcessorFound
+        else
+          include SuckerPunch::Job
+        end
       end
     end
 
@@ -30,7 +34,7 @@ module Services
       ASYNC_METHOD_SUFFIXES.each do |async_method_suffix|
         define_method "call_#{async_method_suffix}" do |*args|
           args = args.map do |arg|
-            arg.respond_to?(:to_global_id) ? arg.to_global_id : arg
+            arg.respond_to?(:to_global_id) ? arg.to_global_id.to_s : arg
           end
           self.public_send "perform_#{async_method_suffix}", *args
         end
@@ -42,10 +46,6 @@ module Services
         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`.
@@ -53,11 +53,14 @@ module Services
         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!
+      # If the `call` method takes any kwargs and the last argument is a hash, pass them to the method as kwargs.
+      kwargs = if call_method.parameters.map(&:first).grep(/\Akey/).any? && args.last.is_a?(Hash)
+        args.pop.symbolize_keys
+      else
+        {}
       end
 
-      call *args
+      call *args, **kwargs
     end
   end
 end

data/lib/services/base.rb

@@ -25,7 +25,7 @@ module Services
       @id = SecureRandom.hex(6)
     end
 
-    def call(*args)
+    def call(*args, **kwargs)
       raise NotImplementedError
     end
 

data/lib/services/modules/call_logger.rb

@@ -27,9 +27,9 @@ module Services
         end
       end
 
-      def call(*args)
+      def call(*args, **kwargs)
         unless self.class.call_logging_disabled
-          log "START with args: #{args}", caller: caller
+          log "START with args: #{args}, kwargs: #{kwargs}", caller: caller
           start = Time.now
         end
         begin

data/lib/services/modules/exception_wrapper.rb

@@ -1,7 +1,7 @@
 module Services
   class Base
     module ExceptionWrapper
-      def call(*args)
+      def call(*args, **kwargs)
         super
       rescue StandardError => e
         if e.class <= self.class::Error

data/lib/services/modules/uniqueness_checker.rb

@@ -14,7 +14,7 @@ module Services
       ).freeze
 
       MAX_RETRIES = 10.freeze
-      ONE_DAY     = (60 * 60 * 24).freeze
+      THIRTY_DAYS = (60 * 60 * 24 * 30).freeze
 
       def self.prepended(mod)
         mod.const_set :NotUniqueError, Class.new(mod::Error)
@@ -37,12 +37,12 @@ module Services
         else
           @_uniqueness_keys ||= []
           @_uniqueness_keys << new_uniqueness_key
-          Services.redis.setex new_uniqueness_key, ONE_DAY, @id
+          Services.redis.setex new_uniqueness_key, THIRTY_DAYS, @id
           true
         end
       end
 
-      def call(*args)
+      def call(*args, **kwargs)
         @_service_args = args
         super
       rescue self.class::NotUniqueError => e
@@ -103,7 +103,7 @@ module Services
       end
 
       def increase_error_count
-        Services.redis.setex error_count_key, retry_delay + ONE_DAY, error_count + 1
+        Services.redis.setex error_count_key, retry_delay + THIRTY_DAYS, error_count + 1
       end
 
       def uniqueness_key(args)

data/lib/services/version.rb

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

data/services.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email                 = 'manuel@krautcomputing.com'
   gem.summary               = 'A nifty service layer for your Rails app'
   gem.description           = 'A nifty service layer for your Rails app'
-  gem.homepage              = 'http://krautcomputing.github.io/services'
+  gem.homepage              = 'http://manuelmeurer.github.io/services'
   gem.license               = 'MIT'
   gem.required_ruby_version = '>= 2.2.5'
   gem.files                 = `git ls-files`.split($/)

data/spec/support/test_services.rb

@@ -81,14 +81,14 @@ module Services
 end
 
 class EmptyService < Services::Base
-  def call(*args)
+  def call(*args, **kwargs)
   end
 end
 
 class EmptyServiceWithoutCallLogging < Services::Base
   disable_call_logging
 
-  def call(*args)
+  def call(*args, **kwargs)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Manuel Meurer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,9 +193,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/services.rb
 - lib/services/asyncable.rb
 - lib/services/base.rb
@@ -227,11 +227,11 @@ files:
 - spec/support/redis-server
 - spec/support/shared.rb
 - spec/support/test_services.rb
-homepage: http://krautcomputing.github.io/services
+homepage: http://manuelmeurer.github.io/services
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -246,8 +246,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.23
+signing_key:
 specification_version: 4
 summary: A nifty service layer for your Rails app
 test_files: