decanter 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47761a57539196c1be8d4de3b4f18a78a0e133bdace720e4363dfc2a4ab5776c
-  data.tar.gz: caccc39b0926d5f39a29673a912fab356079fb67357b868cc4f803b325988890
+  metadata.gz: f191e5daf97acca13c721c2ddca506a38919433f2207d2cecb59433b463dbea7
+  data.tar.gz: 579ec81e38550f980c0e1fe96e2db9bcf50d4c99b2a52d48ab875a8970bc2c07
 SHA512:
-  metadata.gz: d7ee0004606f84e64e0b94697d1ff035f54b96ceb3dddc1f0a77c716ad17c566b9b959f78a67cfa6c40598c337db4464c62c26d2d394a749183bec915cad3d44
-  data.tar.gz: 6aecb9eb64b1bd282de2d29a3828fe131fa01227c50b8b5ff69049cb08184497435d9f67ab95f71dacf8120e072ff813b00dac497e81772396f249b0e8a74327
+  metadata.gz: b642637b676156b1e3f9783ceab09a5e9e8f6bf8ebf6c76e4c3ee292b95c59396bd62eb8ba6bf6ad296a5c5d116e3e25dc847a5c65da2ab7f2a443f482e6c3e5
+  data.tar.gz: 628ea27143c5ac74c97d141c67fbecedd99c51ac68f565d2677e15e250098848bb99c986e7d2f92809f09bd5008c1b41991d7c7f73bc97edc64b772f54fc494e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decanter (3.5.0)
+    decanter (3.5.1)
       actionpack (>= 4.2.10)
       activesupport
       rails-html-sanitizer (>= 1.0.4)

data/README.md

@@ -101,6 +101,7 @@ If this option is not provided, autodetect logic is used to determine if the pro
 - `nil` or not provided: will try to autodetect single vs collection
 - `true` will always treat the incoming params args as *collection*
 - `false` will always treat incoming params args as *single object*
+- `truthy` will raise an error
 
 ### Nested resources
 

data/lib/decanter.rb

@@ -57,7 +57,6 @@ end
 
 require 'decanter/version'
 require 'decanter/configuration'
-require 'decanter/core'
 require 'decanter/base'
 require 'decanter/extensions'
 require 'decanter/exceptions'

data/lib/decanter/base.rb

@@ -1,7 +1,9 @@
 require 'decanter/core'
+require 'decanter/collection_detection'
 
 module Decanter
   class Base
     include Core
+    include CollectionDetection
   end
 end

data/lib/decanter/collection_detection.rb

@@ -0,0 +1,26 @@
+module Decanter
+  module CollectionDetection
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def decant(args, **options)
+        return super(args) unless collection?(args, options[:is_collection])
+
+        args.map { |resource| super(resource) }
+      end
+
+      private
+
+      # leveraging the approach used in the [fast JSON API gem](https://github.com/Netflix/fast_jsonapi#collection-serialization)
+      def collection?(args, collection_option = nil)
+        raise(ArgumentError, "#{name}: Unknown collection option value: #{collection_option}") unless [true, false, nil].include? collection_option
+
+        return collection_option unless collection_option.nil?
+
+        args.respond_to?(:size) && !args.respond_to?(:each_pair)
+      end
+    end
+  end
+end

data/lib/decanter/extensions.rb

@@ -1,6 +1,5 @@
 module Decanter
   module Extensions
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -34,29 +33,13 @@ module Decanter
             .save!(context: options[:context])
       end
 
-      def decant(args, options={})
-        is_collection?(args, options[:is_collection]) ? decant_collection(args, options) : decant_args(args, options)
-      end
-
-      def decant_collection(args, options)
-        args.map { |resource| decant_args(resource, options) }
-      end
-
-      def decant_args(args, options)
-        if specified_decanter = options[:decanter]
+      def decant(args, options = {})
+        if (specified_decanter = options[:decanter])
           Decanter.decanter_from(specified_decanter)
         else
           Decanter.decanter_for(self)
         end.decant(args)
       end
-
-      private
-
-      # leveraging the approach used in the [fast JSON API gem](https://github.com/Netflix/fast_jsonapi#collection-serialization)
-      def is_collection?(args, collection_option=nil)
-        return collection_option[:is_collection] unless collection_option.nil?
-        args.respond_to?(:size) && !args.respond_to?(:each_pair)
-      end
     end
 
     module ActiveRecordExtensions

data/lib/decanter/version.rb

@@ -1,3 +1,3 @@
 module Decanter
-  VERSION = '3.5.0'.freeze
+  VERSION = '3.5.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decanter
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Ryan Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -152,6 +152,7 @@ files:
 - decanter.gemspec
 - lib/decanter.rb
 - lib/decanter/base.rb
+- lib/decanter/collection_detection.rb
 - lib/decanter/configuration.rb
 - lib/decanter/core.rb
 - lib/decanter/exceptions.rb