data_tables-responder 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0798fa16c1404198a97647a9bfc2f4514f3a21e4
-  data.tar.gz: 04e1541db4c718874ecbf131613569b34ebadf30
+  metadata.gz: 843cafe60eba33bd11e4a1db95f408e29dc95df6
+  data.tar.gz: 9e52d51f84b77cea416333e8634198019c497d7c
 SHA512:
-  metadata.gz: 030493b51f5b002e10b36561b9ec9dbd900c457ab3159f000c19091caccd757cc506e79901d61d321f546422e40eb160b24ea0c0ff00a28fc61e76538e049957
-  data.tar.gz: 08eb69d5a37e099868c9869f2a66e1959cf3fd02fa19f86b94a3e05bd5ca2dcba472272456a980d27c5459fcefa733bb4f70bb172d5983e493f0090fa9052652
+  metadata.gz: 702847fb2fee755b7a439c959d247f7829f1bc70ba2eb24cebcca9cdccd7d6c41673b31f7edb5be44a1e53f352d133e37681ef056e71b5b8a2bf2eb9f8fb15d2
+  data.tar.gz: 007d3b0842e8fb4ce9efbd38edb81a4b96761667409bce1c7c2d5a82cc8f1204b190f45ce4c2decd9e88e4f61fe46532516aa1346fb7a0e26ad435eabf35fc04

data/data_tables-responder.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'active_model_serializers', '~> 0.10.0'
+  spec.add_dependency 'count_estimate'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/data_tables/adapter.rb

@@ -1,4 +1,5 @@
 require 'active_model_serializers'
+require 'count_estimate'
 require 'data_tables/modules/pagination'
 require 'data_tables/modules/search'
 

data/lib/data_tables/modules/pagination.rb

@@ -22,18 +22,26 @@ 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)
+        @collection = @collection.paginate(page: page, per_page: length, total_entries: records_total)
       end
 
       def as_json
         {
-          recordsTotal: @collection&.model&.count || 0,
-          recordsFiltered: @collection&.total_entries || 0
+          recordsTotal: @collection&.total_entries&.to_i,
+          recordsFiltered: records_filtered&.to_i
         }
       end
 
       protected
 
+      def records_total
+        @collection&.model&.all.count_estimate
+      end
+
+      def records_filtered
+        @collection&.unscope(:limit, :offset)&.count_estimate
+      end
+
       attr_reader :adapter_options
 
       private

data/lib/data_tables/modules/search.rb

@@ -28,37 +28,45 @@ module DataTables
 
         search_by = build_search(model, searches)
 
-        @collection.where(search_by.reduce(:or))
+        @collection.where(search_by.reduce(:and))
       end
 
       def build_search(model, searches)
-        queries = []
-        searches.inject(queries) do |query, junk|
-          column, search = junk
-          case search
+        # join_type = Arel::Nodes::OuterJoin
+        join_type = Arel::Nodes::InnerJoin
+
+        searches.inject([]) do |queries, junk|
+          column, query = junk
+          case query
           when Hash
             assoc = model.reflect_on_association(column)
             assoc_klass = assoc.klass
 
-            outer_join = Arel::Nodes::OuterJoin.new(assoc_klass.arel_table,
+            outer_join = join_type.new(assoc_klass.arel_table,
               Arel::Nodes::On.new(
-                model.arel_table[assoc.active_record_primary_key].eq(assoc_klass.arel_table[assoc.foreign_key])
+                model.arel_table[assoc.foreign_key].eq(assoc_klass.arel_table[assoc.active_record_primary_key])
             ))
-            @collection.joins(outer_join)
-            query << build_search(assoc_klass, search).reduce(:or)
+            @collection = @collection.joins(outer_join)
+            queries << build_search(assoc_klass, query).reduce(:and)
           else
             col_s = column.to_s
             case (k = model.columns.find(nil) { |c| c.name == col_s })&.type
             when :string
-              query << model.arel_table[k.name].matches("%#{search}%")
+              # I'm pretty sure this is safe from SQL Injection
+              queries << model.arel_table[k.name].matches("%#{query}%")
             when :integer
-              query << model.arel_table[k.name].eq(search)
-            else
-              query
+              if value = query&.to_i
+                queries << model.arel_table[k.name].eq(value)
+              end
+            when :datetime
+              datetime = Time.parse(query)
+              range = (datetime-1.second)..(datetime+1.second)
+              queries << model.arel_table[k.name].between(range)
             end
           end
+
+          queries
         end
-        queries
       end
 
       protected

data/lib/data_tables/responder/version.rb

@@ -1,5 +1,5 @@
 module DataTables
   module Responder
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: count_estimate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement