active_model_serializers_contrib 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd70f3e45a996cf465f332cc8d8a44614d0e682
-  data.tar.gz: 0dbf09f444df01744a64b60a7c7820de728af3b6
+  metadata.gz: 1b61b65aa8a796fa7afb871efe66fc1cefa0850d
+  data.tar.gz: f6c0ce27e873c094f98764633816b22674e4c106
 SHA512:
-  metadata.gz: c4cbc332d6f879b558dbdeac44b2d89d51e797e363b9248592af41fb8441c0384113c848c1da5bd2f941562436d54150f7cb91f19f8dbf51e38949e29e248f82
-  data.tar.gz: 29ece20677667f2c6f649036b38115ac0fc6c0cb98ca4c9e4ff33bb1bb6530dc4bd36895196334bb857758cf1c9de123ec319cf96842b6a46df315dfde3704f5
+  metadata.gz: d1c54bb662204a3f3c4f6b3b60313cd080dd2c113af5a60de3d201c6de3e2dde0c6a4287bae903db4257768a88a867610e65581bd8e379c2e872b776827605a2
+  data.tar.gz: bdcb336a79c41f90b42886329d1dabbd91c1a14a870d83f87961dd5b635815ae17138fdac2e7922c81a574c88db3b632b8af241367d549c67a3e81d323f5e0f9

data/lib/active_model/pagination_serializer.rb

@@ -4,7 +4,7 @@ class ActiveModel::PaginationSerializer < ActiveModel::ArraySerializer
     per_page = object.limit_value
     offset = object.offset_value
     current_page = offset ? (offset / per_page) + 1 : 1
-    total_items = object.limit(nil).offset(nil).count(:all)
+    total_items = item_count(object)
     total_pages = per_page ? (total_items / per_page.to_f).ceil : 1
     prev_page = current_page - 1
     prev_page = nil if prev_page < 1
@@ -24,4 +24,12 @@ class ActiveModel::PaginationSerializer < ActiveModel::ArraySerializer
 
   alias_method_chain :initialize, :pagination
 
+  private
+
+  def item_count(object)
+    initial_count = object.limit(nil).offset(nil).count(:all)
+
+    (initial_count.respond_to? :count) ? initial_count.count : initial_count
+  end
+
 end

data/lib/active_model_serializers_contrib/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersContrib
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_contrib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - G5
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Modules/classes that extend AMS with more functionality