paginate-responder 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a6cc9eda71db6450ff7bd5607db1662a6611382
-  data.tar.gz: 90c046db266b6720c601edeffbcac50dc01a5cc9
+SHA256:
+  metadata.gz: 2f44ce9f98a85e03ae656db512564e7d9ce3263c1af1e4ec4d7c484a7f3a29f2
+  data.tar.gz: 7c66f7d57534805c6ed6109072e55e5e42ac816e5c4e2454e5c4788c0d22002b
 SHA512:
-  metadata.gz: 7c932b5edae57215e25e82d40514db777cdfc10f6c251357e51181062288d2def594b232a39c8828df67fca83ea98e5b8f5d81ada42cd8df6d2b839a84cff769
-  data.tar.gz: 3740ca577f36090214e750bd04701d334653cfb0d7936b949d3dffb3e389584486d965379ca890e1e110ee0b0463ae7b9bbd16fae41c810acc933821463334c4
+  metadata.gz: 3288c6abccc463b074bcf01066ea71b1a3e80351a396002bd60d23f8e30f3cd184038ebc0d63d809ddd782617719d7f1a720142ce3338f1d0e166a8295b03d79
+  data.tar.gz: a8a9f0672d0a1bff70dc16809d20c1f8f3566d2859dc9222b17def372eff1f4a3e13614232569244b1ceeafed19bbcee2f5bea59d62d5f5265cbb5d36aa57f54

data/.travis.yml

@@ -1,26 +1,58 @@
-sudo: false
-dist: trusty
+dist: xenial
 language: ruby
 rvm:
-  - '2.4.1'
-  - '2.3.4'
-  - '2.2.7'
-  - '2.1.10'
+- 2.6.1
+- 2.5.3
+- 2.4.5
+- 2.3.8
+before_install:
+- rvm --force gemset delete global
+- gem install bundler -v '~> 1.17'
 env:
-  - GEM=will_paginate
-  - GEM=kaminari
+- GEM=will_paginate
+- GEM=kaminari
+- GEM=pagy
 gemfile:
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_head.gemfile
-matrix:
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_head.gemfile
+jobs:
   exclude:
-    - rvm: '2.1.10'
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: '2.1.10'
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: '2.1.10'
-      gemfile: gemfiles/rails_head.gemfile
+  - rvm: 2.6.1
+    gemfile: gemfiles/rails_4_2.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5_0.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5_1.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5_2.gemfile
+  - rvm: 2.4.5
+    gemfile: gemfiles/rails_head.gemfile
+  - rvm: 2.3.8
+    gemfile: gemfiles/rails_head.gemfile
+  - rvm: 2.2.10
+    gemfile: gemfiles/rails_head.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_head.gemfile
+  - rvm: 2.2.10
+    env: GEM=pagy
+  - rvm: 2.1.10
+    env: GEM=pagy
   allow_failures:
   - gemfile: gemfiles/rails_head.gemfile
+  include:
+  - stage: Release
+    rvm: 2.6.1
+    env: []
+    script: skip
+    install: skip
+    deploy:
+      provider: rubygems
+      api_key:
+        secure: MgeXelR7uhiEvC7dqRzV7e6SbWAMG7TvEquFvqIEh0osAbjdV2UKLPGoFHhoP3WTrcPqxUw9HYr0uBsxm5Oj+wsdIT1VSCojVw0BwTIE+rpFFE5JdZdQr5217vAFJn4H8ddareh5E2dyFUXWzlH2w0+75DZd33NAO5LfN2GXsAc=
+      gem: paginate-responder
+      on:
+        tags: true
+        repo: jgraichen/paginate-responder

data/Appraisals

@@ -1,13 +1,29 @@
 appraise "rails-4-2" do
   gem 'rails', '~> 4.2.0'
+
+  # Fix version conflict in active_record
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-5-0" do
   gem 'rails', '~> 5.0.0'
+
+  # Fix version conflict in active_record
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-5-1" do
   gem 'rails', '~> 5.1.0'
+
+  # Fix version conflict in active_record
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+appraise "rails-5-2" do
+  gem 'rails', '~> 5.2.0'
+
+  # Fix version conflict in active_record
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-head" do

data/CHANGELOG.md

@@ -1,4 +1,18 @@
 # Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## 1.8.0 - 2019-02-19
+### Added
+* Support for pagination using `pagy` gem (#14)
+
+### Fixed
+* sqlite3 version conflict in active_record (#15)
+* Invalid ?page parameter could cause exceptions (#16)
 
 ## 1.7.0
 

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in paginate-responder.gemspec
 gemspec
+
+# Fix version conflict in active_record
+gem 'sqlite3', '~> 1.3.6'

data/README.md

@@ -1,8 +1,9 @@
 # Paginate::Responder 
 
-[![Gem Version](https://badge.fury.io/rb/paginate-responder.png)](http://badge.fury.io/rb/paginate-responder)
-[![Build Status](https://travis-ci.org/jgraichen/paginate-responder.png?branch=master)](https://travis-ci.org/jgraichen/paginate-responder)
-[![Code Climate](https://codeclimate.com/github/jgraichen/paginate-responder.png)](https://codeclimate.com/github/jgraichen/paginate-responder)
+[![Gem](https://img.shields.io/gem/v/paginate-responder.svg)](https://rubygems.org/gems/paginate-responder)
+[![Build Status](https://travis-ci.org/jgraichen/paginate-responder.svg?branch=master)](https://travis-ci.org/jgraichen/paginate-responder)
+[![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/jgraichen/paginate-responder.svg)](https://codeclimate.com/github/jgraichen/paginate-responder)
+
 
 A Rails pagination responder with link header support.
 
@@ -21,8 +22,9 @@ Or install it yourself as:
     $ gem install paginate-responder
 
 You will also need a pagination gem. `PaginateResponder` comes with adapters for
-* [will_paginate](https://github.com/mislav/will_paginate) and
-* [kaminari](https://github.com/amatsuda/kaminari).
+* [will_paginate](https://github.com/mislav/will_paginate),
+* [kaminari](https://github.com/amatsuda/kaminari), and
+* [pagy](https://github.com/ddnexus/pagy).
 
 It is recommended to use only one pagination gem at once.
 
@@ -51,13 +53,13 @@ end
 `PaginateResponder` will add the following link headers to
 non HTML responses:
 
-* *first* First page's URL.
-* *last* Last page's URL.
-* *next* Next page's URL.
-* *prev* Previous page's URL.
+* `first` First page's URL.
+* `last` Last page's URL.
+* `next` Next page's URL.
+* `prev` Previous page's URL.
 
-Next and previous page links will not be added if current
-page is first or last page.
+`next` and `prev` page links will not be added if current
+page is `first` or `last` page.
 
 Also a `X-Total-Pages` header will be added with the total
 number of pages if available and a `X-Total-Count` header 
@@ -70,7 +72,7 @@ You can override the page detection by creating a method
 `page` in your controller that returns the page index as
 a fixnum:
 
-```
+```ruby
 class ApplicationController
   def page
     params[:seite].to_i # seite means page in German
@@ -80,7 +82,7 @@ end
 
 Same goes for `per_page` and `max_per_page`:
 
-```
+```ruby
 class ApplicationController
   def per_page
     10

data/gemfiles/rails_4_2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 4.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sqlite3", "~> 1.3.6"
 gem "rails", "~> 5.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.6"
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_head.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sqlite3", "~> 1.3.6"
 gem "rails", github: "rails/rails"
 
 gemspec path: "../"

data/lib/paginate-responder.rb

@@ -9,4 +9,5 @@ module PaginateResponder
   require 'paginate-responder/base'
   require 'paginate-responder/will_paginate_adapter'
   require 'paginate-responder/kaminari_adapter'
+  require 'paginate-responder/pagy_adapter'
 end

data/lib/paginate-responder/base.rb

@@ -56,6 +56,8 @@ module PaginateResponder
 
     def cast_page(page)
       Integer(page)
+    rescue ArgumentError
+      1
     end
 
     def per_page

data/lib/paginate-responder/pagy_adapter.rb

@@ -0,0 +1,51 @@
+module PaginateResponder
+  #
+  # Pagination adapter for pagy.
+  #
+  class PagyAdapter < Base
+    def paginate
+      self.pagy, self.pagy_resource = controller.send(self.class.pagy_method(resource), resource, page: page, items: per_page)
+      pagy_resource
+    end
+
+    def total_pages
+      pagy.pages
+    end
+
+    def total_count
+      pagy.count
+    end
+
+    def default_per_page
+      Pagy::VARS[:items]
+    end
+
+    def default_max_per_page
+      Pagy::VARS[:max_items] || BigDecimal::INFINITY
+    end
+
+    def paginate!
+      paginate.tap do
+        update
+      end
+    end
+
+    class << self
+      def suitable?(resource, responder)
+        responder.controller.respond_to?(pagy_method(resource), true)
+      end
+
+      def pagy_method(resource)
+        %i[limit offset].all? { |model_method| resource.respond_to?(model_method) } ? :pagy : :pagy_array
+      end
+    end
+
+    private
+
+    attr_accessor :pagy, :pagy_resource
+  end
+
+  if defined?(:Pagy)
+    ::Responders::PaginateResponder.register PagyAdapter
+  end
+end

data/lib/paginate-responder/version.rb

@@ -1,7 +1,7 @@
 module PaginateResponder
   module VERSION
     MAJOR = 1
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
     STAGE = nil
 

data/paginate-responder.gemspec

@@ -24,13 +24,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'activerecord', '>= 3.2.0'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'kaminari'
+  gem.add_development_dependency 'pagy'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'responders'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
   gem.add_development_dependency 'will_paginate'
   gem.add_development_dependency 'test-unit'
 end

data/spec/paginate_responder_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 RSpec.describe Responders::PaginateResponder, type: :controller do
   case $gem
-    when 'will_paginate'
+    when 'will_paginate',
+         'pagy'
       let(:array_resource) do
         ('AA'..'zz').to_a
       end
@@ -39,6 +40,22 @@ RSpec.describe Responders::PaginateResponder, type: :controller do
       it { expect(json).to eq (51..100).to_a }
     end
 
+    describe '?page empty' do
+      let(:params) { super().merge page: '' }
+
+      it 'responds with first page' do
+        expect(json).to eq (1..50).to_a
+      end
+    end
+
+    describe '?page invalid' do
+      let(:params) { super().merge page: 'foobar' }
+
+      it 'responds with first page' do
+        expect(json).to eq (1..50).to_a
+      end
+    end
+
     describe '?per_page' do
       let(:params) { super().merge per_page: 10 }
 

data/spec/spec_helper.rb

@@ -37,6 +37,15 @@ case $gem
       config.default_per_page = 50
       config.max_per_page = 50
     end
+  when 'pagy'
+    require 'pagy'
+    require 'pagy/extras/array'
+    require 'pagy/extras/items'
+
+    TestController.include(Pagy::Backend)
+
+    Pagy::VARS[:items] = 50
+    Pagy::VARS[:max_items] = 50
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paginate-responder
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-link_headers
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +182,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -224,10 +238,12 @@ files:
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
 - gemfiles/rails_head.gemfile
 - lib/paginate-responder.rb
 - lib/paginate-responder/base.rb
 - lib/paginate-responder/kaminari_adapter.rb
+- lib/paginate-responder/pagy_adapter.rb
 - lib/paginate-responder/version.rb
 - lib/paginate-responder/will_paginate_adapter.rb
 - lib/responders/paginate_responder.rb
@@ -256,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Rails pagination responder with link header support.