api-pagination 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a3cdfe943a03cd590d6a3c9e80aa11d7d5e684
-  data.tar.gz: df6e1401a570e87fad204d6f249e7e31b09ea159
+  metadata.gz: c0a884f079d5228439b05823470d82b27a9fe253
+  data.tar.gz: b76f421e8921cf19b6ba8418a20058044718e7a3
 SHA512:
-  metadata.gz: 139197be0f405c0e4954250f4ffa56f5bdc02246e49b674d1ecaab262a2c412d8b088ac6eaa54cf00cda4a75e30e74a746c8b3fb122c4ea7dc9954c5ebc67d82
-  data.tar.gz: c8e15989e239fa9b3d77f8968b4612c8ce93ca78000c39f1c04063d32b24cb1dbe20664e8b1a4ab677fefdb153c20f184ba6319686e126980440ae4b9a6891f2
+  metadata.gz: 0890791df230ec465bf397265ab570ef251c28cee3134f6fe05972676bfa0493cd10d6a0cde0b9fc4ce063d4cac2956be11b848275b3b5e110c0497f7b980be4
+  data.tar.gz: f0b546d497bb139afaf1c09ce17ab7a4ed0423a4d962d0ea649cfdf6bbeb905554efc9679e932a6f9e6afd6e899f3693732a71a97994e8c0707eed4632f611ec

data/lib/api-pagination.rb

@@ -14,7 +14,11 @@ module ApiPagination
         collection = Kaminari.paginate_array(collection) if collection.is_a?(Array)
         collection.page(options[:page]).per(options[:per_page])
       when :will_paginate
-        collection.paginate(:page => options[:page], :per_page => options[:per_page])
+        if defined?(Sequel::Dataset) && collection.kind_of?(Sequel::Dataset)
+          collection.paginate(options[:page], options[:per_page])
+        else
+          collection.paginate(:page => options[:page], :per_page => options[:per_page])
+        end
       end
     end
 

data/lib/api-pagination/version.rb

@@ -2,7 +2,7 @@ module ApiPagination
   class Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/lib/grape/pagination.rb

@@ -28,7 +28,7 @@ module Grape
 
       base.class_eval do
         def self.paginate(options = {})
-          set :per_page, options[:per_page]
+          set :per_page, (options[:per_page] || 25)
           params do
             optional :page,     :type => Integer, :default => 1,
                                 :desc => 'Page of results to fetch.'

data/spec/sequel_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+if ApiPagination.paginator == :will_paginate
+  require 'sqlite3'
+  require 'sequel'
+  require 'will_paginate/sequel'
+
+  DB = Sequel.sqlite
+  DB.extension :pagination
+  DB.create_table :people do
+    primary_key :id
+    String :name
+  end
+
+  describe 'Using will_paginate with Sequel' do
+    let(:people) do
+      DB[:people]
+    end
+
+    before(:each) do
+      people.insert(name: 'John')
+      people.insert(name: 'Mary')
+    end
+
+    it 'returns a Sequel::Dataset' do
+      collection = ApiPagination.paginate(people)
+      expect(collection.kind_of?(Sequel::Dataset)).to be_true
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
 description: Link header pagination for Rails and Grape APIs
 email:
 - me@davidcel.is
@@ -80,6 +108,7 @@ files:
 - lib/rails/pagination.rb
 - spec/grape_spec.rb
 - spec/rails_spec.rb
+- spec/sequel_spec.rb
 - spec/spec_helper.rb
 - spec/support/numbers_api.rb
 - spec/support/numbers_controller.rb
@@ -114,6 +143,7 @@ summary: Link header pagination for Rails and Grape APIs. Don't use the request
 test_files:
 - spec/grape_spec.rb
 - spec/rails_spec.rb
+- spec/sequel_spec.rb
 - spec/spec_helper.rb
 - spec/support/numbers_api.rb
 - spec/support/numbers_controller.rb