grape-kaminari 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5282850782bd08c0a0719eaad85f84b406f1a7419b9755162f939dc7f7aa71bc
-  data.tar.gz: 1fbe1503fe2149f82413c3e934452c85bfe190657077fbd1607e6a10beb812b2
+  metadata.gz: fbda16acc1309fb774a2c4567223c97726d212b321d6b0cccb199c3dc99457a0
+  data.tar.gz: 84435c93750e4879af86c18fd38e86f61e244eb722b95b27b5a4b84b276372b0
 SHA512:
-  metadata.gz: 644acde6f381781e2ef22c484c72fd9c754f7b72382e88fb3047bd71686c9284f65ba4154d887ba66ed45dc164fbb2d1902dfefbcb9310ea42124b5f9146e8cc
-  data.tar.gz: 12552dd5e9ce60c46726554e51cdffc01d1782b7a026f5298141f6c9b60e29ab0c05ce799eab01ae73acc14f458a08a6127b06d2357948ebc89b60681e5f3b71
+  metadata.gz: d2c03beecbb06ce1d537714392ad926e53b39e98d433ed2994ec3d1def516a679b69b7262928c3a00a0870690eaea094ccdee5dd6305cc10722eae1b7b4df14d
+  data.tar.gz: 6f7f41b703eb9e06db050636f3d68d23adeceb59113c43ff0f7da13d733e994a61c65ca34c9c1792fa6b50350686f5ff1574bc38a0c273564ac9284f1be22a2d

data/.github/workflows/test.yml

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

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*~

data/.rubocop.yml

@@ -6,7 +6,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: "2.5"
+  TargetRubyVersion: "2.7"
 
 Naming/FileName:
   Exclude:

data/Gemfile.lock

@@ -1,32 +1,31 @@
 PATH
   remote: .
   specs:
-    grape-kaminari (0.4.2)
-      grape (>= 1.6.1, != 1.4.0)
+    grape-kaminari (0.4.3)
+      grape (>= 1.6.1)
       kaminari-grape
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (7.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    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-inflector (0.2.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -43,19 +42,19 @@ GEM
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    kaminari-core (1.2.1)
+    kaminari-core (1.2.2)
     kaminari-grape (1.0.1)
       grape
       kaminari-core (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -63,8 +62,8 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -78,42 +77,35 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.13.0)
+    rspec-support (3.10.3)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-bsm (0.5.9)
+    rubocop-bsm (0.6.0)
       rubocop (~> 1.0)
       rubocop-performance
-      rubocop-rails
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.11.1)
+    rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.3.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
     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)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -127,4 +119,4 @@ DEPENDENCIES
   rubocop-bsm
 
 BUNDLED WITH
-   2.1.4
+   2.2.27

data/grape-kaminari.gemspec

@@ -15,9 +15,9 @@ 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.5'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'grape', '>= 1.6.1', '!= 1.4.0'
+  spec.add_runtime_dependency 'grape', '>= 1.6.1'
   spec.add_runtime_dependency 'kaminari-grape'
 
   spec.add_development_dependency 'bundler'
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop-bsm'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/grape/kaminari/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Kaminari
-    VERSION = '0.4.2'.freeze
+    VERSION = '0.4.3'.freeze
   end
 end

data/spec/grape/kaminari_params_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+require 'json'
+
+describe Grape::Kaminari do
+  let(:app) do
+    Class.new(Grape::API) do
+      include Grape::Kaminari
+
+      params do
+        use :pagination
+      end
+      get '' do
+        paginate(Kaminari.paginate_array((1..10).to_a))
+      end
+
+      params do
+        use :pagination, offset: false
+      end
+      get 'no-offset' do
+        paginate(Kaminari.paginate_array((1..10).to_a))
+      end
+
+      params do
+        use :pagination, offset: false
+      end
+      get 'no-count' do
+        paginate(Kaminari.paginate_array((1..10).to_a), without_count: true)
+      end
+
+      resource :sub do
+        params do
+          use :pagination, per_page: 2
+        end
+        get '/' do
+          paginate(Kaminari.paginate_array((1..10).to_a))
+        end
+      end
+    end
+  end
+  let(:json) { JSON.parse(last_response.body) }
+  let(:header) { last_response.header }
+
+  describe 'paginated helper' do
+    it 'returns the first page' do
+      get '/', page: 1, per_page: 3
+      expect(json).to eq [1, 2, 3]
+    end
+
+    it 'returns the second page' do
+      get '/', page: 2, per_page: 3
+      expect(json).to eq [4, 5, 6]
+    end
+
+    # This is here to ensure that Kaminari can handle `padding(false)`
+    # and still do the right thing.
+    it 'works when offset is false' do
+      get '/no-offset', page: 1, per_page: 3
+      expect(json).to eq [1, 2, 3]
+    end
+
+    it 'works without count' do
+      get '/no-count', page: 2, per_page: 3
+      expect(json).to eq [4, 5, 6]
+      expect(header).to include(
+        'X-Per-Page'  => '3',
+        'X-Page'      => '2',
+        'X-Next-Page' => '3',
+        'X-Prev-Page' => '1',
+      )
+      expect(header).not_to include(
+        'X-Total',
+        'X-Total-Pages',
+      )
+    end
+
+    it 'sets headers' do
+      get '/', page: 3, per_page: 2, offset: 1
+      expect(header).to include(
+        'X-Total'       => '10',
+        'X-Total-Pages' => '5',
+        'X-Per-Page'    => '2',
+        'X-Page'        => '3',
+        'X-Next-Page'   => '4',
+        'X-Prev-Page'   => '2',
+        'X-Offset'      => '1',
+      )
+    end
+
+    it 'can be inherited' do
+      get '/sub', page: 1
+      expect(json).to eq [1, 2]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-kaminari
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tymon Tobolski
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: kaminari-grape
   requirement: !ruby/object:Gem::Requirement
@@ -136,12 +130,14 @@ files:
 - lib/grape/kaminari.rb
 - lib/grape/kaminari/max_value_validator.rb
 - lib/grape/kaminari/version.rb
+- spec/grape/kaminari_params_spec.rb
 - spec/grape/kaminari_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -162,5 +158,6 @@ signing_key:
 specification_version: 4
 summary: kaminari integration for grape
 test_files:
+- spec/grape/kaminari_params_spec.rb
 - spec/grape/kaminari_spec.rb
 - spec/spec_helper.rb