jsonapi-resources 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f77e572b55d7703ae7464eb2cc9d90c6d70a9c7
-  data.tar.gz: 0d7e83c12752c0956068b8e6087174518d27ef8d
+  metadata.gz: 7354d2936f1ae7ba14a27b816ba9e9a0b34b0b13
+  data.tar.gz: 5dc38e6256771df238ddefd326eae64c72955113
 SHA512:
-  metadata.gz: 060bbad86c169a604f0a98f316023fa8d632fd3df406a35b37bf7c4db2d7d770b74c5172aa3270a70a04a091e5126a291f2517d586ee5a32d0f198372e353b27
-  data.tar.gz: 3c58a190c4d755d322c6643f00450a65308ee21c514ae1c89cd466f8e4adfa20976ab1fbd115c5dcb31d4c352ad5afae932fbf3ca0e030027cd32c75eae524f8
+  metadata.gz: 8ffb7b64c39241f8579ca839c46926c2f90a83335bcff101b46b8eb708f4478c8c9b80ba493aa1991a46a0f995b7d395367372d71b6c01ab97edb7266c1674dc
+  data.tar.gz: 73b910fe3ef9a75f4b10b2a4bd576e68c42cdcb33224d3f72dc38743cd7808c5b8d54722ca9502787f66183e5a9f28d6131e4afebdda927f3427edabe2fd8349

data/lib/jsonapi/exceptions.rb

@@ -284,6 +284,11 @@ module JSONAPI
       attr_accessor :messages
       def initialize(messages)
         @messages = messages
+        @key_formatter = JSONAPI.configuration.key_formatter
+      end
+
+      def format_key(key)
+        @key_formatter.format(key)
       end
 
       def errors
@@ -292,7 +297,7 @@ module JSONAPI
             element[1].map do |message|
               JSONAPI::Error.new(code: JSONAPI::VALIDATION_ERROR,
                                  status: :unprocessable_entity,
-                                 title: "#{element[0]} - #{message}",
+                                 title: "#{format_key(element[0])} - #{message}",
                                  detail: message,
                                  path: "/#{element[0]}")
             end

data/lib/jsonapi/request.rb

@@ -309,7 +309,7 @@ module JSONAPI
               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
 

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/test/controllers/controller_test.rb

@@ -1684,7 +1684,7 @@ class PeopleControllerTest < ActionController::TestCase
     assert_equal 2, json_response['errors'].size
     assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][0]['code']
     assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][1]['code']
-    assert_match /date_joined - can't be blank/, response.body
+    assert_match /dateJoined - can't be blank/, response.body
     assert_match /name - can't be blank/, response.body
   end
 

data/test/fixtures/active_record.rb

@@ -136,6 +136,15 @@ ActiveRecord::Schema.define do
     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 @@ class BreedData
 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 @@ module Api
 
     class LineItemsController < JSONAPI::ResourceController
     end
+
+    class OrderFlagsController < JSONAPI::ResourceController
+    end
   end
 
   module V7
@@ -433,6 +455,9 @@ module Api
 
     class LineItemsController < JSONAPI::ResourceController
     end
+
+    class OrderFlagsController < JSONAPI::ResourceController
+    end
   end
 end
 
@@ -817,6 +842,13 @@ module Api
 
       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 @@ module Api
   module V7
     CustomerResource = V6::CustomerResource.dup
     PurchaseOrderResource = V6::PurchaseOrderResource.dup
+    OrderFlagResource = V6::OrderFlagResource.dup
     LineItemResource = V6::LineItemResource.dup
   end
 end

data/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

data/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

data/test/integration/requests/request_test.rb

@@ -564,4 +564,51 @@ class RequestTest < ActionDispatch::IntegrationTest
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ files:
 - test/fixtures/hair_cuts.yml
 - test/fixtures/iso_currencies.yml
 - test/fixtures/line_items.yml
+- test/fixtures/order_flags.yml
 - test/fixtures/people.yml
 - test/fixtures/posts.yml
 - test/fixtures/posts_tags.yml
@@ -214,6 +215,7 @@ test_files:
 - test/fixtures/hair_cuts.yml
 - test/fixtures/iso_currencies.yml
 - test/fixtures/line_items.yml
+- test/fixtures/order_flags.yml
 - test/fixtures/people.yml
 - test/fixtures/posts.yml
 - test/fixtures/posts_tags.yml