Merge pull request #54 from bsm/fix/endpoint-helper-inheritance

Inherit endpoint paginate helper

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

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'

lib/grape/kaminari.rb

@@ -5,6 +5,13 @@
 
 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 @@ def paginate(collection)
       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 @@ def paginate(**options)
         end
       end
     end
-
-    def self.included(base)
-      base.helpers HelperMethods
-      base.extend ClassMethods
-    end
   end
 end

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

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 @@ def app
       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