Merge pull request #114 from SrMouraSilva/jsonapi-rb-support

Fix #113 Jsonapi rb support

Author: davidcelis

CONTRIBUTING.md

@@ -3,6 +3,6 @@
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes and tests (`git commit -am 'Add some feature'`)
-4. Run the tests (`PAGINATOR=kaminari bundle exec rspec; PAGINATOR=will_paginate bundle exec rspec`)
+4. Run the tests (`PAGINATOR=pagy bundle exec rspec; PAGINATOR=kaminari bundle exec rspec; PAGINATOR=will_paginate bundle exec rspec`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request

README.md

@@ -42,18 +42,21 @@ ApiPagination.configure do |config|
   # Optional: set this to add a header with the current page number.
   config.page_header = 'X-Page'
 
+  # Optional: set this to add other response format. Useful with tools that define :jsonapi format
+  config.response_formats = [:json, :xml, :jsonapi]
+
   # Optional: what parameter should be used to set the page option
   config.page_param = :page
   # or
   config.page_param do |params|
-    params[:page][:number]
+    params[:page][:number] if params[:page].is_a?(ActionController::Parameters)
   end
 
   # Optional: what parameter should be used to set the per page option
   config.per_page_param = :per_page
   # or
   config.per_page_param do |params|
-    params[:page][:size]
+    params[:page][:size] if params[:page].is_a?(ActionController::Parameters)
   end
 
   # Optional: Include the total and last_page link header

lib/api-pagination/configuration.rb

@@ -10,6 +10,8 @@ class Configuration
 
     attr_accessor :base_url
 
+    attr_accessor :response_formats
+
     def configure(&block)
       yield self
     end
@@ -20,6 +22,7 @@ def initialize
       @page_header     = nil
       @include_total   = true
       @base_url   = nil
+      @response_formats = [:json, :xml]
     end
 
     ['page', 'per_page'].each do |param_name|

lib/rails/pagination.rb

@@ -8,11 +8,12 @@ def paginate(*options_or_collection)
 
       return _paginate_collection(collection, options) if collection
 
-      collection = options[:json] || options[:xml]
+      response_format = _discover_format(options)
+
+      collection = options[response_format]
       collection = _paginate_collection(collection, options)
 
-      options[:json] = collection if options[:json]
-      options[:xml]  = collection if options[:xml]
+      options[response_format] = collection if options[response_format]
 
       render options
     end
@@ -23,6 +24,12 @@ def paginate_with(collection)
 
     private
 
+    def _discover_format(options)
+      for response_format in ApiPagination.config.response_formats
+        return response_format if options.key?(response_format)
+      end
+    end
+
     def _paginate_collection(collection, options={})
       options[:page] = ApiPagination.config.page_param(params)
       options[:per_page] ||= ApiPagination.config.per_page_param(params)