grape-pagy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b587c249c2841b932ceba9be1e7fb25678ce0095345f6e07fcd0eb4231e9db0d
-  data.tar.gz: 427c30f87fd2b90ef082c0926198779b51bae79256b5a32ecff4772464e99fe0
+  metadata.gz: 5cf4286de9e78c7b5a4f4f9ea1fdf9ad8c5e688a64b44e4551c26e300509d42c
+  data.tar.gz: ca06ad206ff3fb7dadc9dcf9f37848afd58645d35f9b8af0dbe7819182694c1e
 SHA512:
-  metadata.gz: a8e59c02f4e9bd59465ae90e4f4d1d449fc66ac8eade1d1fd1774a4a675baefd89a836b202910d4bb31eb754145f2191673333eb88a81c9cfdaf9b4b31e35ede
-  data.tar.gz: ce49cc0544a6ce5162eaad691742b5263f221e31ffbb5a4fde39228d517dacb6adc5fca23ac7ea34039c87b723b77d6e8e54a8cc20e7e4f7576f17d40ca10afe
+  metadata.gz: 0b6094898f98b12b1bf636963d9e3254efa554469f6a179c0ea047022955c9f716c01c1961756d31b53a77f18947026d1929e4eaea80352de47771c2f92769c9
+  data.tar.gz: 8141124754f358828ae5c248fac72acd3dcd4788aac64b3db54e9afbcbbc7b7e366739227c0e081b5249d6e010e6596293f18f06e1dfe5286241bc46b0ed4ac7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.5.0
+
+- Pin to Pagy 5.x.
+
+### 0.4.0
+
+- Pin to Pagy 4.x.
+
 ### 0.3.1
 
 - Pin to Pagy 3.x.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    grape-pagy (0.4.0)
+    grape-pagy (0.5.0)
       grape (>= 1.5)
-      pagy (>= 4.2)
+      pagy (>= 5.4)
 
 GEM
   remote: https://rubygems.org/
@@ -18,16 +18,16 @@ GEM
     builder (3.2.4)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.1.1)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-types (1.5.1)
@@ -36,7 +36,7 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.5.3)
+    grape (1.6.0)
       activesupport
       builder
       dry-types (>= 1.1)
@@ -50,7 +50,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    pagy (4.3.0)
+    pagy (5.4.0)
     parallel (1.20.1)
     parser (3.0.1.0)
       ast (~> 2.4.1)
@@ -106,7 +106,7 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
@@ -124,4 +124,4 @@ DEPENDENCIES
   rubocop-bsm
 
 BUNDLED WITH
-   2.2.16
+   2.2.21

data/README.md

@@ -1,6 +1,6 @@
 # Grape::Pagy
 
-[![Build Status](https://travis-ci.org/bsm/grape-pagy.png?branch=master)](https://travis-ci.org/bsm/grape-pagy)
+[![Ruby](https://github.com/bsm/grape-pagy/actions/workflows/ruby.yml/badge.svg)](https://github.com/bsm/grape-pagy/actions/workflows/ruby.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 [Pagy](https://github.com/ddnexus/pagy) pagination for [grape](https://github.com/ruby-grape/grape) API framework.
@@ -47,7 +47,7 @@ class MyApi < Grape::API
   resource :strings do
     desc 'Supports arrays as well as relations.'
     params do
-      # Override defaults by setting Pagy::VARS or by passing options.
+      # Override defaults by setting Pagy::DEFAULT or by passing options.
       use :pagy,
           items_param: :per_page, # Accept per_page=N param to limit items.
           items: 2,               # If per_page param is blank, default to 2.

data/grape-pagy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'grape-pagy'
-  spec.version       = '0.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ['Black Square Media']
   spec.email         = ['info@blacksquaremedia.com']
   spec.description   = 'Pagy paginator for grape API'
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_runtime_dependency 'grape', '>= 1.5'
-  spec.add_runtime_dependency 'pagy', '>= 4.2'
+  spec.add_runtime_dependency 'pagy', '>= 5.4'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rack-test'

data/lib/grape/pagy.rb

@@ -32,10 +32,10 @@ module Grape
       extend Grape::API::Helpers
 
       params :pagy do |opts|
-        items = opts.delete(:items) || ::Pagy::VARS[:items]
-        page = opts.delete(:page) || ::Pagy::VARS[:page]
-        page_param = opts[:page_param] || ::Pagy::VARS[:page_param]
-        items_param = opts[:items_param] || ::Pagy::VARS[:items_param]
+        items = opts.delete(:items) || ::Pagy::DEFAULT[:items]
+        page = opts.delete(:page) || ::Pagy::DEFAULT[:page]
+        page_param = opts[:page_param] || ::Pagy::DEFAULT[:page_param]
+        items_param = opts[:items_param] || ::Pagy::DEFAULT[:items_param]
 
         @api.route_setting(:pagy_options, opts)
         optional page_param, type: Integer, default: page, desc: 'Page offset to fetch.'

data/spec/grape/pagy_spec.rb

@@ -10,7 +10,9 @@ describe Grape::Pagy do
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
       'Current-Page' => '1',
-      'Link'         => %(<http://example.org/?page=1>; rel="first", <http://example.org/?page=2>; rel="next", <http://example.org/?page=3>; rel="last"),
+      'Link'         => '<http://example.org/?page=1&items=5>; rel="first", ' \
+                        '<http://example.org/?page=2&items=5>; rel="next", ' \
+                        '<http://example.org/?page=3&items=5>; rel="last"',
       'Page-Items'   => '5',
       'Total-Count'  => '12',
       'Total-Pages'  => '3',
@@ -57,9 +59,9 @@ describe Grape::Pagy do
       'Current-Page' => '2',
       'Page-Items'   => '3',
       'Link'         => [
-        %(<http://example.org/countless?page=1>; rel="first"),
-        %(<http://example.org/countless?page=1>; rel="prev"),
-        %(<http://example.org/countless?page=3>; rel="next"),
+        %(<http://example.org/countless?page=1&items=3>; rel="first"),
+        %(<http://example.org/countless?page=1&items=3>; rel="prev"),
+        %(<http://example.org/countless?page=3&items=3>; rel="next"),
       ].join(', '),
     )
     expect(last_response.headers).not_to include(

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ require 'rspec'
 require 'grape/pagy'
 require 'rack/test'
 
-Pagy::VARS[:items] = 10
-Pagy::VARS[:max_items] = 20
+Pagy::DEFAULT[:items] = 10
+Pagy::DEFAULT[:max_items] = 20
 
 class TestArray < Array
   def limit(num)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-pagy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement