fields-serializer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda8e4765ff737edeef8212adfd6a26f6dd7b34a
-  data.tar.gz: f7e82c6a454e90a08769d3fe7cfa4aea2c50bc3a
+  metadata.gz: 8e400a352bb3a82691a3a0e11f694611b7c0dd8e
+  data.tar.gz: 96a8af0bc2f59735656c6546525556c68cf74153
 SHA512:
-  metadata.gz: e61f04ad8ab6300ad6f64b271bcead2c14c70782b8a784459d1d3689dd04d2265b76bfc9941e4b9a00e2e60b309052fb4fbb4e48e0aa97098d22d95832953f61
-  data.tar.gz: 2c23058024f59904d56f3a9cd1fca0e19751cb52eb50999a2231196e69c95eafb302aa30908c9c62deb83dbc9623f964b5b3d8ac53bacabc26f5c6e8be49c5b2
+  metadata.gz: cf045e0197b430a1c5795286801ae966b9fc5199189780d36bf3a03b555c91ae0a9268b1629db2db3a678e8a0c9651aa51bc44b582977bcaeaf1b80a265017ad
+  data.tar.gz: 0c0915f5f3e81d2516252b9ee29e351e0b0d18f9afaad8c88d698604c7ee112d95120c4293b0659ae0a2b0055841cbfe1e572387d2d391702a41ba2d0192ac6c

data/lib/fields/serializer/field_serializer.rb

@@ -26,15 +26,15 @@ class FieldSerializer < ActiveModel::Serializer
 
   def create_attribute_structure(attribute_stack, model)
     return model unless model.present?
-    parent = attribute_stack.shift
-    if attribute_stack.count > 0
-      if model.kind_of?(Array)
-        collection_attribute_structure(model, attribute_stack, parent)
+    if model.kind_of?(ActiveRecord::Relation)
+      collection_attribute_structure(model, attribute_stack)
+    else
+      parent = attribute_stack.first
+      if attribute_stack.count > 1
+        attribute_structure(model, attribute_stack[1..-1], parent)
       else
-        attribute_structure(model, attribute_stack, parent)
+        value_structure(model, parent)
       end
-    else
-      value_structure(model, parent)
     end
   end
 
@@ -42,8 +42,8 @@ class FieldSerializer < ActiveModel::Serializer
     { parent => create_attribute_structure(attribute_stack, model.send(parent)) }
   end
 
-  def collection_attribute_structure(models, attribute_stack, parent)
-    models.map { |model| attribute_structure(model, attribute_stack, parent) }
+  def collection_attribute_structure(models, attribute_stack)
+    models.map { |model| create_attribute_structure(attribute_stack, model) }.compact
   end
 
   def merging_attributes(&block)

data/lib/fields/serializer/version.rb

@@ -1,5 +1,5 @@
 module Fields
   module Serializer
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fields-serializer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stuart Chinery