grape-kaminari 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ae809ad4c135dcf91437d3e66be5aeade55263df274f958da45e3518643121
-  data.tar.gz: 6444fd46138c8e330a9c74254f27d0512ea861df07eb90cde07f070a1e43a0e6
+  metadata.gz: 690c3b70419498572169fa3e2daee43ba5adef9c93e46ba8b0da6944f2afdcc0
+  data.tar.gz: 49f722ee554da32f4ecc3351abc2e5edc44454882046cfadf39f0d99c7ba2ba5
 SHA512:
-  metadata.gz: 5633fb0d0acecfe2aa68eaff97e29aabddd087922b0ab17a439b26a6fd8ac3889f5f3c902dff54b1729bace30fe6c81c2972a1075785653ea0785b5326ad79e0
-  data.tar.gz: 25fbc7a3ad61bc457e237da7ccf9dfbced16c76b291cec006ed45ac9504fc9e208d3f5ac2e3f30f9f94396d7b157214f106aeec05bd8d121e1b6ee06e614025a
+  metadata.gz: c08980fd147c292e51c546c19166a095b012fe0727e95a30d5ac9a5682eecfd66fdbf907167b0c2c5160c854269728ecca34cee6808009660e02075eaed67d35
+  data.tar.gz: ffdf0838305fd025f5fda2fb96ee6c58b9f46bfbe0fe511f13de9b06d9683f1f6651d45a23d8b923434974f65d930242bcfb00723a3042dffa9cdecd6dba8960

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    grape-kaminari (0.2.1)
-      grape (>= 1.0)
+    grape-kaminari (0.3.0)
+      grape (>= 1.0, != 1.4.0)
       kaminari-grape
 
 GEM
@@ -16,9 +16,9 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.1)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    dry-configurable (0.11.5)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -47,7 +47,7 @@ GEM
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     kaminari-core (1.2.1)
     kaminari-grape (1.0.1)
@@ -59,8 +59,8 @@ GEM
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
     parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -83,24 +83,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.85.1)
+    rubocop (0.89.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/grape-kaminari.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_runtime_dependency 'grape', '>= 1.0'
+  spec.add_runtime_dependency 'grape', '>= 1.0', '!= 1.4.0'
   spec.add_runtime_dependency 'kaminari-grape'
 
   spec.add_development_dependency 'bundler'

data/lib/grape/kaminari.rb

@@ -5,6 +5,13 @@ require 'kaminari/grape'
 
 module Grape
   module Kaminari
+    extend ActiveSupport::Concern
+
+    included do
+      helpers HelperMethods
+      base_instance.extend DSLMethods
+    end
+
     module HelperMethods # :nodoc:
       def paginate(collection)
         collection.page(params[:page].to_i)
@@ -22,7 +29,7 @@ module Grape
       end
     end
 
-    module ClassMethods # :nodoc:
+    module DSLMethods # :nodoc:
       def paginate(**options)
         options.reverse_merge!(
           per_page: ::Kaminari.config.default_per_page || 10,
@@ -42,10 +49,5 @@ module Grape
         end
       end
     end
-
-    def self.included(base)
-      base.helpers HelperMethods
-      base.extend ClassMethods
-    end
   end
 end

data/lib/grape/kaminari/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Kaminari
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/spec/paginate_helper_spec.rb

@@ -13,13 +13,18 @@ class PaginatedAPI < Grape::API
   get 'no-offset' do
     paginate(Kaminari.paginate_array((1..10).to_a))
   end
+
+  resource :sub do
+    paginate per_page: 2
+    get '/' do
+      paginate(Kaminari.paginate_array((1..10).to_a))
+    end
+  end
 end
 
 describe Grape::Kaminari do
   subject { PaginatedAPI.new }
-  def app
-    subject
-  end
+  let(:app)  { subject }
   let(:json) { JSON.parse(last_response.body) }
   let(:header) { last_response.header }
 
@@ -51,5 +56,10 @@ describe Grape::Kaminari do
       expect(header['X-Prev-Page']).to eq '2'
       expect(header['X-Offset']).to eq '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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tymon Tobolski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: kaminari-grape
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: kaminari integration for grape