ar_serializer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5dcdb4d958a8a3c5f45333e6d046d8070b817e9ace01ff9c5129421117a4d96
-  data.tar.gz: 3e37de9cd29f69b6a9fc98a297fc40eb700127403e01604cc779f0225ecd2196
+  metadata.gz: c7ba3188364c0f2ba77cd345116c161cb1586ba86f165ee8336266d3d69dc936
+  data.tar.gz: de1a1f08e2eb1cee584bb9f34663fc51d460dbb6283aa4773681fb8ff585df9d
 SHA512:
-  metadata.gz: e6f6050647dfe4baf84dd2801c3158447c91653dd70894a92a9eedd8c1a3b84e6da8182854ccf380f0c66ed4927774d83ed5dfc8c327d1d9ab9189c71d10d0bc
-  data.tar.gz: ac83b599db7be347c547b7bd1a6a3a2b0d28825220df5d862899151fe26d1aa4843a34851e3af683d7ff2245b4d904cfbf191a1a5e837dd7758b57cb7023fb83
+  metadata.gz: 987a6cad67b5db442cd5cbb0167fb754cf3cb841d0ea050bf148391ed6f4c61037e17e1448d50d89ebd6549541b4aa51566a233b42c578eded817f42bc77c156
+  data.tar.gz: f6c971e38b6e96673ddddcac94ee30e37d12eeb05ef68a8c878fff3490ec273e91cb1146a8ba6a185cac5fb313c6a429d07dd89986475e73454db6f6f187ed7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_serializer (1.1.0)
+    ar_serializer (1.1.1)
       activerecord
       top_n_loader
 

data/lib/ar_serializer/serializer.rb

@@ -84,10 +84,15 @@ module ArSerializer::Serializer
       end
       preloader_values = preloader_params.compact.uniq.map do |key|
         preloader, params = key
-        if preloader.arity < 0
-          [key, preloader.call(models, context, **(params || {}))]
+        has_keyword = preloader.parameters.any? { |type, _name| %i[key keyreq keyrest].include? type }
+        arity = preloader.arity.abs
+        arguments = [models]
+        if has_keyword
+          arguments << context unless arity == 2
+          [key, preloader.call(*arguments, **(params || {}))]
         else
-          [key, preloader.call(*[models, context].take(preloader.arity), **(params || {}))]
+          arguments << context unless arity == 1
+          [key, preloader.call(*arguments)]
         end
       end.to_h
 

data/lib/ar_serializer/version.rb

@@ -1,3 +1,3 @@
 module ArSerializer
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_serializer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - tompng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord