jsonapi-resources 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091836afd689ed975ab1ad2cee54a467a0771cb5ea5b0bfa2055e25531809f74'
-  data.tar.gz: 96d46c67f8c88fa3e6d298eac85dc3862bef6feacbe8eddde1515b80e7c8e5a8
+  metadata.gz: d30a2ea26f6bb9f907e0710a7e9d95a9682bfa64ab0fd7ae1e5b350c07f52924
+  data.tar.gz: fd883de5a6506f4aaad03fcf3ec61ec311c0e57f0cf33ea8c3d8b082c47b2671
 SHA512:
-  metadata.gz: f4dfc6fd61f4a7d27a291626b00c6e5c13cad32be0b73b66e239f254800d73557168470191923cd5bcf29869bfdb1e93a11c4a8b6e3eca25411b1ac8dbc4e24d
-  data.tar.gz: e6c699748872330b22ae151082595e48bed10665e9c61c3ba902f585747090e19ab9319776d189bc06fe9ca7797f00467fb08a3e863a4ce7e3b740fd85bc2fe8
+  metadata.gz: cc53b7071fb93b2f2f5c8ff2f02b43572a56d5da8a58835cff73953100db55c0ea9dbc2a1d26b7b06ae854d8e588276619d7631a4dc509e7c6332b9ced5c6245
+  data.tar.gz: d9f77c39f058f3978b20ccba5d2beea4744bbda9cb1b19933ed9a3a235a5265a9fecb945a2fd3646f0135cb97059896be3ac2fa19023a94fd555480ac8483f95

data/lib/jsonapi/paginator.rb

@@ -13,9 +13,16 @@ module JSONAPI
       # :nocov:
     end
 
+    def requires_record_count
+      # :nocov:
+      self.class.requires_record_count
+      # :nocov:
+    end
+
     class << self
       def requires_record_count
         # :nocov:
+        # @deprecated
         false
         # :nocov:
       end
@@ -36,10 +43,15 @@ class OffsetPaginator < JSONAPI::Paginator
     verify_pagination_params
   end
 
+  # @deprecated
   def self.requires_record_count
     true
   end
 
+  def requires_record_count
+    true
+  end
+
   def apply(relation, _order_options)
     relation.offset(@offset).limit(@limit)
   end
@@ -127,10 +139,15 @@ class PagedPaginator < JSONAPI::Paginator
     verify_pagination_params
   end
 
+  # @deprecated
   def self.requires_record_count
     true
   end
 
+  def requires_record_count
+    true
+  end
+
   def calculate_page_count(record_count)
     (record_count / @size.to_f).ceil
   end

data/lib/jsonapi/processor.rb

@@ -65,13 +65,13 @@ module JSONAPI
       resource_set.populate!(serializer, context, find_options)
 
       page_options = result_options
-      if (JSONAPI.configuration.top_level_meta_include_record_count || (paginator && paginator.class.requires_record_count))
+      if (top_level_meta_include_record_count || (paginator && paginator.requires_record_count))
         page_options[:record_count] = resource_klass.count(verified_filters,
                                                            context: context,
                                                            include_directives: include_directives)
       end
 
-      if (JSONAPI.configuration.top_level_meta_include_page_count && paginator && page_options[:record_count])
+      if (top_level_meta_include_page_count && paginator && page_options[:record_count])
         page_options[:page_count] = paginator ? paginator.calculate_page_count(page_options[:record_count]) : 1
       end
 
@@ -197,9 +197,9 @@ module JSONAPI
       resource_set.populate!(serializer, context, find_options)
 
       opts = result_options
-      if ((JSONAPI.configuration.top_level_meta_include_record_count) ||
-          (paginator && paginator.class.requires_record_count) ||
-          (JSONAPI.configuration.top_level_meta_include_page_count))
+      if ((top_level_meta_include_record_count) ||
+          (paginator && paginator.requires_record_count) ||
+          (top_level_meta_include_page_count))
 
         opts[:record_count] = source_resource.class.count_related(
             source_resource.identity,
@@ -207,13 +207,13 @@ module JSONAPI
             find_options)
       end
 
-      if (JSONAPI.configuration.top_level_meta_include_page_count && opts[:record_count])
+      if (top_level_meta_include_page_count && opts[:record_count])
         opts[:page_count] = paginator.calculate_page_count(opts[:record_count])
       end
 
       opts[:pagination_params] = if paginator && JSONAPI.configuration.top_level_links_include_pagination
                                    page_options = {}
-                                   page_options[:record_count] = opts[:record_count] if paginator.class.requires_record_count
+                                   page_options[:record_count] = opts[:record_count] if paginator.requires_record_count
                                    paginator.links_page_params(page_options.merge(fetched_resources: resource_set))
                                  else
                                    {}
@@ -382,6 +382,14 @@ module JSONAPI
       JSONAPI::ResourceSet.new(resource_id_tree)
     end
 
+    def top_level_meta_include_record_count
+      JSONAPI.configuration.top_level_meta_include_record_count
+    end
+
+    def top_level_meta_include_page_count
+      JSONAPI.configuration.top_level_meta_include_page_count
+    end
+
     private
     def find_related_resource_id_tree(resource_klass, source_id, relationship_name, find_options, include_related)
       options = find_options.except(:include_directives)

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.10.6'
+    VERSION = '0.10.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler