fields-serializer 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db691b14752c0a91e789dc56e7e10bb85b71f606
-  data.tar.gz: bc53b7a7f16bf45686d71464e85795f769c488d4
+  metadata.gz: 026a3b888bceb7ead4ec323dfb6a8f5d32b0530c
+  data.tar.gz: 1465d275c0d1999835a1b16306c488343654e20d
 SHA512:
-  metadata.gz: 8073ccef183f83a57edb61c4bfe49fbcc83f9ab13f114f64ce09534cbd24fa9de47f1bfd1cef67e18c710e669ec32f02b0f76589679e5896971a5f8897deb99b
-  data.tar.gz: 5f8d7e63bf56b6210b7c4f50374c2e2cd52cd1bf8d3d75f4552e2ac25b186baa4a87b36ba5a5553ebbbbf77d50c0e1b97089a8b055da2b92c08a865c96ec2f3e
+  metadata.gz: 72bc247fb4b38e878af011e3fa2a96f4e8bac7b57696dc2b48f9375ff462f04e6b49a9f2966f18a78c939a35720ded20e20b18439ef6d3adddedd2e88e8ba4f9
+  data.tar.gz: 54127c8b3f4e09f5d7c04e01780862ce08de6368ff0dfde49be85f600437022968e0d2ee9167b674acd7e7ceecd51a3ffe734234aa29baf012ba9f32ecce8e5f

data/lib/fields/serializer/action_controller.rb

@@ -17,9 +17,10 @@ module Fields
         fields      = options.delete(:fields)
         model_class = options.delete(:model_class)
         if fields.present?
-          query = query.includes(*model_class.fields_to_includes(fields))
-          options.merge!(each_serializer: FieldSerializer, fields: Array(fields))
-          options.delete(:include)
+          includes = model_class.fields_to_includes(fields)
+          query    = query.includes(*includes)
+          # options.merge!(include: model_class.fields_to_include(includes).join(","))
+          options.merge!(include: includes)
         end
         render options.merge!(json: query.to_a)
       end

data/lib/fields/serializer/active_record.rb

@@ -24,6 +24,23 @@ module Fields
           end.map(&:presence).compact
         end
 
+        # Convert a list of fields (json_api notation) in a list of associations to be
+        # added to a ActiveRecord Model.includes call
+        #
+        # Example:
+        #
+        #  BoilerPack.fields_to_includes("id,boiler.gas_safe_code") #=> ["boiler"]
+        #
+        def fields_to_include(fields, root: nil)
+          Array(fields).map do |field|
+            if field.kind_of?(Hash) || field.kind_of?(Array)
+              field.map { |k, v| fields_to_include(v, root: composite_field(root, k)) }
+            else
+              composite_field(root, field)
+            end
+          end.flatten
+        end
+
         def nested_field(attribute_stack)
           parent = attribute_stack.first
           return unless association?(parent)
@@ -41,6 +58,10 @@ module Fields
           reflections.keys.include?(key)
         end
 
+        def composite_field(*values)
+          values.compact.join(".")
+        end
+
         def nested_fields(fields)
           array_fields(fields).map { |field| nested_field(field.split(".")) }.compact.uniq
         end

data/lib/fields/serializer/version.rb

@@ -1,5 +1,5 @@
 module Fields
   module Serializer
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

metadata

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