fields-serializer 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e400a352bb3a82691a3a0e11f694611b7c0dd8e
-  data.tar.gz: 96a8af0bc2f59735656c6546525556c68cf74153
+  metadata.gz: 0c69ba742be7a601aa3b70928bd749a19e84f6c3
+  data.tar.gz: 128cfbcae08a53cc86fd70048de78a55cc92a716
 SHA512:
-  metadata.gz: cf045e0197b430a1c5795286801ae966b9fc5199189780d36bf3a03b555c91ae0a9268b1629db2db3a678e8a0c9651aa51bc44b582977bcaeaf1b80a265017ad
-  data.tar.gz: 0c0915f5f3e81d2516252b9ee29e351e0b0d18f9afaad8c88d698604c7ee112d95120c4293b0659ae0a2b0055841cbfe1e572387d2d391702a41ba2d0192ac6c
+  metadata.gz: 2957720a227130ffde6970297fcd80d70f19a04f8560886b4c3a50414ae5eccb6d183eddedb7e408e0673804e191f03f1e52947def00fb6e4704ae188253c7ac
+  data.tar.gz: 2af0d594995d6ef16cacf4b2d23e3141a29ea37d8528288e8fca9682900c96b2494200718182db91c8565056227ffe2ac389081a0827cc987c244bda16c28fc2

data/lib/fields/serializer/active_record.rb

@@ -14,9 +14,7 @@ module Fields
         #  BoilerPack.fields_to_includes("id,boiler.gas_safe_code") #=> ["boiler"]
         #
         def fields_to_includes(fields)
-          flatten_fields = Array(fields).map { |str| str.to_s.split(",").map(&:strip) }.flatten
-          nested_fields  = flatten_fields.map { |field| nested_field(field.split(".")) }.compact
-          nested_fields.inject([{}]) do |result, attribute_structure|
+          nested_fields(fields).inject([{}]) do |result, attribute_structure|
             if attribute_structure.is_a?(Hash)
               result.first.deep_merge!(attribute_structure) { |_, u, v| u == v ? u : [u, v] }
             else
@@ -35,9 +33,17 @@ module Fields
 
         private
 
+        def array_fields(fields)
+          Array(fields).map { |str| str.to_s.split(",").map(&:strip) }.flatten
+        end
+
         def association?(key)
           reflections.keys.include?(key)
         end
+
+        def nested_fields(fields)
+          array_fields(fields).map { |field| nested_field(field.split(".")) }.compact.uniq
+        end
       end
     end
   end

data/lib/fields/serializer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fields-serializer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Stuart Chinery
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler