jsonapi_compliable 0.9.0 → 0.9.1

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Jun  7 10:15:09 2017 by
+  Generated on Thu Sep 28 17:28:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.3.0).
 </div>

data/lib/jsonapi_compliable/sideload.rb

@@ -43,6 +43,21 @@ module JsonapiCompliable
       extend @resource_class.config[:adapter].sideloading_module
     end
 
+    # @api private
+    def self.max_depth
+      @max_depth || 2
+    end
+
+    # Set maximum levels of sideload recursion
+    # /authors?comments.authors would be one level
+    # /authors?comments.authors.comments.authors would be two levels
+    # etc
+    #
+    # Default max depth is 2
+    def self.max_depth=(val)
+      @max_depth = val
+    end
+
     # @see #resource_class
     # @return [Resource] an instance of +#resource_class+
     def resource
@@ -331,6 +346,19 @@ module JsonapiCompliable
       @sideloads[name]
     end
 
+    # @api private
+    def all_sideloads
+      {}.tap do |all|
+        if polymorphic?
+          polymorphic_groups.each_pair do |type, sl|
+            all.merge!(sl.resource.sideloading.all_sideloads)
+          end
+        else
+          all.merge!(@sideloads.merge(resource.sideloading.sideloads))
+        end
+      end
+    end
+
     # Looks at all nested sideload, and all nested sideloads for the
     # corresponding Resources, and returns an Include Directive hash
     #
@@ -354,27 +382,20 @@ module JsonapiCompliable
     #
     # @return [Hash] The nested include hash
     # @api private
-    def to_hash(processed = [])
-      # Cut off at 5 recursions
-      if processed.select { |p| p == self }.length == 5
-        return { name => {} }
-      end
-      processed << self
+    def to_hash(depth_chain = [], parent = nil)
+      depth = depth_chain.select { |arr| arr == [parent, self] }.length
+      return {} if depth >= self.class.max_depth
 
-      result = { name => {} }.tap do |hash|
-        @sideloads.each_pair do |key, sideload|
-          hash[name][key] = sideload.to_hash(processed)[key] || {}
+      unless (parent && parent.name == :base) || name == :base
+        depth_chain += [[parent, self]]
+      end
 
-          if sideload.polymorphic?
-            sideload.polymorphic_groups.each_pair do |type, sl|
-              hash[name][key].merge!(nested_sideload_hash(sl, processed))
-            end
-          else
-            hash[name][key].merge!(nested_sideload_hash(sideload, processed))
-          end
+      { name => {} }.tap do |hash|
+        all_sideloads.each_pair do |key, sl|
+          sideload_hash = sl.to_hash(depth_chain, self)
+          hash[name].merge!(sideload_hash)
         end
       end
-      result
     end
 
     # @api private

data/lib/jsonapi_compliable/util/relationship_payload.rb

@@ -47,6 +47,7 @@ module JsonapiCompliable
           type     = relationship_payload[:meta][:jsonapi_type]
           sideload = sideload.polymorphic_child_for_type(type)
         end
+        relationship_payload[:meta][:method] ||= :update
 
         {
           sideload: sideload,

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs