Merge pull request #176 from cerebris/pr/175

Check for key on association.type should reference unformatted key. Plus Tests

Author: lgebhardt

lib/jsonapi/request.rb

@@ -309,7 +309,7 @@ def parse_params(params, allowed_fields)
  if links_object.length == 0
  checked_has_many_associations[param] = []
  else
- if links_object.length > 1 || !links_object.has_key?(format_key(association.type))
+ if links_object.length > 1 || !links_object.has_key?(unformat_key(association.type).to_s)
  raise JSONAPI::Exceptions::TypeMismatch.new(links_object[:type])
  end
 

test/fixtures/active_record.rb

@@ -136,6 +136,15 @@
  t.timestamps null: false
  end
 
+ create_table :order_flags, force: true do |t|
+ t.string :name
+ end
+
+ create_table :purchase_orders_order_flags, force: true do |t|
+ t.references :purchase_order, :order_flag, index: true
+ end
+ add_index :purchase_orders_order_flags, [:purchase_order_id, :order_flag_id], unique: true, name: "po_flags_idx"
+
  create_table :line_items, force: true do |t|
  t.integer :purchase_order_id
  t.string :part_number
@@ -277,12 +286,22 @@ def remove(id)
 end
 
 class CustomerOrder < ActiveRecord::Base
+ has_many :purchase_orders
 end
 
 class PurchaseOrder < ActiveRecord::Base
+ belongs_to :customer
+ has_many :line_items
+
+ has_and_belongs_to_many :order_flags, join_table: :purchase_orders_order_flags
+end
+
+class OrderFlag < ActiveRecord::Base
+ has_and_belongs_to_many :purchase_orders, join_table: :purchase_orders_order_flags
 end
 
 class LineItem < ActiveRecord::Base
+ belongs_to :purchase_order
 end
 
 ### PORO Data - don't do this in a production app
@@ -422,6 +441,9 @@ class PurchaseOrdersController < JSONAPI::ResourceController
 
  class LineItemsController < JSONAPI::ResourceController
  end
+
+ class OrderFlagsController < JSONAPI::ResourceController
+ end
  end
 
  module V7
@@ -433,6 +455,9 @@ class PurchaseOrdersController < JSONAPI::ResourceController
 
  class LineItemsController < JSONAPI::ResourceController
  end
+
+ class OrderFlagsController < JSONAPI::ResourceController
+ end
  end
 end
 
@@ -817,6 +842,13 @@ class PurchaseOrderResource < JSONAPI::Resource
 
  has_one :customer
  has_many :line_items
+ has_many :order_flags, acts_as_set: true
+ end
+
+ class OrderFlagResource < JSONAPI::Resource
+ attributes :name
+
+ has_many :purchase_orders
  end
 
  class LineItemResource < JSONAPI::Resource
@@ -831,6 +863,7 @@ class LineItemResource < JSONAPI::Resource
  module V7
  CustomerResource = V6::CustomerResource.dup
  PurchaseOrderResource = V6::PurchaseOrderResource.dup
+ OrderFlagResource = V6::OrderFlagResource.dup
  LineItemResource = V6::LineItemResource.dup
  end
 end

test/fixtures/line_items.yml

@@ -1,11 +1,25 @@
 po_1_li_1:
+ id: 1
  purchase_order_id: 1
  part_number: 556324
  quantity: 1
  item_cost: 45.67
 
 po_1_li_2:
+ id: 2
  purchase_order_id: 1
  part_number: 79324231A
  quantity: 3
- item_cost: 19.99
+ item_cost: 19.99
+
+li_3:
+ id: 3
+ part_number: 79324231A
+ quantity: 67
+ item_cost: 19.99
+
+li_4:
+ id: 4
+ part_number: 5678
+ quantity: 2
+ item_cost: 199.99

test/fixtures/order_flags.yml

@@ -0,0 +1,7 @@
+rush_order_flag:
+ id: 1
+ name: Rush
+
+ship_together_order_flag:
+ id: 2
+ name: Ship Together

test/integration/requests/request_test.rb

@@ -564,4 +564,51 @@ def test_patch_formatted_dasherized
  assert_equal 200, status
  end
 
+ def test_patch_formatted_dasherized_links
+ JSONAPI.configuration.route_format = :dasherized_route
+ JSONAPI.configuration.json_key_format = :dasherized_key
+ patch '/api/v6/line-items/1',
+ {
+ 'data' => {
+ 'id' => '1',
+ 'type' => 'line-items',
+ 'item-cost' => '23.57',
+ 'links' => {
+ 'purchase-order' => {
+ 'linkage' => {'type' => 'purchase-orders', 'id' => '2'}
+ }
+ }
+ }
+ }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+ assert_equal 200, status
+ end
+
+ def test_patch_formatted_dasherized_replace_has_many
+ JSONAPI.configuration.route_format = :dasherized_route
+ JSONAPI.configuration.json_key_format = :dasherized_key
+ patch '/api/v6/purchase-orders/2?include=line-items,order-flags',
+ {
+ 'data' => {
+ 'id' => '2',
+ 'type' => 'purchase-orders',
+ 'links' => {
+ 'line-items' => {
+ 'linkage' => [
+ {'type' => 'line-items', 'id' => '3'},
+ {'type' => 'line-items', 'id' => '4'}
+ ]
+ },
+ 'order-flags' => {
+ 'linkage' => [
+ {'type' => 'order-flags', 'id' => '1'},
+ {'type' => 'order-flags', 'id' => '2'}
+ ]
+ }
+ }
+ }
+ }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+ assert_equal 200, status
+ end
 end