restpack_serializer 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b87432ce7c31847f7a1e11448448f1adc19209
-  data.tar.gz: d776997e1bef5f76389e6c0be52261c7707b3a2e
+  metadata.gz: edca97b0920315c164716fd440b31108e76c65f4
+  data.tar.gz: fba756395137ac36ec9c1e75d610050bb3fbe008
 SHA512:
-  metadata.gz: dc397cb3e9ee84bc020d6c1e91b2f834d55fc95d5d7b466b48ecdaf1b6664b30b431bc0fee8bf0e52da1848be6b0418020adf61ed12413cbeb2c2f639b6800c1
-  data.tar.gz: 50f1625a09e4f34cab9545f5b34882e87e7b62a2c4a763080961edc3e20ef1db2e9b3e5c5970ab8708910a4c195c018592d8013ea02224a3b2a311b6878b65f6
+  metadata.gz: 07fa0719ed2576ee95a0d025edc215ee99375346b04b581603d167fd20eceeaca9ac42b9942a14cf245e2f733699325169169c3b3f8c799ae02a8c0c8b2e54b2
+  data.tar.gz: e4ef801153749be306c31fcdb6afff9caf194e18405be2f50d69c3efffb234542d5ac02df9e11be7e51d2c1a3a6ee3b5279713819556be086a80d51a586fd8f7

data/lib/restpack_serializer.rb

@@ -1,5 +1,4 @@
-require 'will_paginate'
-require 'will_paginate/active_record'
+require 'kaminari'
 require 'protected_attributes'
 
 require 'restpack_serializer/version'
@@ -8,6 +7,8 @@ require 'restpack_serializer/serializable'
 require 'restpack_serializer/factory'
 require 'restpack_serializer/result'
 
+Kaminari::Hooks.init
+
 module RestPack
   module Serializer
     mattr_accessor :config

data/lib/restpack_serializer/serializable/paging.rb

@@ -7,10 +7,7 @@ module RestPack::Serializer::Paging
     end
 
     def page_with_options(options)
-      page = options.scope_with_filters.paginate(
-        page: options.page,
-        per_page: options.page_size
-      )
+      page = options.scope_with_filters.page(options.page).per(options.page_size)
 
       result = RestPack::Serializer::Result.new
       result.resources[self.key] = serialize_page(page, options)
@@ -39,11 +36,11 @@ module RestPack::Serializer::Paging
       meta = {
         page: options.page,
         page_size: options.page_size,
-        count: page.total_entries,
+        count: page.total_count,
         include: options.include
       }
 
-      meta[:page_count] = ((page.total_entries - 1) / options.page_size) + 1
+      meta[:page_count] = ((page.total_count - 1) / options.page_size) + 1
       meta[:previous_page] = meta[:page] > 1 ? meta[:page] - 1 : nil
       meta[:next_page] = meta[:page] < meta[:page_count] ? meta[:page] + 1 : nil
 

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.4.15'
+    VERSION = '0.4.16'
   end
 end

data/restpack_serializer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activerecord', '~> 4.0.3'
   gem.add_dependency 'activesupport', '~> 4.0.3'
   gem.add_dependency 'protected_attributes', '~> 1.0.5'
-  gem.add_dependency 'will_paginate', '~> 3.0.5'
+  gem.add_dependency 'kaminari', '~> 0.15.1'
 
   gem.add_development_dependency 'restpack_gem', '~> 0.0.9'
   gem.add_development_dependency 'rake', '~> 10.0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Gavin Joyce
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement