next_page 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0a222313043518cba95ab5cba8b04ba260a1668d570cae3f8e0450458d8773
-  data.tar.gz: 1e865c0c7de475e1edb754957db1ab6d4f72e863dc9baa995c90c27c8006ca99
+  metadata.gz: 48258d40caac39b331bba8d81ea99fcbb5523bab818616243149a952c4c286ea
+  data.tar.gz: b52465382e154b636c18f1b0c881cc3c5a4908aa4410a959fe4696904764846b
 SHA512:
-  metadata.gz: 4111d99ac3cca85231988f6dd665c9091416b3a9ad7b29dea0108dc8cd4617cdb38c0f3068d64586741365d463b1c3ea390f28b58199b1ea20fbc7098cf5192d
-  data.tar.gz: 80c2bcbdaa84c8ef48a1f680df6a56fa1607d097b01546c9f553983fd5c4fa171a031abcafc122591576b7b0c2304df65acab3e89cd92ad8e5faabc6d7fe0862
+  metadata.gz: ecdb889ce15846cda3025f6d8c07f61e2901c7633e191c88b8c9aedea79105fd639d95e9abbed8f1cfed8be98ab885f7be4cd67cf5d87d451812e93cceb929b6
+  data.tar.gz: 3a1aea4f5ca07e1656e61bc89a4cae38cfb0fe9523d26a7fb5a3064661e87c06c1c1f811fd3191b5f262b5186eabf38e3a40414064d4c1d3eb5bd56d10bb7704

data/lib/next_page/pagination.rb

@@ -71,11 +71,9 @@ module NextPage
     def render(*args) #:nodoc:
       return super unless action_name == 'index' && request.headers[:Accept] == 'application/vnd.api+json'
 
-      options = args.first
-      return super unless options.is_a?(Hash) && options.key?(:json)
-
-      options[:meta] = options.fetch(:meta, {}).merge!(total_pages: options[:json].total_pages,
-                                                       total_count: options[:json].total_count)
+      self.class.next_page_paginator.decorate_meta!(args.first)
+      super
+    rescue StandardError
       super
     end
   end

data/lib/next_page/paginator.rb

@@ -43,6 +43,14 @@ module NextPage
       data.limit(data.per_page).offset((data.current_page - 1) * data.per_page)
     end
 
+    def decorate_meta!(options)
+      return unless options.is_a?(Hash) && options.key?(:json) && !options[:json].is_a?(Hash)
+
+      resource = options[:json]
+      options[:meta] = options.fetch(:meta, {}).merge!(total_pages: resource.total_pages,
+                                                       total_count: resource.total_count)
+    end
+
     private
 
     def model_class

data/lib/next_page/version.rb

@@ -1,3 +1,3 @@
 module NextPage
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_page
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Todd Kummer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,7 +153,7 @@ homepage: https://github.com/RockSolt/next_page
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Pagination for Rails Controllers
 test_files: []