railsful 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e8f5c72f7b2752718a8d4724c28b5852f8dd8e5aaac4c206f8309a63cc34e8
-  data.tar.gz: 0c74fe0fe436cdf061a8c86d54a007718dcffd7863681458bed90c4b2bb9d35a
+  metadata.gz: c4eaf1c781940b63c1fbce747b329bde6762e2cea0b9be799101cdc5ec0ce77d
+  data.tar.gz: 91f44d2f8794a764520106c956401c02f0c2fef52157e625be7665c9017fa601
 SHA512:
-  metadata.gz: c0fb4853f6763cdabfe55a4799ba1647055f658e71c60b40fe7026b3d782b1140c3f289e443b93160089423a8131722cccf91dc2ebd82efd67ee3552764e2cec
-  data.tar.gz: c39bed75213fdc2b6651474491c43777e6937fc36133e696cdde1b65296106561dc8b4d84bd7a436e40b8156141744fde9a7c379505b1e2553a1d8cee10e6aff
+  metadata.gz: 0e7799d17276f86313a788945cdfbf4bd28faaec669b613c3890b4139830064d6e486ea40e35bda96c96569d3012333b907e0ac8c67429e205b86181b2fb5ce8
+  data.tar.gz: ae72958a087df3b94f648045730fb5450a1369c9608236534ee30ac76825efc9f8b8f05f04dfb2d2067d9d479a4768dcac3cd60b34e7f333638c6ef9c8a96a3a

data/lib/railsful/deserializer.rb

@@ -29,6 +29,8 @@ module Railsful
 
     # First level attributes from data object.
     #
+    # @return [Hash]
+    #
     # :reek:FeatureEnvy
     def attributes(params)
       data = params.fetch(:data, {})
@@ -48,32 +50,62 @@ module Railsful
     # Fetches all included associations/relationships from the
     # included hash.
     #
+    # @return [Hash]
+    #
     # :reek:UtilityFunction
+    # :reek:FeatureEnvy
     def included_hash(params)
-      included_hash = {}
+      # Gather all necessary data we are working on.
+      included = params.fetch(:included, [])
+      relationships = params.fetch(:data, {}).fetch(:relationships, {})
 
-      params.fetch(:included, []).each do |inc|
-        type = inc[:type].to_sym
-        attrs = inc[:attributes]
+      result = {}
 
-        if params.dig(:data, :relationships, type, :data).is_a?(Array)
-          # We pluralize the type since we are dealing with a
-          # +has_many+ relationship.
-          plural = ActiveSupport::Inflector.pluralize(type)
+      # Make sure that both +included+ and +relationships+ are given.
+      # Otherwise we can't do anything and return an empty hash.
+      return result if included.empty? || relationships.empty?
 
-          included_hash["#{plural}_attributes"] ||= []
-          included_hash["#{plural}_attributes"] << attrs
-        else
-          # When the data value is not an Array we are assuming that we
-          # deal with a +has_one+ association. To be on the safe side we also
-          # call singularize on the type.
-          singular = ActiveSupport::Inflector.singularize(type)
+      # Iterate over all relationships.
+      relationships.each do |type, payload|
+        # Get the data value.
+        data = payload[:data]
 
-          included_hash["#{singular}_attributes"] = attrs
+        # Check if we are dealing with a +has_many+ (Array) or +belongs_to+
+        # (Hash) relationship.
+        if data.is_a?(Array)
+          result["#{type}_attributes"] = []
+
+          data.each do |element|
+            result["#{type}_attributes"] << get_included(element, included)
+          end
+
+          # Remove all nil includes.
+          result["#{type}_attributes"].compact!
+        else
+          result["#{type}_attributes"] = get_included(data, included)
         end
       end
 
-      included_hash
+      # Remove all nil includes.
+      result.compact
+    end
+
+    # Fetch the included object for a given relationship.
+    #
+    # @return [Hash, NilClass] The extracted included hash.
+    #
+    # :reek:UtilityFunction
+    def get_included(relation, included)
+      # Return the attributes of the last found element. But there SHOULD only
+      # be one element with the same tempid. If there is a mistake by the client
+      # we always take the last.
+      found = included.reverse
+                      .detect { |inc| inc[:tempid] == relation[:tempid] }
+
+      return nil unless found
+
+      # Return the attributes of the found include hash or an empty hash.
+      found.fetch(:attributes, {})
     end
 
     def relationship(type, payload)

data/lib/railsful/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Railsful
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsful
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Henning Vogt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge