ams_hal 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77898f307f89b2c0e0817b60c5837161cbdb387d
-  data.tar.gz: 29abc151fe345ab914679e56e5dda53b3d77352d
+  metadata.gz: 7ae5d537e7726b7aa36721d90fe6e39156b9bf82
+  data.tar.gz: 64a517fb6e9d71e1ef16270a2f8660cb7e113fcb
 SHA512:
-  metadata.gz: 4ebacd405a3634d4a3a9a1379e7efb20f446a6b313788f3735758675b659d2e8824cc45b02c9c4131faf2a7004f03000e4468b078a5d0ae0692e27742b57e00f
-  data.tar.gz: 768689cfd85cc23962255f5a00cd959d8f5df3a7212158c11c89064ffa098f53bd1303251510150271ee9708696092b35962be1b1f805985f3b4ddb15cfbad1a
+  metadata.gz: 17a14cc150b84c8a9aa63a7c5be4cdefa286daee74ea6ff66223f160d0ed9ca751cd0d19b8a7785947a8abc27e1326ba7e4914bad698861cbbadd5a1631cd05a
+  data.tar.gz: cf7033fb8efdc620b498023d16eb1fe1005029404363b0cfad3e9c4d8ae4dd5ca7d588e79a258e692461b877fddaa4905ac028fb46da9732197529635bee606c

data/lib/ams_hal/adapter.rb

@@ -1,38 +1,57 @@
 module AmsHal
   class Adapter < ActiveModelSerializers::Adapter::Base
-    def serializable_hash(options = nil)
+    def serializable_hash(options = {})
       options = serialization_options(options)
       options[:fields] ||= instance_options[:fields]
-      serialized = if serializer.respond_to?(:each)
-                     serializer.each_with_object([]) do |_serializer, array|
-                       array << serialize_resource(_serializer, instance_options, options)
-                     end
+      hash = if serializer.respond_to?(:each)
+                     serialize_collection(serializer, instance_options, options)
                    else
                      serialize_resource(serializer, instance_options, options)
                    end
 
-      self.class.transform_key_casing!(serialized, instance_options)
+      self.class.transform_key_casing!(hash, instance_options)
     end
 
     protected
 
     def serialize_resource(serializer, adapter_options, options)
+      skip_embedded = options.delete(:skip_embedded) || false
+
       options[:include_directive] = {} # Don't include associations as attributes
-      serialized = serializer.serializable_hash(adapter_options, options, self)
+      hash = serializer.serializable_hash(adapter_options, options, self)
 
       if links = serialize_links(serializer)
-        serialized[:_links] = links if links.any?
+        hash[:_links] = links if links.any?
       end
 
+      return hash if skip_embedded
+
       if embedded = serialize_embedded(serializer)
-        serialized[:_embedded] = embedded if embedded.any?
+        hash[:_embedded] = embedded if embedded.any?
+      end
+
+      if associations = serialize_associations(serializer, adapter_options)
+        hash[:_embedded] = associations if associations.any?
+      end
+
+      hash
+    end
+
+    def serialize_collection(serializer, adapter_options, options)
+      options[:include_directive] = {} # Don't include associations as attributes
+      hash = {}
+
+      if links = serialize_links(serializer)
+        hash[:_links] = links if links.any?
       end
 
-      if associations = serialize_associations(serializer)
-        serialized[:_embedded] = associations if associations.any?
+      embedded = serializer.map do |_serializer|
+        options[:skip_embedded] = true
+        serialize_resource(_serializer, instance_options, options)
       end
+      hash[:_embedded] = embedded if embedded.any?
 
-      serialized
+      hash
     end
 
     def serialize_links(serializer)
@@ -85,34 +104,24 @@ module AmsHal
       end
     end
 
-    def serialize_associations(serializer)
+    def serialize_associations(serializer, adapter_options)
       serializer.associations.each_with_object({}) do |association, embedded|
-        object = serializer.object
-        if object&.respond_to? association.name
-          resource = object.public_send(association.name)
-        else
-          puts "WARN: Failed to get '#{association.name}' association from resource (#{object})"
-        end
-
-        next unless resource
-
-        if association.serializer.is_a? ActiveModel::Serializer::CollectionSerializer
-          # Not sure if this could happen and perhaps we should fail instead of create an array??
-          resource = [resource] unless resource.respond_to? :each
-
-          embedded[association.name] = resource.map do |resrc|
-            # FIXME: How to improve this?
-            serialize_embedded_resource(
-              resrc,
-              serializer: association.serializer.send(:options)[:serializer]
-            )
+        embedded[association.name] =
+          if association.serializer.nil? || association.serializer.object.nil?
+            # active_model_serializers <= 0.10.4 
+            object = serializer.object
+            resource = object.public_send(association.name)
+            serialized = [resource].flatten.map do |resrc|
+              serialize_embedded_resource(resrc, serializer: association.serializer&.class)
+            end
+            serialized.size == 1 ? serialized.first : serialized
+          elsif association.serializer.respond_to? :each
+            association.serializer.map do |_serializer|
+              serialize_resource(_serializer, instance_options, {skip_embedded: true})
+            end
+          else
+            serialize_resource(association.serializer, instance_options, {skip_embedded: true})
           end
-        else
-          embedded[association.name] = serialize_embedded_resource(
-            resource, 
-            serializer: association.serializer&.class
-          )
-        end
       end
     end
 

data/lib/ams_hal/embed.rb

@@ -4,9 +4,10 @@ module AmsHal
   class Embed
     include ActiveModelSerializers::SerializationContext::UrlHelpers
 
-    attr_reader :name, :options
+    attr_reader :serializer, :name, :options
 
     def initialize(serializer, name, options = {}, &block)
+      @serializer = serializer
       @name = name
       @options = options
       @block = block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ams_hal
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sammy Henningsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers