jsonapi_compliable 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9138437a5f6cf6613987e8f84a8822d1cf2c84e4
-  data.tar.gz: 16ac6bf944f5f04e3573fd8e033a90d83658a97d
+  metadata.gz: 581276bd4edc803209be48bec1f03a72ffad2bd4
+  data.tar.gz: bda4a188aaecfab0a92b7f5bd70c45b5d7265420
 SHA512:
-  metadata.gz: e5eb95f420f9811808b528d5e73e40e8f0279e829d307aaaeda6d1127fe3e99d897ce63d56a47b8e3a6ee3b3b25a902d51af68c7bd4a7c7e57a3744a3b721423
-  data.tar.gz: d2cb8c48650ca2c1be14683e0bef55f354153efe7d7189d3803d521dd7f22befc34cda32f027810330358e6c81c219d7d401e4382343e2d3b06886601ba00c86
+  metadata.gz: 341611451bd572895934709477ec7e974a47d7f5dd6decdb00a70b9ce724ed70b2a7ca0552f0be9e4a6afad91d94faff38c608f960ceb009587bd8a75c524e4e
+  data.tar.gz: 5870888b34b6caf62018c6ef69c7703c074126c6cf339ba49173cfe31b64eda2d930cf3bcd0da7906ec660949bfc091e8d0b924fcfe89ed4679af0268d5f18ea

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    jsonapi_compliable (0.6.1)
+    jsonapi_compliable (0.6.3)
       jsonapi-serializable (~> 0.1)
 
 GEM

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    jsonapi_compliable (0.6.1)
+    jsonapi_compliable (0.6.3)
       jsonapi-serializable (~> 0.1)
 
 GEM

data/lib/jsonapi_compliable/sideload.rb

@@ -75,36 +75,32 @@ module JsonapiCompliable
     end
 
     # Grab from nested sideloads, AND resource, recursively
-    # To prevent circular relationships (author resource sideloads
-    # books and books resource sideloads authors), this allows
-    # sideloading up to 10 levels deep into the nesting of relationships
-    # We may want to make this configurable (possible at runtime), or
-    # maybe there is a better pattern here
-    def to_hash(levels_deep = 0)
-      levels_deep += 1
-      return {} if levels_deep == 10
-
-      { name => {} }.tap do |hash|
+    def to_hash(processed = [])
+      return { name => {} } if processed.include?(self)
+      processed << self
+
+      result = { name => {} }.tap do |hash|
         @sideloads.each_pair do |key, sideload|
-          hash[name][key] = sideload.to_hash(levels_deep)[key] || {}
+          hash[name][key] = sideload.to_hash(processed)[key] || {}
 
           if sideload.polymorphic?
             sideload.polymorphic_groups.each_pair do |type, sl|
-              hash[name][key].merge!(nested_sideload_hash(sl, levels_deep))
+              hash[name][key].merge!(nested_sideload_hash(sl, processed))
             end
           else
-            hash[name][key].merge!(nested_sideload_hash(sideload, levels_deep))
+            hash[name][key].merge!(nested_sideload_hash(sideload, processed))
           end
         end
       end
+      result
     end
 
     private
 
-    def nested_sideload_hash(sideload, levels_deep)
+    def nested_sideload_hash(sideload, processed)
       {}.tap do |hash|
         if sideloading = sideload.resource_class.sideloading
-          hash.merge!(sideloading.to_hash(levels_deep)[:base])
+          hash.merge!(sideloading.to_hash(processed)[:base])
         end
       end
     end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable