data_tables-responder 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1946685a7d2ed739b245b8c11ed085f976db2a6a
-  data.tar.gz: 3ae44f3298539852f0b441b7141bee76b3c0c74c
+  metadata.gz: 1b8e8b8bde92df9cf464672c0272403a5b10025e
+  data.tar.gz: f777b05dc78a0b3e2e5cc6cbeeb021069502b162
 SHA512:
-  metadata.gz: c8c7f010af76b62d868ab3ff270495d3a010c8aa220008ed92122de9f227cb60317b9a5ed94ab8f448abbff16e1d878a5d131e17735b0245c5a71319a96462aa
-  data.tar.gz: e3228c8be84958dec33da231ec4496e0e316b10f1d0c08710c366100d027c10fc8e8a814063fa547e7b42c32a1bdea3dc48a73d7dbaae140cd058fd9c4301613
+  metadata.gz: a50cabb76cb4539b913fd7a4d839fec3400dfa3a3862a51a1a0106234b2dd4c81a225abe823670ffc300eba6edee6e690ff64d9c47e575c7ab2b8f51402f1927
+  data.tar.gz: d6a683c1f43ad56869ec4d4adcfed6aec6a785c898e84f57ae9d742f38444632486bb08ecf4465a2f62014b8ef429313f4c1a626e322a1b28827c2467c513196

data/lib/data_tables/active_model_serializers/adapter/pagination.rb

@@ -11,11 +11,40 @@ module DataTables
 
         def as_h
           {
-            recordsTotal: collection&.total_entries&.to_i,
-            recordsFiltered: collection&.unscope(:limit, :offset)&.count_estimate&.to_i
+            recordsTotal: records_total,
+            recordsFiltered: records_filtered
           }
         end
 
+        protected
+
+        def records_filtered
+          @records_filtered ||= get_records_filtered
+        end
+
+        def records_total
+          @records_total ||= get_records_total
+        end
+
+        private
+
+        def get_records_filtered
+          if records_total < 1_000_000
+            @collection.unscope(:limit, :offset).count(@collection.model.primary_key).to_i
+          else
+            @collection.unscope(:limit, :offset).count_estimate.to_i
+          end
+        end
+
+        def get_records_total
+          count = @collection.model.all.count_estimate.to_i
+          if count < 1_000_000
+            count = @collection.model.all.count(@collection.model.primary_key).to_i
+          end
+
+          count
+        end
+
       end
     end
   end

data/lib/data_tables/modules/pagination.rb

@@ -3,6 +3,7 @@ require 'count_estimate'
 module DataTables
   module Modules
     class Pagination
+
       FIRST_PAGE = 1
 
       attr_reader :original_scope, :filtered_scope, :context
@@ -16,37 +17,10 @@ module DataTables
       def paginate
         start = (@request_parameters[:start] || '0').to_i
         length = (@request_parameters[:length] || '10').to_i
-        page = (start / length) + 1
-        @filtered_scope = @filtered_scope.paginate(page: page, per_page: length, total_entries: records_total)
-      end
-
-      def as_json
-        {
-          recordsTotal: @filtered_scope&.total_entries&.to_i,
-          recordsFiltered: records_filtered&.to_i
-        }
+        page = (start / length)
+        @filtered_scope = @filtered_scope.offset(page * length).limit(length)
       end
 
-      protected
-
-      def records_total
-        # TODO: Check threshold
-        count_estimate = @original_scope&.model&.all&.count_estimate.to_i
-        if count_estimate < 1_000_000
-          count_estimate = @original_scope&.count
-        end
-
-        count_estimate
-      end
-
-      def records_filtered
-        @filtered_scope&.unscope(:limit, :offset)&.count_estimate
-      end
-
-      attr_reader :adapter_options
-
-      private
-
     end
   end
 end

data/lib/data_tables/responder/version.rb

@@ -1,5 +1,5 @@
 module DataTables
   module Responder
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers