services 7.3.3 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 510d4c3f8f8663e0079e9a9cea599cbf4d6173b674531b3c562e86596b510cb8
-  data.tar.gz: b4c3da22b80c5336cb5d1db80f89519847e0057c25a6a9875fe4b4c5693eda05
+  metadata.gz: 968f73b837027e7a1fd1d445b18073fec9e4fa449c5975086551c51c58dccf8b
+  data.tar.gz: 92f3ada6ce7a8617e8a50ddf4a5f11827722845dd952c244547f93e76853c283
 SHA512:
-  metadata.gz: ae00b7c9086d4a975e347a57389a179b6c71dece21e16bf6fbd80dfe692b7a85b6204eaff77bf5109a0e02e08e45025ee6b95a3aae2cb4126d8878c575fd12e2
-  data.tar.gz: d98eba78f597b98c1df33a7f87d1d939153af67267246ec0a4c80363863871e48834cb76af59bc97d9c39994e699e554a9710ec634db96c8d97f3d4c1b7e082d
+  metadata.gz: 6d8931cc9b545291cd231cdec1ede213e0838261d3fdcfe19dfd3f71b70c0f83dbf11798573ead47238041bb889e9943abed244cc78661febee80c5ddac9b2ed
+  data.tar.gz: 3438431663f57852b0167a85ad4dd9f895198f7854090b4d06e8844c2eba01089d3c0a743a4ff37adf8abe9b4cb02395d9bde6fb8bc17923f95a71b9d5007086

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

@@ -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
 

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

@@ -46,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`.
@@ -57,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

@@ -42,7 +42,7 @@ module Services
         end
       end
 
-      def call(*args)
+      def call(*args, **kwargs)
         @_service_args = args
         super
       rescue self.class::NotUniqueError => e

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '7.3.3'.freeze
+  VERSION = '8.0.0'.freeze
 end

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.3
+  version: 8.0.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-02-23 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
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: A nifty service layer for your Rails app