grape-pagy 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180207f3b3894998bebb7bc777378787eaf71586a4312e75cd3c60e4e960fae3
-  data.tar.gz: a3282f12ca6025c12f22079c51e868ad8b2ca2dfbcddd84d2bdc3c97c474bf6f
+  metadata.gz: b587c249c2841b932ceba9be1e7fb25678ce0095345f6e07fcd0eb4231e9db0d
+  data.tar.gz: 427c30f87fd2b90ef082c0926198779b51bae79256b5a32ecff4772464e99fe0
 SHA512:
-  metadata.gz: a061f3ff334f5a1872811c3789b07c8186794fd6a695b14f0acace8d2b821a10db7e31c352c5f9f078aecd1ccc888a955bb1bbe32e2df3b3fa35ff55948a6cf5
-  data.tar.gz: 60c01e34bbd0867f74d7327f97c12fef04396903c16550cb32f5cd9bae2f6f62a00aaa1c59f54b19247bd36cc1a71affccbebcc90a6a6f89becf9c0e761bdd9e
+  metadata.gz: a8e59c02f4e9bd59465ae90e4f4d1d449fc66ac8eade1d1fd1774a4a675baefd89a836b202910d4bb31eb754145f2191673333eb88a81c9cfdaf9b4b31e35ede
+  data.tar.gz: ce49cc0544a6ce5162eaad691742b5263f221e31ffbb5a4fde39228d517dacb6adc5fca23ac7ea34039c87b723b77d6e8e54a8cc20e7e4f7576f17d40ca10afe

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.6", "2.7"]
+        ruby-version: ["3.0"]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/.gitignore

@@ -46,7 +46,7 @@ build-iPhoneSimulator/
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 # Gemfile.lock
-# .ruby-version
+.ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:

data/.rubocop.yml

@@ -6,7 +6,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: "2.6"
+  TargetRubyVersion: "3.0"
 
 Naming/FileName:
   Exclude: ["lib/grape-pagy.rb"]

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    grape-pagy (0.3.1)
+    grape-pagy (0.4.0)
       grape (>= 1.5)
-      pagy (>= 3.8, < 4.0)
+      pagy (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -50,7 +50,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    pagy (3.13.0)
+    pagy (4.3.0)
     parallel (1.20.1)
     parser (3.0.1.0)
       ast (~> 2.4.1)
@@ -124,4 +124,4 @@ DEPENDENCIES
   rubocop-bsm
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/grape-pagy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'grape-pagy'
-  spec.version       = '0.3.1'
+  spec.version       = '0.4.0'
   spec.authors       = ['Black Square Media']
   spec.email         = ['info@blacksquaremedia.com']
   spec.description   = 'Pagy paginator for grape API'
@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.start_with?('spec/') }
   spec.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_runtime_dependency 'grape', '>= 1.5'
-  spec.add_runtime_dependency 'pagy', '>= 3.8', '< 4.0'
+  spec.add_runtime_dependency 'pagy', '>= 4.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rack-test'

data/lib/grape/pagy.rb

@@ -13,7 +13,7 @@ module Grape
       include ::Pagy::Backend
 
       def paginate(collection, using: nil, **opts, &block)
-        pagy_with_items(opts)
+        opts = pagy_countless_get_vars(nil, opts)
         using ||= if collection.respond_to?(:arel_table)
                     :arel
                   elsif collection.is_a?(Array)
@@ -31,9 +31,9 @@ module Grape
     module Helpers
       extend Grape::API::Helpers
 
-      params :pagy do |items: nil, page: nil, **opts|
-        items ||= ::Pagy::VARS[:items]
-        page ||= ::Pagy::VARS[:page]
+      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]
 
@@ -45,6 +45,7 @@ module Grape
       # @param [Array|ActiveRecord::Relation] collection the collection or relation.
       def pagy(collection, **opts)
         defaults = route_setting(:pagy_options) || {}
+
         Wrapper.new(request, params).paginate(collection, **defaults, **opts) do |key, value|
           header key, value
         end

data/spec/spec_helper.rb

@@ -9,11 +9,11 @@ Pagy::VARS[:max_items] = 20
 
 class TestArray < Array
   def limit(num)
-    slice!(0, num)
+    self.class.new slice(0, num)
   end
 
   def offset(num)
-    slice!(num..-1)
+    self.class.new slice(num..-1)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-pagy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Black Square Media
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: ''