grape-kaminari 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d524d760fab53973250ae175e7e484a22c0e1d76ca3a427b42d51118660fd708
-  data.tar.gz: 2c1e66d494b6b2dafdd9e7831022a7f1a6b8b10652d19acc897da2f3b150d52b
+  metadata.gz: 5282850782bd08c0a0719eaad85f84b406f1a7419b9755162f939dc7f7aa71bc
+  data.tar.gz: 1fbe1503fe2149f82413c3e934452c85bfe190657077fbd1607e6a10beb812b2
 SHA512:
-  metadata.gz: '065287dc5984a1817a7d92142c806e15e23f3aca99d510fee6dfecb710c7d3eacfe2e755d37605f4055d4ec175f4cd0994367dd2b2cdf3de54f26c2cc89961b4'
-  data.tar.gz: a0ac7c9bdac412351c1581794942982213252e1b2d0907ed1727c3be384353c926d9865da30e2cbd694211f0ce4858c2032533b9ca8a215c33fcd76cec658cca
+  metadata.gz: 644acde6f381781e2ef22c484c72fd9c754f7b72382e88fb3047bd71686c9284f65ba4154d887ba66ed45dc164fbb2d1902dfefbcb9310ea42124b5f9146e8cc
+  data.tar.gz: 12552dd5e9ce60c46726554e51cdffc01d1782b7a026f5298141f6c9b60e29ab0c05ce799eab01ae73acc14f458a08a6127b06d2357948ebc89b60681e5f3b71

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Test
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  ruby:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.5", "2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,26 +1,13 @@
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
   TargetRubyVersion: "2.5"
-  NewCops: enable
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*_spec.rb
-Metrics/MethodLength:
-  Max: 20
 
 Naming/FileName:
   Exclude:
     - lib/grape-kaminari.rb
-
-Style/Documentation:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma

data/Gemfile.lock

@@ -1,65 +1,61 @@
 PATH
   remote: .
   specs:
-    grape-kaminari (0.4.1)
-      grape (>= 1.0, != 1.4.0)
+    grape-kaminari (0.4.2)
+      grape (>= 1.6.1, != 1.4.0)
       kaminari-grape
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+      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.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.8)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.5.0)
+    grape (1.6.2)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     kaminari-core (1.2.1)
     kaminari-grape (1.0.1)
       grape
       kaminari-core (~> 1.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    parallel (1.20.0)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -67,40 +63,57 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.2.0)
+    rspec-support (3.10.2)
+    rubocop (1.13.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-bsm (0.5.9)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.11.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 (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -111,7 +124,7 @@ DEPENDENCIES
   rack-test
   rake
   rspec
-  rubocop
+  rubocop-bsm
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -1,6 +1,6 @@
 # Grape::Kaminari
 
-[![Build Status](https://travis-ci.org/bsm/grape-kaminari.png?branch=master)](https://travis-ci.org/bsm/grape-kaminari)
+[![Test](https://github.com/bsm/grape-kaminari/actions/workflows/test.yml/badge.svg)](https://github.com/bsm/grape-kaminari/actions/workflows/test.yml)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 [kaminari](https://github.com/kaminari/kaminari) paginator integration for [grape](https://github.com/intridea/grape) API framework.

data/grape-kaminari.gemspec

@@ -12,17 +12,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = ''
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('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.add_runtime_dependency 'grape', '>= 1.0', '!= 1.4.0'
+  spec.add_runtime_dependency 'grape', '>= 1.6.1', '!= 1.4.0'
   spec.add_runtime_dependency 'kaminari-grape'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-bsm'
 end

data/lib/grape/kaminari/max_value_validator.rb

@@ -1,6 +1,6 @@
 module Grape
   module Kaminari
-    class MaxValueValidator < Grape::Validations::Base
+    class MaxValueValidator < Grape::Validations::Validators::Base
       def validate_param!(attr_name, params)
         attr = params[attr_name]
         return unless attr.is_a?(Integer) && @option && attr > @option

data/lib/grape/kaminari/version.rb

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

data/spec/{kaminari_spec.rb → grape/kaminari_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-class PaginatedAPI < Grape::API
-  include Grape::Kaminari
-end
-
 describe Grape::Kaminari do
-  subject { Class.new(PaginatedAPI) }
+  subject do
+    Class.new(Grape::API) do
+      include Grape::Kaminari
+    end
+  end
 
   def declared_params
     subject.namespace_stackable(:declared_params).flatten
@@ -21,12 +21,12 @@ describe Grape::Kaminari do
     expect(declared_params).to eq(%i[page per_page])
   end
 
-  it 'should support legacy declarations' do
+  it 'supports legacy declarations' do
     subject.paginate
     expect(declared_params).to eq(%i[page per_page offset])
   end
 
-  it 'should not stumble across repeated declarations' do
+  it 'does not stumble across repeated declarations' do
     subject.paginate offset: false
     subject.params do
       optional :extra
@@ -90,42 +90,41 @@ describe Grape::Kaminari do
       expect(params['offset'][:default]).to eq(0)
     end
   end
-end
 
-describe 'custom paginated api' do
-  subject { Class.new(PaginatedAPI) }
-  let(:app) { subject }
-  let(:params) { subject.routes.first.params }
+  describe 'custom paginated api' do
+    let(:app) { subject }
+    let(:params) { subject.routes.first.params }
 
-  before do
-    subject.params do
-      use :pagination, per_page: 99, max_per_page: 999, offset: 9
+    before do
+      subject.params do
+        use :pagination, per_page: 99, max_per_page: 999, offset: 9
+      end
+      subject.get('/') { 'OK' }
     end
-    subject.get('/') { 'OK' }
-  end
 
-  it 'defaults :per_page to customized value' do
-    expect(params['per_page'][:default]).to eq(99)
-  end
+    it 'defaults :per_page to customized value' do
+      expect(params['per_page'][:default]).to eq(99)
+    end
 
-  it 'succeeds when :per_page is within :max_value' do
-    get('/', page: 1, per_page: 999)
-    expect(last_response.status).to eq(200)
-  end
+    it 'succeeds when :per_page is within :max_value' do
+      get('/', page: 1, per_page: 999)
+      expect(last_response.status).to eq(200)
+    end
 
-  it 'ensures :per_page is within :max_value' do
-    get('/', page: 1, per_page: 1_000)
-    expect(last_response.status).to eq(400)
-    expect(last_response.body).to match(/per_page must be less than or equal 999/)
-  end
+    it 'ensures :per_page is within :max_value' do
+      get('/', page: 1, per_page: 1_000)
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to match(/per_page must be less than or equal 999/)
+    end
 
-  it 'ensures :per_page is numeric' do
-    get('/', page: 1, per_page: 'foo')
-    expect(last_response.status).to eq(400)
-    expect(last_response.body).to match(/per_page is invalid/)
-  end
+    it 'ensures :per_page is numeric' do
+      get('/', page: 1, per_page: 'foo')
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to match(/per_page is invalid/)
+    end
 
-  it 'defaults :offset to customized value' do
-    expect(params['offset'][:default]).to eq(9)
+    it 'defaults :offset to customized value' do
+      expect(params['offset'][:default]).to eq(9)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rack/test'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir[File.expand_path('./support/**/*.rb', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('./support/**/*.rb', __dir__)].sort.each {|f| require f }
 
 I18n.enforce_available_locales = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-kaminari
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tymon Tobolski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.1
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.4.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.1
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.4.0
@@ -102,7 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,9 +122,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -136,8 +136,7 @@ files:
 - lib/grape/kaminari.rb
 - lib/grape/kaminari/max_value_validator.rb
 - lib/grape/kaminari/version.rb
-- spec/kaminari_spec.rb
-- spec/paginate_helper_spec.rb
+- spec/grape/kaminari_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -158,11 +157,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: kaminari integration for grape
 test_files:
-- spec/kaminari_spec.rb
-- spec/paginate_helper_spec.rb
+- spec/grape/kaminari_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5

data/spec/paginate_helper_spec.rb

@@ -1,95 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-class PaginatedAPI < Grape::API
-  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
-
-describe Grape::Kaminari do
-  subject { PaginatedAPI.new }
-  let(:app)  { subject }
-  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