jsonapi-resources 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc3aa84a3eee153f95a97c3d982e6fef51146998c0860ed4986f3c3911eb5c4
-  data.tar.gz: c75e87dad876b378b4aef634c7103b6399b171b8392831b1a0365146c82c02f9
+  metadata.gz: 180872f33ad6e44850227f9cf657698541cfdc495bba54b818f2be82591ffbe4
+  data.tar.gz: e524645c43739882441606fe00d272092177f4b792d6a6f5d4fc09f444eef073
 SHA512:
-  metadata.gz: a35bf550f5cdd014236b4ec680526bc1041a024644ba83a036e1d57c2c7e837456f713ad7f3f4bca95bacf7cc50bc7588fcfdf3550c96eb3802bf086a48dac43
-  data.tar.gz: b322f9b3d22e6a3667f4b938559c3cf73af93fc54ad18311b443acafce36594cac7e2c8166c3b204e9ef50b07cb39f17b39edcbfa342d7a41434b359e7c9bd35
+  metadata.gz: 7048b19d34a04968deee31dd728373abf15c4707ec937544479e68129f0caeb14a7199b2195b9c2944f57887f76d34527e49a3e30a9d1afe2c6739a29ca1c40c
+  data.tar.gz: 2d9c25c7775f7eeae4f73c2129cd60b16e44fe1c419915e02ba30ea0dbda49f60db3f176d640d535544fd5191551d0e7ea49df0ccc44e875659155a7e98abf3d

data/lib/jsonapi/link_builder.rb

@@ -150,12 +150,14 @@ module JSONAPI
 
     def related_url_helper_name(relationship)
       relationship_parts = resource_path_parts_from_class(relationship.parent_resource)
+      relationship_parts << "related"
       relationship_parts << relationship.name
       url_helper_name_from_parts(relationship_parts)
     end
 
     def singleton_related_url_helper_name(relationship)
       relationship_parts = []
+      relationship_parts << "related"
       relationship_parts << relationship.name
       relationship_parts += resource_path_parts_from_class(relationship.parent_resource)
       url_helper_name_from_parts(relationship_parts)

data/lib/jsonapi/resource.rb

@@ -680,7 +680,7 @@ module JSONAPI
         include_directives = options[:include_directives]
         if include_directives
           model_includes = resolve_relationship_names_to_relations(self, include_directives.model_includes, options)
-          records = records.includes(model_includes)
+          records = records.includes(model_includes) if model_includes.present?
         end
 
         records

data/lib/jsonapi/resource_serializer.rb

@@ -418,6 +418,7 @@ module JSONAPI
             [obj.type.underscore.pluralize, obj.id]
           end
         else
+          assoc = assoc.unscope(:includes) if assoc.is_a?(ActiveRecord::Relation)
           assoc.pluck(:type, :id).map do |type, id|
             [type.underscore.pluralize, id]
           end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.9.7'
+    VERSION = '0.9.8'
   end
 end

data/lib/jsonapi/routing_ext.rb

@@ -235,7 +235,7 @@ module ActionDispatch
           match formatted_relationship_name, controller: options[:controller],
                 relationship: relationship.name, source: resource_type_with_module_prefix(source._type),
                 action: 'get_related_resource', via: [:get],
-                as: relationship_name
+                as: "related/#{relationship_name}"
         end
 
         def jsonapi_related_resources(*relationship)
@@ -253,7 +253,7 @@ module ActionDispatch
                 controller: options[:controller],
                 relationship: relationship.name, source: resource_type_with_module_prefix(source._type),
                 action: 'get_related_resources', via: [:get],
-                as: relationship_name
+                as: "related/#{relationship_name}"
         end
 
         protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler