Unformat the linkage type.

The linkage key was not being unformatted and was causing errors if there was a multiword key (because the raw key would not match the association name). This change unformats the key which fixes that bug.

Author: barelyknown

lib/jsonapi/request.rb

@@ -233,7 +233,7 @@ def parse_has_one_links_object(raw)
       end
 
       {
-        type: raw['type'],
+        type: unformat_key(raw['type']).to_s,
         id: raw['id']
       }
     end
@@ -281,7 +281,7 @@ def parse_params(params, allowed_fields)
               # Since we do not yet support polymorphic associations we will raise an error if the type does not match the
               # association's type.
               # ToDo: Support Polymorphic associations
-              if links_object[:type] && (links_object[:type] != association.type.to_s)
+              if links_object[:type] && (links_object[:type].to_s != association.type.to_s)
                 raise JSONAPI::Exceptions::TypeMismatch.new(links_object[:type])
               end
 

test/controllers/controller_test.rb

@@ -1648,6 +1648,28 @@ def test_create_validations
     assert_response :success
   end
 
+  def test_update_link_with_dasherized_type
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    set_content_type_header!
+    put :update,
+        {
+          id: 3,
+          data: {
+            id: '3',
+            type: 'people',
+            links: {
+              'hair-cut': {
+                linkage: {
+                  type: 'hair-cuts',
+                  id: '1'
+                }
+              }
+            }
+          }
+        }
+    assert_response :success
+  end
+
   def test_create_validations_missing_attribute
     set_content_type_header!
     post :create,
@@ -1705,37 +1727,46 @@ def test_valid_filter_value
   end
 
   def test_get_related_resource
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    JSONAPI.configuration.route_format = :underscored_key
     get :get_related_resource, {post_id: '2', association: 'author', :source=>'posts'}
     assert_response :success
-    assert_hash_equals json_response,
-                       {
-                         data: {
-                           id: '1',
-                           type: 'people',
-                           name: 'Joe Author',
-                           email: 'joe@xyz.fake',
-                           dateJoined: '2013-08-07 16:25:00 -0400',
-                           links: {
-                             self: 'http://test.host/people/1',
-                             comments: {
-                               self: 'http://test.host/people/1/links/comments',
-                               related: 'http://test.host/people/1/comments'
-                             },
-                             posts: {
-                               self: 'http://test.host/people/1/links/posts',
-                               related: 'http://test.host/people/1/posts'
-                             },
-                             preferences: {
-                               self: 'http://test.host/people/1/links/preferences',
-                               related: 'http://test.host/people/1/preferences',
-                               linkage: {
-                                 type: 'preferences',
-                                 id: '1'
-                               }
-                             }
-                           }
-                         }
-                       }
+    assert_hash_equals(
+      {
+        data: {
+         id: '1',
+         type: 'people',
+         name: 'Joe Author',
+         email: 'joe@xyz.fake',
+         "date-joined": '2013-08-07 16:25:00 -0400',
+         links: {
+           self: 'http://test.host/people/1',
+           comments: {
+             self: 'http://test.host/people/1/links/comments',
+             related: 'http://test.host/people/1/comments'
+           },
+           posts: {
+             self: 'http://test.host/people/1/links/posts',
+             related: 'http://test.host/people/1/posts'
+           },
+           preferences: {
+             self: 'http://test.host/people/1/links/preferences',
+             related: 'http://test.host/people/1/preferences',
+             linkage: {
+               type: 'preferences',
+               id: '1'
+             }
+           },
+           "hair-cut" => {
+             "self" => "http://test.host/people/1/links/hair_cut",
+             "related" => "http://test.host/people/1/hair_cut",
+             "linkage" => nil
+            }
+         }
+        }
+      },
+      json_response
+    )
   end
 
   def test_get_related_resource_nil

test/fixtures/active_record.rb

@@ -12,6 +12,7 @@
     t.string     :email
     t.datetime   :date_joined
     t.belongs_to :preferences
+    t.integer :hair_cut_id, index: true
     t.timestamps null: false
   end
 
@@ -142,6 +143,10 @@
     t.float    :item_cost
     t.timestamps null: false
   end
+
+  create_table :hair_cuts, force: true do |t|
+    t.string :style
+  end
 end
 
 ### MODELS
@@ -150,6 +155,7 @@ class Person < ActiveRecord::Base
   has_many :comments, foreign_key: 'author_id'
   has_many :expense_entries, foreign_key: 'employee_id', dependent: :restrict_with_exception
   belongs_to :preferences
+  belongs_to :hair_cut
 
   ### Validations
   validates :name, presence: true
@@ -439,6 +445,7 @@ class PersonResource < JSONAPI::Resource
   has_many :posts
 
   has_one :preferences
+  has_one :hair_cut
 
   filter :name
 
@@ -561,6 +568,11 @@ def self.verify_key(key, context = nil)
   end
 end
 
+class HairCutResource < JSONAPI::Resource
+  attribute :style
+  has_many :people
+end
+
 class IsoCurrencyResource < JSONAPI::Resource
   primary_key :code
   attributes :name, :country_name, :minor_unit
@@ -703,6 +715,7 @@ def subject
     PreferencesResource = PreferencesResource.dup
     EmployeeResource = EmployeeResource.dup
     FriendResource = FriendResource.dup
+    HairCutResource = HairCutResource.dup
   end
 end
 

test/fixtures/hair_cuts.yml

@@ -0,0 +1,3 @@
+mohawk:
+  id: 1
+  style: mohawk

test/unit/serializer/serializer_test.rb

@@ -131,6 +131,10 @@ def test_serializer_limited_fieldset
   end
 
   def test_serializer_include
+    serialized = JSONAPI::ResourceSerializer.new(
+      PostResource,
+      include: [:author]
+    ).serialize_to_hash(PostResource.new(@post))
 
     assert_hash_equals(
       {
@@ -189,16 +193,26 @@ def test_serializer_include
                  type: 'preferences',
                  id: '1'
                }
+             },
+             hairCut: {
+               self: "/people/1/links/hairCut",
+               related: "/people/1/hairCut",
+               linkage: nil
              }
             }
           }
         ]
       },
-      JSONAPI::ResourceSerializer.new(PostResource, include: [:author]).serialize_to_hash(
-        PostResource.new(@post)))
+      serialized
+    )
   end
 
   def test_serializer_key_format
+    serialized = JSONAPI::ResourceSerializer.new(
+      PostResource,
+      include: [:author],
+      key_formatter: UnderscoredKeyFormatter
+    ).serialize_to_hash(PostResource.new(@post))
 
     assert_hash_equals(
       {
@@ -257,14 +271,17 @@ def test_serializer_key_format
                   type: 'preferences',
                   id: '1'
                 }
+              },
+              hair_cut: {
+                self: '/people/1/links/hairCut',
+                related: '/people/1/hairCut',
+                linkage: nil
               }
             }
           }
         ]
       },
-      JSONAPI::ResourceSerializer.new(PostResource,
-                                      include: [:author],
-                                      key_formatter: UnderscoredKeyFormatter).serialize_to_hash(PostResource.new(@post))
+      serialized
     )
   end
 
@@ -565,6 +582,10 @@ def test_serializer_include_has_one_sub_objects_only
   end
 
   def test_serializer_different_foreign_key
+    serialized = JSONAPI::ResourceSerializer.new(
+      PersonResource,
+      include: ['comments']
+    ).serialize_to_hash(PersonResource.new(@fred))
 
     assert_hash_equals(
       {
@@ -592,6 +613,11 @@ def test_serializer_different_foreign_key
               self: "/people/2/links/preferences",
               related: "/people/2/preferences",
               linkage: nil
+            },
+            hairCut: {
+              self: "/people/2/links/hairCut",
+              related: "/people/2/hairCut",
+              linkage: nil
             }
           }
         },
@@ -654,7 +680,7 @@ def test_serializer_different_foreign_key
           }
         ]
       },
-      JSONAPI::ResourceSerializer.new(PersonResource, include: ['comments']).serialize_to_hash(PersonResource.new(@fred))
+      serialized
     )
   end