api-pagination 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af37b20cc366bdb21326a922f7d2fd145178307
-  data.tar.gz: adfcf9ea355a22dbeb2c739f69d23af8767000c1
+  metadata.gz: 2c576834fa7e045c8227f8ac9eb178dedc241533
+  data.tar.gz: 6c620fe958d4b4c87e8df6d28faf4a24c500e2e4
 SHA512:
-  metadata.gz: 4e0e335c9901191fd8f85202ff25967e09574bc1fb6fdd574a051e0aeb8c0865f17893ec423fee635ab23a3a278025fe82adb5c50a327ff87b288b4ac9aafca5
-  data.tar.gz: f230b0babeb25fffcd26542ba373389a2e62188cd8a6fd3c963719e291f963b121f554e19d71f50de77b08459f735d6b8ed272cef15f589be72679b86f7687bf
+  metadata.gz: b22e56913a84c875f177f1e3acb401bcb4decf175ed31023efe6cfdc33782d7d67e1b84e85cf8f0a9454181aa2284047d24c0f8c43b9b7328266c8e28500beaf
+  data.tar.gz: c23680b6346a5dab04bbecfd6a18ec4d54190f2907b488936743108eaf4657b66d02724ab64feab558f731ca80e1287784c3fa2c7e7634df163e44b167a3c38a

data/lib/api-pagination.rb

@@ -7,7 +7,7 @@ module ApiPagination
 
     def paginate(collection, options = {})
       options[:page]     ||= 1
-      options[:per_page] ||= 25
+      options[:per_page] = (options[:per_page].to_i <= 0 ? 25 : options[:per_page])
 
       case ApiPagination.paginator
       when :kaminari

data/lib/api-pagination/version.rb

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

data/lib/rails/pagination.rb

@@ -2,10 +2,15 @@ module Rails
   module Pagination
     protected
 
-    def paginate(options)
+    def paginate(*options_or_collection)
+      options    = options_or_collection.extract_options!
+      collection = options_or_collection.first
+
+      return _paginate_collection(collection, options) if collection
+
       collection = options[:json] || options[:xml]
+      collection = _paginate_collection(collection, options)
 
-      collection     = _paginate_collection(collection, options)
       options[:json] = collection if options[:json]
       options[:xml]  = collection if options[:xml]
 

data/spec/rails_spec.rb

@@ -53,6 +53,16 @@ describe NumbersController, :type => :controller do
         it_behaves_like 'an endpoint with a middle page'
       end
     end
+
+    context 'providing a block' do
+      it 'yields to the block instead of implicitly rendering' do
+        get :index_with_custom_render, :count => 100
+
+        json = { numbers: (1..10).map { |n| { number: n } } }.to_json
+
+        expect(response.body).to eq(json)
+      end
+    end
   end
 end
 

data/spec/sequel_spec.rb

@@ -24,7 +24,7 @@ if ApiPagination.paginator == :will_paginate
 
     it 'returns a Sequel::Dataset' do
       collection = ApiPagination.paginate(people)
-      expect(collection.kind_of?(Sequel::Dataset)).to be_true
+      expect(collection.kind_of?(Sequel::Dataset)).to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'coveralls'
-Coveralls.wear_merged!
-
 require 'support/numbers_controller'
 require 'support/numbers_api'
 require 'api-pagination'

data/spec/support/numbers_controller.rb

@@ -39,14 +39,25 @@ module ControllerExampleGroup
 end
 
 Rails.application.routes.draw do
-  resources :numbers, :only => [:index]
+  resources :numbers, :only => [:index] do
+    get :index_with_custom_render, on: :collection
+  end
+end
+
+class NumbersSerializer
+  def initialize(numbers)
+    @numbers = numbers
+  end
+
+  def to_json(options = {})
+    { numbers: @numbers.map { |n| { number: n } } }.to_json
+  end
 end
 
 class NumbersController < ActionController::Base
   include Rails.application.routes.url_helpers
 
   def index
-    page = params.fetch(:page, 1).to_i
     total = params.fetch(:count).to_i
 
     if params[:with_headers]
@@ -57,4 +68,12 @@ class NumbersController < ActionController::Base
 
     paginate :json => (1..total).to_a, :per_page => 10
   end
+
+  def index_with_custom_render
+    total   = params.fetch(:count).to_i
+    numbers = (1..total).to_a
+    numbers = paginate numbers, :per_page => 10
+
+    render json: NumbersSerializer.new(numbers)
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ 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
@@ -151,4 +137,3 @@ test_files:
 - spec/support/shared_examples/first_page.rb
 - spec/support/shared_examples/last_page.rb
 - spec/support/shared_examples/middle_page.rb
-has_rdoc: