jsonapi-resources 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607d99c78950519019a9581a1de58a25019322af
-  data.tar.gz: 0bec458c528b73b4ef7084db5b23ddd7e8e7add3
+  metadata.gz: cb9861ed5743d9c77ca4ce7e502002c46016ae82
+  data.tar.gz: e0239d8a635a3d7667759721653d698f2aa3aac8
 SHA512:
-  metadata.gz: adb34843142599a98d7692d8783404fbbd4b6255455ad54606ba27a0069b3782e6e531ae50497052639e8d519bccd022b95215ffdb711d7e54f30a7a6c34a4dd
-  data.tar.gz: 6e130efc4dcd29ad65635f965669c15efe71a1de76edb36f08437094e42a348c4b0817a4c6e542c16d7026ca2b99cbad21c4bc9a4a78392e72b5ee508ba6d1ad
+  metadata.gz: c263872e74e45cb4d8c88b389c7e50b628206162a71709848260a6a52442b81fe9f4088ef9b9d30a5edca46093aee996f18792b9e27cc1a461ef65ba167c79f6
+  data.tar.gz: 7e2a98858d1aa50679dd04fc7870790b5ea9ec40c44bf2c4f7578f414a9bca68bd0bca5262470e223bb0aa6bf88c2d9d04d8637a81d1de711ca5cba6d3e1a613

data/lib/jsonapi/link_builder.rb

@@ -95,7 +95,12 @@ module JSONAPI
       scopes         = module_scopes_from_class(klass)[1..-1]
       base_path_name = scopes.map { |scope| scope.underscore }.join("_")
       end_path_name  = klass._type.to_s
-      "#{ base_path_name }_#{ end_path_name }_path"
+
+      if base_path_name.blank?
+        "#{ end_path_name }_path"
+      else
+        "#{ base_path_name }_#{ end_path_name }_path"
+      end
     end
 
     def format_route(route)

data/lib/jsonapi/resource.rb

@@ -423,6 +423,7 @@ module JSONAPI
       end
 
       def resource_for(type)
+        type = type.underscore
         type_with_module = type.include?('/') ? type : module_path + type
 
         resource_name = _resource_name_from_type(type_with_module)
@@ -539,10 +540,9 @@ module JSONAPI
       end
 
       def model_hint(model: _model_name, resource: _type)
-        model_name = ((model.is_a?(Class)) && (model < ActiveRecord::Base)) ? model.name : model
         resource_type = ((resource.is_a?(Class)) && (resource < JSONAPI::Resource)) ? resource._type : resource.to_s
 
-        _model_hints[model_name.to_s.gsub('::', '/').underscore] = resource_type.to_s
+        _model_hints[model.to_s.gsub('::', '/').underscore] = resource_type.to_s
       end
 
       def filters(*attrs)

data/lib/jsonapi/resource_serializer.rb

@@ -171,9 +171,9 @@ module JSONAPI
     end
 
     def links_hash(source)
-      {
-        self: link_builder.self_link(source)
-      }.merge(custom_links_hash(source)).compact
+      links = custom_links_hash(source)
+      links[:self] = link_builder.self_link(source) unless links.key?(:self)
+      links.compact
     end
 
     def custom_links_hash(source)
@@ -247,16 +247,12 @@ module JSONAPI
     end
 
     def to_one_linkage(source, relationship)
-      linkage = {}
-      linkage_id = foreign_key_value(source, relationship)
-
-      if linkage_id
-        linkage[:type] = format_key(relationship.type_for_source(source))
-        linkage[:id] = linkage_id
-      else
-        linkage = nil
-      end
-      linkage
+      return unless linkage_id = foreign_key_value(source, relationship)
+      return unless linkage_type = format_key(relationship.type_for_source(source))
+      {
+        type: linkage_type,
+        id: linkage_id,
+      }
     end
 
     def to_many_linkage(source, relationship)
@@ -264,7 +260,9 @@ module JSONAPI
       linkage_types_and_values = foreign_key_types_and_values(source, relationship)
 
       linkage_types_and_values.each do |type, value|
-        linkage.append({type: format_key(type), id: value})
+        if type && value
+          linkage.append({type: format_key(type), id: @id_formatter.format(value)})
+        end
       end
       linkage
     end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

metadata

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