lib/kaminari/models/mongoid_criteria_methods.rb in kaminari-0.15.1 vs lib/kaminari/models/mongoid_criteria_methods.rb in kaminari-0.16.0

@@ -1,16 +1,28 @@
 module Kaminari
   module MongoidCriteriaMethods
+    def entry_name
+      model_name.human.downcase
+    end
+
     def limit_value #:nodoc:
       options[:limit]
     end
 
     def offset_value #:nodoc:
       options[:skip]
     end
 
     def total_count #:nodoc:
-      embedded? ? unpage.length : length
+      @total_count ||= if embedded?
+        unpage.count
+      else
+        if options[:max_scan] && options[:max_scan] < count
+          options[:max_scan]
+        else
+          count
+        end
+      end
     end
 
     private
     def unpage
       clone.tap do |crit|