fields-serializer 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4eb7b537453470e5785c408759a7cefd465931b
-  data.tar.gz: 6aeab9610fdc44c06d6555f7a2a2f32d0ad3f7ba
+  metadata.gz: 0a40d814b11b8a789f079dd17c01cd6da9ef08a9
+  data.tar.gz: b107747d4a6d73b2e23616db6af21ad986108e96
 SHA512:
-  metadata.gz: 11d02a736631a8580b55a550718a70315354f48a68a3afa742db813145da57e179c62a376d6ea53095e8b8829437cd580d03e93f7386e42c96cebd48852d4b53
-  data.tar.gz: 04c6ea5ce89247bb960c760f1efff1eb4713f719ef2dd53f629571bc4a1e26663cd640afe07a769659a8b285017e81ce4b26fed0ae4231496311456f82a5cff1
+  metadata.gz: a10e3adab1752e273bbef998e232cf8e9a466cfe92ec8cfc1ae7c7b2418fe3b3e1167265380e3119de7c4ab3b4b03991e61ea1ceda9613a2670df3728f0db004
+  data.tar.gz: 2b5c1a57588956d70ca910535bbe8cc0de4100ad0b3152e5fb04d078fbc1c129a0316f092ab00fd12cde9c667be7281c27b6d3473c1b54324b589a92753aa25a

data/lib/fields/serializer/fields_tree.rb

@@ -14,6 +14,7 @@ module Fields
         @associations = {}
       end
       
+      # Self if any fields or associations. Nil otherwise
       def presence
         self if fields.present? || associations.present?
       end
@@ -27,13 +28,9 @@ module Fields
       #     #=> [:name, :surname, { subjects: [:title, { posts: [{ comments: :count }, :date] }], followers: :nickname }]
       #
       def merge!(join_field)
-        return self unless join_field.present?
+        return self if join_field.blank?
         parent, rest = join_field.to_s.split(".", 2)
-        if rest.blank?
-          fields << parent if !(existing_field?(parent) || association?(parent))
-        else
-          existing_association?(parent) ? associations[parent].merge!(rest) : add_association!(parent, rest)
-        end
+        rest.present? ? add_association!(parent, rest) : add_field!(parent)
         self
       end
       
@@ -43,14 +40,11 @@ module Fields
       #     #=> [:name, :surname, { subjects: [:title, { posts: :comments }], followers: :nickname }]
       #
       def notation
-        if fields.present?
-          if associations.present?
-            fields.dup << associations_to_notation
-          else
-            fields.one? ? fields.first.dup : fields.dup
-          end
+        return associations_to_notation.presence if fields.blank?
+        if associations.present?
+          fields.dup << associations_to_notation
         else
-          associations_to_notation.presence
+          fields.one? ? fields.first.dup : fields.dup
         end
       end
 
@@ -60,15 +54,12 @@ module Fields
       #     #=> [{ subjects: { posts: :comments }}, :followers]
       #
       def to_includes
-        to_includes = associations.inject([]) do |result, (k, v)|
-          v_includes = v.to_includes
-          if v_includes.present?
-            new_has_entry = { k => v_includes }
-            hash = result.find { |e| e.is_a?(Hash) }
-            hash ? hash.merge!(new_has_entry) : (result << new_has_entry)
-            result
+        to_includes = associations.inject([]) do |result, (association_name, association_tree)|
+          association_includes = association_tree.to_includes
+          if association_includes.present?
+            add_association_includes_to_includes!(result, association_name, association_includes)
           else
-            result << k
+            add_association_to_includes!(result, association_name)
           end
         end.presence
         Array.wrap(to_includes).one? ? to_includes.first : to_includes
@@ -81,6 +72,21 @@ module Fields
       private
       
       def add_association!(parent, rest)
+        existing_association?(parent) ? merge_association!(parent, rest) : append_association!(parent, rest)
+      end
+
+      def add_association_includes_to_includes!(includes, association_name, association_includes)
+        new_has_entry = { association_name => association_includes }
+        includes_hash = includes.find { |e| e.is_a?(Hash) }
+        includes_hash ? includes_hash.merge!(new_has_entry) : (includes << new_has_entry)
+        includes
+      end
+
+      def add_association_to_includes!(includes, association_name)
+        includes << association_name
+      end
+
+      def append_association!(parent, rest)
         if association?(parent)
           nested_class       = klass.reflections[parent].klass
           nested_fields_tree = FieldsTree.new(nested_class).merge!(rest).presence
@@ -88,6 +94,14 @@ module Fields
           associations.merge!(new_association) if new_association
         end
       end
+
+      def add_field!(value)
+        fields << value if new_field?(value)
+      end
+
+      def association?(value)
+        klass.reflections.keys.include?(value)
+      end
       
       def associations_to_notation
         associations.inject({}) do |result, (k, v)|
@@ -103,8 +117,12 @@ module Fields
         fields.include?(value)
       end
 
-      def association?(value)
-        klass.reflections.keys.include?(value)
+      def merge_association!(key, fields)
+        associations[key].merge!(fields)
+      end
+
+      def new_field?(value)
+        !existing_field?(value) && !association?(value)
       end
     end
   end

data/lib/fields/serializer/version.rb

@@ -1,5 +1,5 @@
 module Fields
   module Serializer
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

metadata

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