jsonapi-resources 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9dfa52ac05f532050b9740a884e624b27f40dcc
-  data.tar.gz: 515bc38bde0559a474dcfbc7ec9891a9cc79d1eb
+  metadata.gz: ab4c4a0d0d8f176e2085aee265a0d0678876c8bd
+  data.tar.gz: 04ea25473f89a0bf77df0778b2ebaa7d4dd3aa8d
 SHA512:
-  metadata.gz: c47e723f53c1b0d30ef1ab99f19841b5c1bb6ed808a441739d3d065e3e7ef57513881f7644a579766eb652df57d280a98eaa6c44f3d57c53f7158a5a045e50e5
-  data.tar.gz: 2644748a35a9e4de7554be0627068a044611600f43195ddf41fd28be1f33cd5df4d047605d74f950efccd9df3b48a968f2e42dd3c6846195fb5916cf126a182a
+  metadata.gz: b19b8f700405d1caf6d676a1d984d8d2e0a82aa3d0df31b140d26484f318e74fc94311b4744e40d16ca7bf900a64a27a86351fe588bdee413569da5bbc299c63
+  data.tar.gz: 09b9a7ac8901f2b3c6ff218b8680c8cc313d806cfbd472989623f94871d95466375b6929cbfb2d48105799598a2fdeeee67fd27915fc054e1f53ea191a469d55

data/lib/jsonapi/operation.rb

@@ -158,7 +158,7 @@ module JSONAPI
     end
 
     def records
-      related_resource_records = source_resource.records_for(@relationship_type)
+      related_resource_records = source_resource.public_send(@relationship_type)
       @resource_klass.filter_records(@filters, @options, related_resource_records)
     end
 

data/lib/jsonapi/resource.rb

@@ -111,8 +111,8 @@ module JSONAPI
 
     # Override this on a resource to customize how the associated records
     # are fetched for a model. Particularly helpful for authorization.
-    def records_for(relationship_name, _options = {})
-      model.public_send relationship_name
+    def records_for(relation_name, _options = {})
+      model.public_send relation_name
     end
 
     private

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
   end
 end

data/test/fixtures/active_record.rb

@@ -1026,6 +1026,8 @@ module Api
         end
       }
 
+      has_many :aliased_comments, class_name: 'BookComments', relation_name: :approved_book_comments
+
       filters :banned, :book_comments
 
       class << self

data/test/integration/requests/request_test.rb

@@ -410,7 +410,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books/1/book_comments?page[limit]=10'
     assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=0', json_response['links']['first']
     assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=10', json_response['links']['next']
-    assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=41', json_response['links']['last']
+    assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=16', json_response['links']['last']
   end
 
   def test_pagination_related_resources_links_meta
@@ -418,10 +418,10 @@ class RequestTest < ActionDispatch::IntegrationTest
     Api::V2::BookCommentResource.paginator :offset
     JSONAPI.configuration.top_level_meta_include_record_count = true
     get '/api/v2/books/1/book_comments?page[limit]=10'
-    assert_equal 51, json_response['meta']['record_count']
+    assert_equal 26, json_response['meta']['record_count']
     assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=0', json_response['links']['first']
     assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=10', json_response['links']['next']
-    assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=41', json_response['links']['last']
+    assert_equal 'http://www.example.com/api/v2/books/1/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=16', json_response['links']['last']
   ensure
     JSONAPI.configuration.top_level_meta_include_record_count = false
   end
@@ -436,6 +436,18 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 'http://www.example.com/api/v2/books/10/book_comments?page%5Blimit%5D=10&page%5Boffset%5D=0', json_response['links']['last']
   end
 
+  def test_related_resource_alternate_relation_name_record_count
+    original_config = JSONAPI.configuration.dup
+    JSONAPI.configuration.default_paginator = :paged
+    JSONAPI.configuration.top_level_meta_include_record_count = true
+
+    get '/api/v2/books/1/aliased_comments'
+    assert_equal 200, status
+    assert_equal 26, json_response['meta']['record_count']
+  ensure
+    JSONAPI.configuration = original_config
+  end
+
   def test_pagination_related_resources_data_includes
     Api::V2::BookResource.paginator :offset
     Api::V2::BookCommentResource.paginator :offset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler