grape-kaminari 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbda16acc1309fb774a2c4567223c97726d212b321d6b0cccb199c3dc99457a0
-  data.tar.gz: 84435c93750e4879af86c18fd38e86f61e244eb722b95b27b5a4b84b276372b0
+  metadata.gz: e7bef8d7546d576aca8f4b0f1bdb1e633c4ea4d63b011063228874e226b0826f
+  data.tar.gz: 0ca3f5acfad14c2a5bddea2e4605ebeedce883f22f41d93cd900dac8d6113a84
 SHA512:
-  metadata.gz: d2c03beecbb06ce1d537714392ad926e53b39e98d433ed2994ec3d1def516a679b69b7262928c3a00a0870690eaea094ccdee5dd6305cc10722eae1b7b4df14d
-  data.tar.gz: 6f7f41b703eb9e06db050636f3d68d23adeceb59113c43ff0f7da13d733e994a61c65ca34c9c1792fa6b50350686f5ff1574bc38a0c273564ac9284f1be22a2d
+  metadata.gz: 2b12a1b1e568af31df333ff20f617d9e0687b0177430fd8a8be40f92b7b44fc6fa7777278f0629302e0f939b7901c66e5df8a3cce19702131c1d800edea491b8
+  data.tar.gz: 90ac0dad49e5910652100d3518ac38fab54f8903004a4ceef027fa58d3f1bc25b27988735dfde36ba7af0658b364f858b40c4c7b3bd22e724b0651ddd7129b15

data/.github/workflows/test.yml

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

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape-kaminari.gemspec
 gemspec
+
+gem 'rack-test'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop-bsm'

data/Gemfile.lock

@@ -1,111 +1,113 @@
 PATH
   remote: .
   specs:
-    grape-kaminari (0.4.3)
+    grape-kaminari (0.4.4)
       grape (>= 1.6.1)
       kaminari-grape
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.0)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
-    dry-configurable (0.13.0)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.0)
       concurrent-ruby (~> 1.0)
-    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)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    grape (1.6.2)
+      dry-core (~> 1.0, < 2)
+      dry-inflector (~> 1.0, < 2)
+      dry-logic (>= 1.4, < 2)
+      zeitwerk (~> 2.6)
+    grape (1.7.0)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     kaminari-core (1.2.2)
     kaminari-grape (1.0.1)
       grape
       kaminari-core (~> 1.0)
-    minitest (5.15.0)
-    mustermann (1.1.1)
+    minitest (5.17.0)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    mustermann-grape (1.0.1)
+    mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (3.0.4.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rainbow (3.0.0)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.6.2)
     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.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-bsm (0.6.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-bsm (0.6.1)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.13.1)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.7.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
@@ -119,4 +121,4 @@ DEPENDENCIES
   rubocop-bsm
 
 BUNDLED WITH
-   2.2.27
+   2.3.9

data/grape-kaminari.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   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.7'
 
@@ -21,9 +20,5 @@ Gem::Specification.new do |spec|
   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-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.3'.freeze
+    VERSION = '0.4.4'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-kaminari
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Tymon Tobolski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -53,62 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-bsm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: kaminari paginator integration for grape API framework
 email:
 - info@blacksquaremedia.com
@@ -130,9 +74,6 @@ 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
@@ -153,11 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 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
+test_files: []

data/spec/grape/kaminari_params_spec.rb

@@ -1,94 +0,0 @@
-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

data/spec/grape/kaminari_spec.rb

@@ -1,130 +0,0 @@
-require 'spec_helper'
-
-describe Grape::Kaminari do
-  subject do
-    Class.new(Grape::API) do
-      include Grape::Kaminari
-    end
-  end
-
-  def declared_params
-    subject.namespace_stackable(:declared_params).flatten
-  end
-
-  it 'adds to declared parameters' do
-    subject.params { use :pagination }
-    expect(declared_params).to eq(%i[page per_page offset])
-  end
-
-  it 'may exclude :offset' do
-    subject.params { use :pagination, offset: false }
-    expect(declared_params).to eq(%i[page per_page])
-  end
-
-  it 'supports legacy declarations' do
-    subject.paginate
-    expect(declared_params).to eq(%i[page per_page offset])
-  end
-
-  it 'does not stumble across repeated declarations' do
-    subject.paginate offset: false
-    subject.params do
-      optional :extra
-    end
-    expect(declared_params).to eq(%i[page per_page extra])
-  end
-
-  describe 'descriptions, validation, and defaults' do
-    let(:params) { subject.routes.first.params }
-
-    before do
-      subject.params { use :pagination }
-      subject.get('/') { 'OK' }
-    end
-
-    it 'does not require :page' do
-      expect(params['page'][:required]).to eq(false)
-    end
-
-    it 'does not require :per_page' do
-      expect(params['per_page'][:required]).to eq(false)
-    end
-
-    it 'does not require :offset' do
-      expect(params['offset'][:required]).to eq(false)
-    end
-
-    it 'describes :page' do
-      expect(params['page'][:desc]).to eq('Page offset to fetch.')
-    end
-
-    it 'describes :per_page' do
-      expect(params['per_page'][:desc]).to eq('Number of results to return per page.')
-    end
-
-    it 'describes :offset' do
-      expect(params['offset'][:desc]).to eq('Pad a number of results.')
-    end
-
-    it 'validates :page as Integer' do
-      expect(params['page'][:type]).to eq('Integer')
-    end
-
-    it 'validates :per_page as Integer' do
-      expect(params['per_page'][:type]).to eq('Integer')
-    end
-
-    it 'validates :offset as Integer' do
-      expect(params['offset'][:type]).to eq('Integer')
-    end
-
-    it 'defaults :page to 1' do
-      expect(params['page'][:default]).to eq(1)
-    end
-
-    it 'defaults :per_page to Kaminari.config.default_per_page' do
-      expect(params['per_page'][:default]).to eq(::Kaminari.config.default_per_page)
-    end
-
-    it 'defaults :offset to 0' do
-      expect(params['offset'][:default]).to eq(0)
-    end
-  end
-
-  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
-      end
-      subject.get('/') { 'OK' }
-    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 '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 'defaults :offset to customized value' do
-      expect(params['offset'][:default]).to eq(9)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-require 'rspec'
-require 'grape-kaminari'
-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 }
-
-I18n.enforce_available_locales = false
-
-RSpec.configure do |config|
-  config.include Rack::Test::Methods
-  config.raise_errors_for_deprecations!
-  config.order = 'random'
-end