jsonapi-utils 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9b7abb145201ff33ce27c5fa8a70c37914eb94
-  data.tar.gz: 188eb2baf1d0f0182b60257cdebab1696cc9d8ee
+  metadata.gz: e0600b0456c3a82eead45d6b278f6edd3a0eaf69
+  data.tar.gz: f7ae630485129ae7f4ed320b2b66a43b4988be2b
 SHA512:
-  metadata.gz: 8d332f2619cb712f97f6f7b104a615fa67d7baed80736580401d7966ef6a9901c60c88404f544cc77ec844af764bcf09efde3cf574304e510c27c8aef4075460
-  data.tar.gz: 111fcd196807c42afe7bddea2a8291499efca754aef0c0c8c876656a46ee485d736373af39b0de192df40d5a25ff455cab6de35130ea118bb21f2f0a8fee3eec
+  metadata.gz: 17a24aeb6bd942161301874c84c290d6214382a89f6d459b3c27a2c0e8036c6a24671e780cebe0e575ef699a0e1d86144839e7b626423f4c2803f267772b6a2c
+  data.tar.gz: 90a95d43903965f646c5b2be1679b01bab64d6868785d245bffd008e65e6ee8e5c62c30f8c6ebe090234e0890c98a728494e0012caae26807a4a028904eb5f2b

data/lib/jsonapi/utils.rb

@@ -93,7 +93,6 @@ module JSONAPI
     end
 
     def pagination_params(options)
-      @paginator ||= paginator(params)
       if @paginator && JSONAPI.configuration.top_level_links_include_pagination
         options = {}
         @paginator.class.requires_record_count &&
@@ -105,9 +104,7 @@ module JSONAPI
     end
 
     def build_collection(records, options = {})
-      unless JSONAPI.configuration.default_paginator == :none
-        records = paginator(@request.params).apply(records, nil)
-      end
+      records = paginate(records, options)
       records.respond_to?(:to_ary) ? records.map { |record| turn_into_resource(record, options) } : []
     end
 
@@ -119,17 +116,40 @@ module JSONAPI
       end
     end
 
-    def paginator(params)
-      page_params = ActionController::Parameters.new(params[:page])
+    def paginate(records, options = {})
+      return records if pagination_disabled?(options)
+      pagination = set_pagination(options)
 
-      @paginator ||=
-        if JSONAPI.configuration.default_paginator == :paged
-          PagedPaginator.new(page_params)
-        elsif JSONAPI.configuration.default_paginator == :offset
-          OffsetPaginator.new(page_params)
+      records =
+        if records.is_a?(Array)
+          records[pagination[:range]]
+        else
+          pagination[:paginator].apply(records, nil)
         end
     end
 
+    def set_pagination(options)
+      page_params = ActionController::Parameters.new(@request.params[:page])
+      if JSONAPI.configuration.default_paginator == :paged
+        @paginator ||= PagedPaginator.new(page_params)
+        n = page_params['number'].to_i.nonzero? || 1
+        s = page_params['size'].to_i.nonzero?   || JSONAPI.configuration.default_page_size
+        { paginator: @paginator, range: (n - 1) * s..n * s - 1 }
+      elsif JSONAPI.configuration.default_paginator == :offset
+        @paginator ||= OffsetPaginator.new(page_params)
+        o = page_params['offset'].to_i.nonzero? || 0
+        l = page_params['limit'].to_i.nonzero?  || JSONAPI.configuration.default_page_size
+        { paginator: @paginator, range: o..o + l - 1 }
+      else
+        {}
+      end
+    end
+
+    def pagination_disabled?(options)
+      JSONAPI.configuration.default_paginator == :none ||
+        !options[:paginate].nil? && !options[:paginate]
+    end
+
     def fix_when_hash(records, options)
       return [] unless options[:model]
       records.map { |hash| options[:model].new(hash) }

data/lib/jsonapi/utils/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Utils
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Tiago Guedes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler