jsonapi-resources 0.8.0.beta2 → 0.8.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6619fb440bc0c0441a39af1623ba5b9b28ac7b86
-  data.tar.gz: daa7f4b1e08fa81c03063269ea7637afa8375229
+  metadata.gz: a4b1520ce7f6d1b74c8b973ed7572e618a5b2d56
+  data.tar.gz: f1b2db023f75304968c0496c18034c989e58a043
 SHA512:
-  metadata.gz: c3966400df28279c2bdc1c4af30f13003d119866e272667c5796b7cd32eb6f55eab26290169a918ff13e8579ec586863da6ebfa21aa2e97c4925c68a57df110f
-  data.tar.gz: eaf11f0fa4bfe023d7bc75ce6441ace0112d6aa1f9281574dc74944c3b7525cf90ec96989510474fe4d6690966d1c046ed82af130e698f607de2f9ad84dbfaf6
+  metadata.gz: 9081c928a83cc37d2c944fc183171841072bd153d25cb901baf2c368a6d7d97e87016ac22f995231685046ab9edea4d098b55552222efae78cb2bbbe38dc08f8
+  data.tar.gz: 6d57fe3e8b70df7b82cf9095f0f5b15800d6f541d82533f9825b7df22de0aa201bed304861370745e80c4d11f725db4d0ecc529d99e3fb9f6fc29e49b32b81b7

data/lib/jsonapi/processor.rb

@@ -141,6 +141,7 @@ module JSONAPI
       source_id = params[:source_id]
       relationship_type = params[:relationship_type]
       filters = params[:filters]
+      include_directives = params[:include_directives]
       sort_criteria = params[:sort_criteria]
       paginator = params[:paginator]
       fields = params[:fields]
@@ -149,7 +150,8 @@ module JSONAPI
 
       related_resources = source_resource.public_send(relationship_type,
                                                       context: context,
-                                                      filters:  filters,
+                                                      filters: filters,
+                                                      include_directives: include_directives,
                                                       sort_criteria: sort_criteria,
                                                       paginator: paginator,
                                                       fields: fields)

data/lib/jsonapi/relationship_builder.rb

@@ -129,7 +129,9 @@ module JSONAPI
           records = resource_klass.apply_filters(records, filters, options)
         end
 
-        sort_criteria =  options.fetch(:sort_criteria, {})
+        records = resource_klass.apply_includes(records, options)
+
+        sort_criteria = options.fetch(:sort_criteria, {})
         unless sort_criteria.nil? || sort_criteria.empty?
           order_options = relationship.resource_klass.construct_order_options(sort_criteria)
           records = resource_klass.apply_sort(records, order_options, @context)

data/lib/jsonapi/resource_serializer.rb

@@ -348,7 +348,7 @@ module JSONAPI
       @included_objects[type] = {} unless @included_objects.key?(type)
 
       if already_serialized?(type, id)
-        @included_objects[type][id][:object_hash].merge!(object_hash)
+        @included_objects[type][id][:object_hash].deep_merge!(object_hash)
         set_primary(type, id) if primary
       else
         @included_objects[type].store(id, primary: primary, object_hash: object_hash)

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.8.0.beta2'
+    VERSION = '0.8.0.beta3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta2
+  version: 0.8.0.beta3
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler