effective_datatables 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89650689f933090e188f7f97fa874585a6ed80e9
-  data.tar.gz: 292f7c4078fe2626e739ae6ac05bc8ca13ae3ae0
+  metadata.gz: 147fbd09ec680b0db8ba4a47af18f0286cd0c055
+  data.tar.gz: 1588dd78852406c4259c01dfb1298a4500d03271
 SHA512:
-  metadata.gz: f8dea3d9a6ae53f4cbd38cf79b01805d01de6d9711a860240f72feb65ef1457ab5d94f83995e3511bb0e3e71ff7d4f33f8a4f0909eed04630f0633c9edc27dda
-  data.tar.gz: 0c83c4f5009cb5f12c9d5aee0ae4e132bce70ea73f3b26556ad10718fe4931ff3f2575bf5b06911911eef5c82bed363f7d6cee5405f8670ffb737b7856e7eb85
+  metadata.gz: 142a1acc50d459b49b40d0eb9f2694811c6587fbb9018b2f75be841645dfae80b81e030fbd2241f2be8fdfab0d223e03156c4655c603d9c32b4a54ab2a30910f
+  data.tar.gz: aa9f267f18cfe926aca23e9cbb3432a9cce68806b21e01492f7864705fbca660aa35ca7ee5a5bd125e789f708394a3edb321eb188c5b6ba50becd2443094d0c1

data/app/models/effective/datatable.rb

@@ -112,26 +112,15 @@ module Effective
     end
 
     def present?
-      total_records.to_i > 0
+      total_records > 0
     end
 
     def empty?
-      total_records.to_i == 0
+      total_records == 0
     end
 
     def total_records
-      @total_records ||= (
-        if active_record_collection?
-          if collection_class.connection.respond_to?(:unprepared_statement)
-            collection_sql = collection_class.connection.unprepared_statement { collection.to_sql }
-            (collection_class.connection.exec_query("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").rows[0][0] rescue 1).to_i
-          else
-            (collection_class.connection.exec_query("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").rows[0][0] rescue 1).to_i
-          end
-        else
-          collection.size
-        end
-      )
+      @total_records ||= (active_record_collection? ? active_record_collection_size(collection) : collection.size)
     end
 
     def view=(view_context)
@@ -194,12 +183,36 @@ module Effective
     end
 
     def active_record_collection?
-      collection.ancestors.include?(ActiveRecord::Base) rescue false
+      @active_record_collection ||= (collection.ancestors.include?(ActiveRecord::Base) rescue false)
     end
 
     def array_collection?
       collection.kind_of?(Array) && collection.first.kind_of?(Array)
     end
 
+    # Not every ActiveRecord query will work when calling the simple .count
+    # Custom selects:
+    #   User.select(:email, :first_name).count will throw an error
+    #   .count(:all) and .size seem to work
+    # Grouped Queries:
+    #   User.all.group(:email).count will return a Hash
+    def active_record_collection_size(collection)
+      count = (collection.size rescue nil)
+
+      case count
+      when Integer
+        count
+      when Hash
+        count.size  # This represents the number of displayed datatable rows, not the sum all groups (which might be more)
+      else
+        if collection.klass.connection.respond_to?(:unprepared_statement)
+          collection_sql = collection.klass.connection.unprepared_statement { collection.to_sql }
+          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").rows[0][0] rescue 1)
+        else
+          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").rows[0][0] rescue 1)
+        end.to_i
+      end
+    end
+
   end
 end

data/app/models/effective/effective_datatable/rendering.rb

@@ -17,13 +17,7 @@ module Effective
           col = table_tool.search(col)
 
           if table_tool.search_terms.present? && array_tool.search_terms.blank?
-            if collection_class.connection.respond_to?(:unprepared_statement)
-              # https://github.com/rails/rails/issues/15331
-              col_sql = collection_class.connection.unprepared_statement { col.to_sql }
-              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col_sql}) AS datatables_filtered_count").first.values.first rescue 1).to_i
-            else
-              self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first.values.first rescue 1).to_i
-            end
+            self.display_records = active_record_collection_size(col)
           end
         end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.6.3'.freeze
+  VERSION = '2.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord