jsonapi_compliable 0.10.0 → 0.10.1

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Oct  3 09:22:25 2017 by
+  Generated on Tue Oct  3 14:55:06 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/query.rb

@@ -173,9 +173,11 @@ module JsonapiCompliable
     end
 
     def parse_include(memo, incl_hash, namespace)
+      memo[namespace] ||= self.class.default_hash
       memo[namespace].merge!(include: incl_hash)
 
       incl_hash.each_pair do |key, sub_hash|
+        key = Util::Sideload.namespace(namespace, key)
         memo.merge!(parse_include(memo, sub_hash, key))
       end
 

data/lib/jsonapi_compliable/scope.rb

@@ -81,7 +81,8 @@ module JsonapiCompliable
 
       includes.each_pair do |name, nested|
         sideload = @resource.sideload(name)
-        sideload.resolve(results, @query)
+        namespace = Util::Sideload.namespace(@namespace, sideload.name)
+        sideload.resolve(results, @query, namespace)
       end
     end
 

data/lib/jsonapi_compliable/sideload.rb

@@ -264,9 +264,7 @@ module JsonapiCompliable
     # @see Resource#with_context
     # @return [void]
     # @api private
-    def resolve(parents, query, namespace = nil)
-      namespace ||= name
-
+    def resolve(parents, query, namespace)
       if polymorphic?
         resolve_polymorphic(parents, query)
       else

data/lib/jsonapi_compliable/util/sideload.rb

@@ -0,0 +1,33 @@
+module JsonapiCompliable
+  module Util
+    # @api private
+    class Sideload
+      # Determine the namespace for the sideload
+      #
+      # In other words, given a query like
+      # /things?include=a.b
+      #
+      # When 'a' is sideloading 'b', b's namespace is 'b'.
+      #
+      # However, consider a recursive tree structure:
+      #
+      # /things?include=children.children
+      #
+      # The first occurrance of "children" will have the namespace
+      # "children", the second will be "children.children" and so forth.
+      #
+      # This is used to match up other criteria in the query:
+      #
+      # ?filter[children.children][a]=b
+      #
+      # @api private
+      def self.namespace(a, b)
+        if a.to_s.split('.')[0] == b.to_s
+          :"#{a}.#{b}"
+        else
+          b
+        end
+      end
+    end
+  end
+end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/jsonapi_compliable.rb

@@ -22,6 +22,7 @@ require "jsonapi_compliable/util/hash"
 require "jsonapi_compliable/util/relationship_payload"
 require "jsonapi_compliable/util/persistence"
 require "jsonapi_compliable/util/validation_response"
+require "jsonapi_compliable/util/sideload"
 
 # require correct jsonapi-rb before extensions
 if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Lee Richmond
@@ -183,6 +183,7 @@ files:
 - docs/JsonapiCompliable/Util/Persistence.html
 - docs/JsonapiCompliable/Util/RelationshipPayload.html
 - docs/JsonapiCompliable/Util/RenderOptions.html
+- docs/JsonapiCompliable/Util/Sideload.html
 - docs/JsonapiCompliable/Util/ValidationResponse.html
 - docs/_index.html
 - docs/class_list.html
@@ -243,6 +244,7 @@ files:
 - lib/jsonapi_compliable/util/persistence.rb
 - lib/jsonapi_compliable/util/relationship_payload.rb
 - lib/jsonapi_compliable/util/render_options.rb
+- lib/jsonapi_compliable/util/sideload.rb
 - lib/jsonapi_compliable/util/validation_response.rb
 - lib/jsonapi_compliable/version.rb
 homepage: