services 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb51ec8db2b413530af5cdc1c9a95cd81f3a519cd2492dd9664ab4254028520c
-  data.tar.gz: 3c140ae804c3a69105ce4d2ed1d7b0975e224a33a86afe9bd3c539d82ef23c54
+  metadata.gz: b065533d21d6ca4c70a84c9954013b30fe1117029815136e7255187374e90491
+  data.tar.gz: 94660090d080809e9b86e0ffaab444344797849fd6223395121590fa806bea58
 SHA512:
-  metadata.gz: db4dc1a984b5c4e7aacbd9e88712b892cdbcd938101190283d68b93ec898261efab50c9cf634cb6ef4e432358e82039b1601be44bdebe4794a90c58b6ca863cd
-  data.tar.gz: 7bcdfb0ae02c57ffe370988bccbfbef46eaa29edf7a7475cefaa32dc08f667bd8f69828b24b269a9bdcc73d74f342e62b553b610e958e38a7cba3647e829c34f
+  metadata.gz: 0e66ba451286220dfe6452de7c51d6580174f7c7e8b46201f9b69e8999baaf7429b83e289d5a9d37b14f2034a2cc91a4ec0be7009e78a18836dee9206985d12e
+  data.tar.gz: d83b44042182db49481a619f3546b06cd298c091daf4fc9f3c6a27a5e2da39b516441365dab12b5a8d4b980b0fc576456a24e6e38eb5b1a97f8372f8e2a53cff

data/README.md

@@ -148,18 +148,13 @@ module Services
     class Find < Services::Query
       convert_condition_objects_to_ids :post
 
-      private def process(scope, conditions)
-        conditions.each do |k, v|
-          case k
-          when :email, :name
-            scope = scope.where(k => v)
-          when :post_id
-            scope = scope.joins(:posts).where("#{Post.table_name}.id" => v)
-          else
-            raise ArgumentError, "Unexpected condition: #{k}"
-          end
+      private def process(scope, condition, value)
+        case condition
+        when :email, :name
+          scope.where(condition => value)
+        when :post_id
+          scope.joins(:posts).where("#{Post.table_name}.id" => value)
         end
-        scope
       end
     end
   end

data/lib/services/asyncable.rb

@@ -21,7 +21,7 @@ module Services
     module ClassMethods
       ASYNC_METHOD_SUFFIXES.each do |async_method_suffix|
         define_method "call_#{async_method_suffix}" do |*args|
-          args.map! do |arg|
+          args = args.map do |arg|
             arg.respond_to?(:to_global_id) ? arg.to_global_id : arg
           end
           self.public_send "perform_#{async_method_suffix}", *args
@@ -30,9 +30,20 @@ module Services
     end
 
     def perform(*args)
-      args.map! do |arg|
+      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)
+      while call_method.owner != self.class
+        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/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '7.0.1'.freeze
+  VERSION = '7.0.2'.freeze
 end

data/spec/services/asyncable_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Services::Asyncable do
+  describe '#perform' do
+    it 'calls `call` with the correct args' do
+      expect { AsyncService.new.perform 'test', pelle: 'fant' }.to raise_error(%w(test baz fant).to_json)
+
+      # If the `call` method arguments contains kwargs and the last argument to `perform` is a Hash,
+      # it's keys should be symbolized. The reason is that the arguments to `perform` are serialized to
+      # the database before Sidekiq picks them up, i.e. symbol keys are converted to strings.
+      expect { AsyncService.new.perform 'test', 'pelle' => 'fant' }.to raise_error(%w(test baz fant).to_json)
+    end
+  end
+end

data/spec/support/activerecord_models_and_services.rb

@@ -29,8 +29,10 @@ module Services
 
       private
 
-      def process(scope, conditions)
-        raise conditions.to_json
+      def process(scope, condition, value)
+        if condition == :comment_id
+          raise({ condition => value }.to_json)
+        end
       end
     end
   end
@@ -43,18 +45,13 @@ module Services
 
       private
 
-      def process(scope, conditions)
-        conditions.each do |k, v|
-          case k
-          when :title, :body
-            scope = scope.where(k => v)
-          when :comment_id
-            scope = scope.joins(:comments).where("#{Comment.table_name}.id" => v)
-          else
-            raise ArgumentError, "Unexpected condition: #{k}"
-          end
+      def process(scope, condition, value)
+        case condition
+        when :title, :body
+          scope.where(condition => value)
+        when :comment_id
+          scope.joins(:comments).where("#{Comment.table_name}.id" => value)
         end
-        scope
       end
     end
   end
@@ -67,16 +64,11 @@ module Services
 
       private
 
-      def process(scope, conditions)
-        conditions.each do |k, v|
-          case k
-          when :body, :post_id
-            scope = scope.where(k => v)
-          else
-            raise ArgumentError, "Unexpected condition: #{k}"
-          end
+      def process(scope, condition, value)
+        case condition
+        when :body, :post_id
+          scope.where(condition => value)
         end
-        scope
       end
     end
   end

data/spec/support/test_services.rb

@@ -173,3 +173,9 @@ class NestedExceptionService < Services::Base
     end
   end
 end
+
+class AsyncService < Services::Base
+  def call(foo, bar: 'baz', pelle:)
+    raise [foo, bar, pelle].to_json
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -210,6 +210,7 @@ files:
 - lib/services/railtie.rb
 - lib/services/version.rb
 - services.gemspec
+- spec/services/asyncable_spec.rb
 - spec/services/base_spec.rb
 - spec/services/configuration_spec.rb
 - spec/services/logger/redis_spec.rb
@@ -251,6 +252,7 @@ signing_key:
 specification_version: 4
 summary: A nifty service layer for your Rails app
 test_files:
+- spec/services/asyncable_spec.rb
 - spec/services/base_spec.rb
 - spec/services/configuration_spec.rb
 - spec/services/logger/redis_spec.rb