data_tables-responder 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e0c1d6257f60b5b07b2e17d6dcbc1ca2fdc39c
-  data.tar.gz: 0b559fd04b9cc9fce90cf40fda777e63f6c942bc
+  metadata.gz: 1946685a7d2ed739b245b8c11ed085f976db2a6a
+  data.tar.gz: 3ae44f3298539852f0b441b7141bee76b3c0c74c
 SHA512:
-  metadata.gz: 7eb090ae3ef6f7968594f31b28161cbd5e527078ed53da634358eb20b1a5a9e3434a4cbe69b53bf9193a2a227bb7045f350f23b2183d717249e96dc67fbfe68c
-  data.tar.gz: 81ab0c4502f9b29b793b5ab514056622580862fe036483d8b65773734c9eff9c61e79ce5a87e4e5e93529c7273d2b2805441fb0124f1a263aae2ea48565cba14
+  metadata.gz: c8c7f010af76b62d868ab3ff270495d3a010c8aa220008ed92122de9f227cb60317b9a5ed94ab8f448abbff16e1d878a5d131e17735b0245c5a71319a96462aa
+  data.tar.gz: e3228c8be84958dec33da231ec4496e0e316b10f1d0c08710c366100d027c10fc8e8a814063fa547e7b42c32a1bdea3dc48a73d7dbaae140cd058fd9c4301613

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

@@ -12,7 +12,7 @@ module DataTables
         def as_h
           {
             recordsTotal: collection&.total_entries&.to_i,
-            recordsFiltered: @collection&.unscope(:limit, :offset)&.count_estimate&.to_i
+            recordsFiltered: collection&.unscope(:limit, :offset)&.count_estimate&.to_i
           }
         end
 

data/lib/data_tables/modules/pagination.rb

@@ -5,10 +5,11 @@ module DataTables
     class Pagination
       FIRST_PAGE = 1
 
-      attr_reader :collection, :context
+      attr_reader :original_scope, :filtered_scope, :context
 
-      def initialize(collection, request_parameters)
-        @collection = collection
+      def initialize(original_scope, filtered_scope, request_parameters)
+        @original_scope = original_scope
+        @filtered_scope = filtered_scope
         @request_parameters = request_parameters
       end
 
@@ -16,12 +17,12 @@ module DataTables
         start = (@request_parameters[:start] || '0').to_i
         length = (@request_parameters[:length] || '10').to_i
         page = (start / length) + 1
-        @collection = @collection.paginate(page: page, per_page: length, total_entries: records_total)
+        @filtered_scope = @filtered_scope.paginate(page: page, per_page: length, total_entries: records_total)
       end
 
       def as_json
         {
-          recordsTotal: @collection&.total_entries&.to_i,
+          recordsTotal: @filtered_scope&.total_entries&.to_i,
           recordsFiltered: records_filtered&.to_i
         }
       end
@@ -29,11 +30,17 @@ module DataTables
       protected
 
       def records_total
-        @collection&.model&.all.count_estimate
+        # 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
-        @collection&.unscope(:limit, :offset)&.count_estimate
+        @filtered_scope&.unscope(:limit, :offset)&.count_estimate
       end
 
       attr_reader :adapter_options

data/lib/data_tables/responder.rb

@@ -9,17 +9,17 @@ require 'data_tables/responder/railtie' if defined? ::Rails::Railtie
 module DataTables
   module Responder
 
-    def self.respond(resource, params)
-      model = resource.try(:model) || resource
+    def self.respond(original_scope, params)
+      model = original_scope.try(:model) || original_scope
 
-      results = resource
+      filtered_results = original_scope&.dup || model.none
       hashed_orders = transmute_datatable_order(params[:order], params[:columns])
       orders = flat_keys_to_nested hashed_orders
 
       order_by = orders.collect do |k, order|
         if order.is_a? Hash
           if (klass = model.reflect_on_association(k).try(:klass))
-            results = results.joins(k)
+            filtered_results = filtered_results.joins(k)
             klass.arel_table[order.first.first].send(order.first.last)
           end
         else
@@ -27,11 +27,11 @@ module DataTables
         end
       end
 
-      results = search(results, params)
+      filtered_results = search(filtered_results, params)
 
       # Rails.logger.warn "SEARCH BY: #{search_by}"
-      results = order_by.inject(results) { |r, o| r.order(o) }
-      results = paginate(results, params)
+      filtered_results = order_by.inject(filtered_results) { |r, o| r.order(o) }
+      filtered_results = paginate(original_scope, filtered_results, params)
     end
 
     def self.flat_keys_to_nested(hash)
@@ -43,12 +43,12 @@ module DataTables
     end
 
 
-    def self.paginate(collection, params)
-      Modules::Pagination.new(collection, params).paginate
+    def self.paginate(original_scope, filtered_results, params)
+      Modules::Pagination.new(original_scope, filtered_results, params).paginate
     end
 
-    def self.search(collection, params)
-      Modules::Search.new(collection, params).search
+    def self.search(filtered_results, params)
+      Modules::Search.new(filtered_results, params).search
     end
 
     def self.transmute_datatable_order(orders, columns)

data/lib/data_tables/responder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dale Stevens